Stefan Fiedler:

20 years ago · 87a173432a
4 changed files with 8 additions and 138 deletions
--- a/package/base/e2fsprogs/26-linux-compile-h-usage.patch
+++ b/package/base/e2fsprogs/26-linux-compile-h-usage.patch
@ -1,69 +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/base/e2fsprogs/26-linux-compile-h-usage.patch
 # ROCK Linux is Copyright (C) 1998 - 2005 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 ---

 --- ./misc/filefrag.c.orig	2004-06-26 13:03:48.820773848 +0200
 +++ ./misc/filefrag.c	2004-06-26 13:04:05.359259616 +0200
@@ -37,6 +37,7 @@
 #include <sys/stat.h>
 #include <sys/vfs.h>
 #include <sys/ioctl.h>
 +#include <linux/compiler.h>
 #include <linux/fd.h>
 
 int verbose = 0;
 --- ./lib/ext2fs/getsectsize.c.orig	2004-06-26 13:00:49.114093416 +0200
 +++ ./lib/ext2fs/getsectsize.c	2004-06-26 13:01:01.369230352 +0200
@@ -23,6 +23,7 @@
 #include <fcntl.h>
 #ifdef HAVE_LINUX_FD_H
 #include <sys/ioctl.h>
 +#include <linux/compiler.h>
 #include <linux/fd.h>
 #endif
 
 --- ./lib/ext2fs/getsize.c.orig	2004-06-26 13:00:11.821762712 +0200
 +++ ./lib/ext2fs/getsize.c	2004-06-26 13:00:37.192905712 +0200
@@ -25,6 +25,7 @@
 #include <fcntl.h>
 #ifdef HAVE_LINUX_FD_H
 #include <sys/ioctl.h>
 +#include <linux/compiler.h>
 #include <linux/fd.h>
 #endif
 #ifdef HAVE_SYS_DISKLABEL_H
 --- ./lib/ext2fs/ismounted.c.orig	2004-06-26 13:01:16.740893504 +0200
 +++ ./lib/ext2fs/ismounted.c	2004-06-26 13:01:28.160157512 +0200
@@ -18,6 +18,7 @@
 #endif
 #include <fcntl.h>
 #ifdef HAVE_LINUX_FD_H
 +#include <linux/compiler.h>
 #include <linux/fd.h>
 #endif
 #ifdef HAVE_MNTENT_H
 --- ./lib/blkid/getsize.c.orig	2004-06-26 13:02:54.825982304 +0200
 +++ ./lib/blkid/getsize.c	2004-06-26 13:03:06.989133224 +0200
@@ -22,6 +22,7 @@
 #include <fcntl.h>
 #ifdef HAVE_LINUX_FD_H
 #include <sys/ioctl.h>
 +#include <linux/compiler.h>
 #include <linux/fd.h>
 #endif /* HAVE_LINUX_FD_H */
 #ifdef HAVE_SYS_DISKLABEL_H
--- a/package/base/e2fsprogs/e2fsck_sync.patch
+++ b/package/base/e2fsprogs/e2fsck_sync.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/base/e2fsprogs/e2fsck_sync.patch
 # ROCK Linux is Copyright (C) 1998 - 2005 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 ---

 diff -pruN e2fsprogs-1.32_orig/e2fsck/Makefile.in e2fsprogs-1.32/e2fsck/Makefile.in
 --- e2fsprogs-1.32_orig/e2fsck/Makefile.in	2003-03-27 11:47:03.000000000 +0100
 +++ e2fsprogs-1.32/e2fsck/Makefile.in	2003-03-27 11:46:39.000000000 +0100
@@ -95,7 +95,6 @@ SRCS= $(srcdir)/e2fsck.c \
 	$(MTRACE_SRC)
 
 all:: profiled $(PROGS) e2fsck.static e2fsck.shared $(MANPAGES)
 -	@sync
 
 @PROFILE_CMT@all:: e2fsck.profiled
 
--- a/package/base/e2fsprogs/e2fsprogs.desc
+++ b/package/base/e2fsprogs/e2fsprogs.desc
@ -37,8 +37,8 @@

 [L] GPL LGPL
 [S] Stable
 [V] 1.35
 [V] 1.38
 [P] X -X-3-----9 180.900

 [D] 3249790506 e2fsprogs-1.35.tar.gz http://download.sourceforge.net/e2fsprogs/
 [D] 0 e2fsprogs-1.38.tar.gz http://download.sourceforge.net/e2fsprogs/

--- a/package/base/e2fsprogs/makefile-libe2p-fix.patch
+++ b/package/base/e2fsprogs/makefile-libe2p-fix.patch
@ -1,25 +1,6 @@
 # --- 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/base/e2fsprogs/makefile-libe2p-fix.patch
 # ROCK Linux is Copyright (C) 1998 - 2005 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 ---

 diff -Nur e2fsprogs-1.34.orig/e2fsck/Makefile.in e2fsprogs-1.34/e2fsck/Makefile.in
 --- e2fsprogs-1.34.orig/e2fsck/Makefile.in	2003-08-30 17:12:25.000000000 +0200
 +++ e2fsprogs-1.34/e2fsck/Makefile.in	2003-08-30 17:15:26.000000000 +0200
 diff -dur e2fsprogs-1.38/e2fsck/Makefile.in e2fsprogs-1.38-p/e2fsck/Makefile.in
 --- e2fsprogs-1.38/e2fsck/Makefile.in	2005-06-29 19:42:20.000000000 +0200
 +++ e2fsprogs-1.38-p/e2fsck/Makefile.in	2005-10-18 20:48:27.000000000 +0200
@@ -16,7 +16,7 @@
 MANPAGES=	e2fsck.8
 XTRA_CFLAGS=	-DRESOURCE_TRACK
@ -29,21 +10,9 @@ diff -Nur e2fsprogs-1.34.orig/e2fsck/Makefile.in e2fsprogs-1.34/e2fsck/Makefile.
 DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(DEPLIBUUID)
 
 STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(STATIC_LIBBLKID) \
 diff -Nur e2fsprogs-1.34.orig/resize/Makefile.in e2fsprogs-1.34/resize/Makefile.in
 --- e2fsprogs-1.34.orig/resize/Makefile.in	2003-05-04 00:46:47.000000000 +0200
 +++ e2fsprogs-1.34/resize/Makefile.in	2003-08-30 17:15:45.000000000 +0200
@@ -25,7 +25,7 @@
 	$(srcdir)/main.c \
 	$(srcdir)/sim_progress.c
 
 -LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBINTL)
 +LIBS= $(LIBE2P) $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBINTL)
 DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR)
 
 STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(LIBINTL)
 diff -Nur e2fsprogs-1.34.orig/tests/progs/Makefile.in e2fsprogs-1.34/tests/progs/Makefile.in
 --- e2fsprogs-1.34.orig/tests/progs/Makefile.in	2003-04-18 05:38:40.000000000 +0200
 +++ e2fsprogs-1.34/tests/progs/Makefile.in	2003-08-30 17:16:13.000000000 +0200
 diff -dur e2fsprogs-1.38/tests/progs/Makefile.in e2fsprogs-1.38-p/tests/progs/Makefile.in
 --- e2fsprogs-1.38/tests/progs/Makefile.in	2005-06-29 19:42:20.000000000 +0200
 +++ e2fsprogs-1.38-p/tests/progs/Makefile.in	2005-10-18 20:48:27.000000000 +0200
@@ -21,7 +21,7 @@
 
 SRCS=	$(srcdir)/test_rel.c