Tobias Hintze <th@rocklinux.org>:

package/hannes/minit/makefile-head.patch

@@ -1,30 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/hannes/minit/makefile-head.patch
-# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- ./Makefile.orig	2004-09-12 03:47:24.163431984 +0200
-+++ ./Makefile	2004-09-12 03:47:33.584999688 +0200
-@@ -46,7 +46,7 @@
- 
- install: install-files install-fifos
- 
--VERSION=minit-$(shell head -1 CHANGES|sed 's/://')
-+VERSION=minit-$(shell head -n 1 CHANGES|sed 's/://')
- CURNAME=$(notdir $(shell pwd))
- 
- tar: clean rename

package/hannes/minit/minit.desc

@@ -45,7 +45,7 @@
 
 [L] GPL
 [S] Stable
-[V] 0.9.1
+[V] 0.10
 [P] X -?---5---9 212.900
 
-[D] 2287713655 minit-0.9.1.tar.bz2 http://www.fefe.de/minit/
+[D] 3671619071 minit-0.10.tar.bz2 http://dl.fefe.de/

package/hannes/minit/non-diet-adaptions.patch

@@ -0,0 +1,46 @@
+diff -Naur minit-0.10-orig/Makefile minit-0.10/Makefile
+--- minit-0.10-orig/Makefile	2005-04-08 19:24:04.000000000 +0200
++++ minit-0.10/Makefile	2007-07-01 02:08:17.033046634 +0200
+@@ -3,10 +3,10 @@
+ 
+ #CFLAGS=-pipe -march=i386 -fomit-frame-pointer -Os -I../dietlibc/include
+ CC=gcc
+-CFLAGS=-Wall -W -pipe -fomit-frame-pointer -Os
++CFLAGS=-Wall -W -pipe -fomit-frame-pointer -Os -I/opt/libowfat/include
+ CROSS=
+ #CROSS=arm-linux-
+-LDFLAGS=-s
++LDFLAGS=-L/opt/libowfat/lib -s
+ MANDIR=/usr/man
+ 
+ path = $(subst :, ,$(PATH))
+@@ -46,7 +46,7 @@
+ serdo: serdo.o
+ 
+ shutdown: shutdown.o split.o openreadclose.o opendevconsole.o
+-	$(DIET) $(CROSS)$(CC) $(LDFLAGS) -o shutdown $^
++	$(DIET) $(CROSS)$(CC) $(LDFLAGS) -o shutdown $^ $(LDLIBS)
+ 
+ %.o: %.c
+ 	$(DIET) $(CROSS)$(CC) $(CFLAGS) -c $<
+@@ -65,7 +65,7 @@
+ 	$(DIET) $(CROSS)$(CC) $(CFLAGS) -o $@ $^
+ 
+ hard-reboot: hard-reboot.c
+-	$(DIET) $(CROSS)$(CC) $(CFLAGS) -o $@ $^
++	$(DIET) $(CROSS)$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS)
+ 
+ write_proc: write_proc.c
+ 	$(DIET) $(CROSS)$(CC) $(CFLAGS) -o $@ $^
+diff -Naur minit-0.10-orig/serdo.c minit-0.10/serdo.c
+--- minit-0.10-orig/serdo.c	2005-02-26 18:00:22.000000000 +0100
++++ minit-0.10/serdo.c	2007-07-01 02:08:32.343277582 +0200
+@@ -7,6 +7,8 @@
+ #include <str.h>
+ #include <byte.h>
+ 
++extern char **environ;
++
+ #define MAXENV 256
+ char* envp[MAXENV+2];
+ int envc;

package/sirkull/libowfat/dietlibc.patch

@@ -1,46 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/sirkull/libowfat/dietlibc.patch
-# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- libowfat-0.19.2.orig/GNUmakefile	2004-03-27 20:49:35.000000000 -0500
-+++ libowfat-0.19.2/GNUmakefile	2004-05-11 00:16:53.000000000 -0400
-@@ -23,24 +23,6 @@
- CFLAGS=-pipe -Wall -g
- endif
- path = $(subst :, ,$(PATH))
--diet_path = $(foreach dir,$(path),$(wildcard $(dir)/diet))
--ifeq ($(strip $(diet_path)),)
--ifneq ($(wildcard /opt/diet/bin/diet),)
--DIET=/opt/diet/bin/diet
--else
--DIET=
--endif
--else
--DIET:=$(strip $(diet_path))
--endif
--
--ifneq ($(DIET),)
--ifneq ($(DEBUG),1)
--DIET+=-Os
--endif
--endif
--# to build without diet libc support, use $ make DIET=
--# see http://www.fefe.de/dietlibc/ for details about the diet libc
- 
- VPATH=str:byte:fmt:scan:uint:open:stralloc:unix:socket:buffer:mmap:textcode:taia:tai:dns:case:array:mult:io
- 

package/sirkull/libowfat/libowfat.conf

@@ -1,30 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/sirkull/libowfat/libowfat.conf
-# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-# libowfat install many headers that have popular names of other OS's header
-# files, so we do not install it into $prefix/include because other packages
-# (wine, tetex, ...) try to use them in configure and thus depend on libowfat
-# ... :-( - Rene Rebe
-
-var_append makeopt " " "INCLUDEDIR=$includedir/${pkg}"
-makeinstopt="$makeopt install"
-

package/sirkull/libowfat/libowfat.desc

@@ -30,14 +30,16 @@
 [U] http://www.fefe.de/libowfat/
 
 [A] Felix von Leitner <felix-dietlibc@fefe.de>
-[M] Chris Efant <rock@sirkull.org>
+[M] Tobias Hintze <th@rocklinux.org>
 
 [C] extra/development
 
 [L] GPL
 [S] Stable
-[V] 0.20
+[V] 0.25
 [P] X -?---5---9 153.400
 
-[D] 2842611750 libowfat-0.20.tar.bz2 http://dl.fefe.de/
+[O] prefix=/opt/libowfat mandir=/opt/libowfat/man infodir=/opt/libowfat/info
+
+[D] 3622244655 libowfat-0.25.tar.bz2 http://dl.fefe.de/
 

package/sirkull/libowfat/prefix.patch

@@ -0,0 +1,11 @@
+diff -Naur libowfat-0.25-orig/GNUmakefile libowfat-0.25/GNUmakefile
+--- libowfat-0.25-orig/GNUmakefile	2006-07-16 01:17:01.000000000 +0200
++++ libowfat-0.25/GNUmakefile	2007-07-01 00:24:24.289027108 +0200
+@@ -4,7 +4,6 @@
+ # in /opt/diet, where they are in the default search path for my diet libc
+ # work but don't conflict with anything there.  YMMV.
+ 
+-prefix=/opt/diet
+ LIBDIR=${prefix}/lib
+ INCLUDEDIR=${prefix}/include
+ MAN3DIR=${prefix}/man/man3