[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. bf0d0d23a4b790f926456474dc2ba6090d77db8f
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via bf0d0d23a4b790f926456474dc2ba6090d77db8f (commit) via a05d733881af1c43534c68157422a9f8af508e3e (commit) via d96ce6b7e10cd48c07c0c0c04d332fc5442f7ffe (commit) via e9cd72f566aa87f612bac9f560c242788185b676 (commit) via 0f5db4b4b59d40bb53a76a83ce5046fe531cafd2 (commit) via 6aa51e34c90e09d4ff50783e14bcd71a052aaac5 (commit) via 46dcbac8f79a4f85ee79fd3d4d9378d68991c4e1 (commit) via 91900de50dbbedab012ae97f4e3d5bfe3270c44f (commit) via abb8520458bc1ae4b2f827072506157eafad81c2 (commit) via 2628d1bbeb89d0748f3189eabb3b6296fd81cdd6 (commit) via 2e9d9680c9ee8594d17ebd031c4ec219f26c96b0 (commit) via d737c7b6fadd6a235cde8f8b359a6bb0ac113dd2 (commit) via b2eeb672ab8667eb6378e595be992a0492ed4285 (commit) via 5818d5458f7625dd4a3132a6aad998007fefce8c (commit) via 4be400c59a4e9ffbae9cdd31d35db1709010b4ce (commit) via c838b91a97f15d1ab8667bf421639acad15e8bb4 (commit) via 60bd296e37e17ba2332f3be9782a7d17c26344cb (commit) via 776f744d2a40819c4d114ecadbab4ccf7674af49 (commit) via eae40651c6ba130f1ca19a5a3f0d300ce9f086ff (commit) via f94c181673d47c7ec240957eeb795709ba783f69 (commit) via 3533c571bc849ca551a93066e44571a7e0f568e2 (commit) via 555722229e1e993777fd3c5bf231d02ac67918a8 (commit) from 0913a50aa127363dfaa6bbd94b78f12e0730692f (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit bf0d0d23a4b790f926456474dc2ba6090d77db8f Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Nov 28 22:29:31 2010 +0100
naoki: Fix syntax error.
commit a05d733881af1c43534c68157422a9f8af508e3e Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Nov 28 22:01:22 2010 +0100
htop: Fix sysconfdir.
commit d96ce6b7e10cd48c07c0c0c04d332fc5442f7ffe Merge: e9cd72f abb8520 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Nov 28 21:57:21 2010 +0100
Merge remote branch 'stevee/updates' into next
commit e9cd72f566aa87f612bac9f560c242788185b676 Merge: 0f5db4b 46dcbac Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Nov 28 21:55:03 2010 +0100
Merge remote branch 'stevee/naoki' into next
commit 0f5db4b4b59d40bb53a76a83ce5046fe531cafd2 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Nov 28 21:54:29 2010 +0100
openssl: Remove the random improvements from OpenBSD that do not work anymore.
commit 6aa51e34c90e09d4ff50783e14bcd71a052aaac5 Merge: 4be400c 91900de Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Nov 28 21:43:43 2010 +0100
Merge remote branch 'stevee/openssl' into next
commit 46dcbac8f79a4f85ee79fd3d4d9378d68991c4e1 Author: Schantl Stefan Stevee@ipfire.org Date: Sun Nov 28 18:51:31 2010 +0100
naoki: Improve error output of broken and unknown packages.
commit 91900de50dbbedab012ae97f4e3d5bfe3270c44f Author: Schantl Stefan Stevee@ipfire.org Date: Sun Nov 28 18:48:22 2010 +0100
openssl: Update to 1.0.0b
Package only compiles through without change arandom to urandom, need to fix this!
Refers to #96
commit abb8520458bc1ae4b2f827072506157eafad81c2 Author: Schantl Stefan Stevee@ipfire.org Date: Sun Nov 28 13:42:56 2010 +0100
curl: Update to 7.21.2.
commit 2628d1bbeb89d0748f3189eabb3b6296fd81cdd6 Author: Schantl Stefan Stevee@ipfire.org Date: Sun Nov 28 13:32:01 2010 +0100
cups: Update to 1.4.5.
commit 2e9d9680c9ee8594d17ebd031c4ec219f26c96b0 Author: Schantl Stefan Stevee@ipfire.org Date: Sun Nov 28 13:05:15 2010 +0100
pango: Update to 1.28.3.
commit d737c7b6fadd6a235cde8f8b359a6bb0ac113dd2 Author: Schantl Stefan Stevee@ipfire.org Date: Sun Nov 28 10:25:29 2010 +0100
db: Update to 5.1.19.
commit b2eeb672ab8667eb6378e595be992a0492ed4285 Author: Schantl Stefan Stevee@ipfire.org Date: Sun Nov 28 10:02:12 2010 +0100
libpng: Update to 1.4.4.
commit 5818d5458f7625dd4a3132a6aad998007fefce8c Author: Schantl Stefan Stevee@ipfire.org Date: Sun Nov 28 09:58:39 2010 +0100
htop: Update to 0.9.
commit 4be400c59a4e9ffbae9cdd31d35db1709010b4ce Merge: c838b91 f94c181 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Nov 28 00:35:41 2010 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
commit c838b91a97f15d1ab8667bf421639acad15e8bb4 Merge: 0913a50 60bd296 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Nov 28 00:04:41 2010 +0100
Merge remote branch 'stevee/updates' into next
commit 60bd296e37e17ba2332f3be9782a7d17c26344cb Author: Schantl Stefan Stevee@ipfire.org Date: Sat Nov 27 23:26:09 2010 +0100
gdb: Create development package.
commit 776f744d2a40819c4d114ecadbab4ccf7674af49 Author: Schantl Stefan Stevee@ipfire.org Date: Sat Nov 27 23:23:55 2010 +0100
gdb: Update to 7.2.
commit eae40651c6ba130f1ca19a5a3f0d300ce9f086ff Author: Schantl Stefan Stevee@ipfire.org Date: Sat Nov 27 23:18:59 2010 +0100
syslog-ng: Update to 3.1.3.
commit f94c181673d47c7ec240957eeb795709ba783f69 Merge: 3533c57 0913a50 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Nov 27 16:57:11 2010 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
commit 3533c571bc849ca551a93066e44571a7e0f568e2 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Nov 27 16:56:42 2010 +0100
generator: Use zerofree to resparse ext3 files.
commit 555722229e1e993777fd3c5bf231d02ac67918a8 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 23 01:10:31 2010 +0100
zerofree: New package.
-----------------------------------------------------------------------
Summary of changes: naoki/dependencies.py | 2 +- naoki/generators.py | 1 + naoki/packages.py | 6 ++- pkgs/core/cups/cups.nm | 2 +- pkgs/core/curl/curl.nm | 2 +- pkgs/core/curl/patches/curl-7.20.0-lrt.patch | 30 --------- pkgs/core/db/db.nm | 4 +- .../db/patches/db-4.7.25-upstream_fixes-1.patch | 64 -------------------- pkgs/core/gdb/gdb.nm | 4 +- pkgs/core/htop/htop.nm | 7 ++- pkgs/core/libpng/libpng.nm | 2 +- pkgs/core/openssl/openssl.nm | 9 +-- .../openssl/patches/openssl-1.0.0-version.patch | 13 ---- .../openssl/patches/openssl-1.0.0b-version.patch | 22 +++++++ pkgs/core/pango/pango.nm | 2 +- pkgs/core/syslog-ng/syslog-ng.nm | 2 +- .../{tunctl/tunctl.nm => zerofree/zerofree.nm} | 41 +++++++------ tools/generator | 17 ++---- 18 files changed, 74 insertions(+), 156 deletions(-) delete mode 100644 pkgs/core/curl/patches/curl-7.20.0-lrt.patch delete mode 100644 pkgs/core/db/patches/db-4.7.25-upstream_fixes-1.patch delete mode 100644 pkgs/core/openssl/patches/openssl-1.0.0-version.patch create mode 100644 pkgs/core/openssl/patches/openssl-1.0.0b-version.patch copy pkgs/core/{tunctl/tunctl.nm => zerofree/zerofree.nm} (67%)
Difference in files: diff --git a/naoki/dependencies.py b/naoki/dependencies.py index 3463183..395c70e 100644 --- a/naoki/dependencies.py +++ b/naoki/dependencies.py @@ -103,7 +103,7 @@ class DependencySet(object): for package in self._items: if package.name == item.name: if item > package: - logging.update("Replacing package %s by %s" % (package, item)) + logging.debug("Replacing package %s by %s" % (package, item)) self._items.remove(package) break
diff --git a/naoki/generators.py b/naoki/generators.py index 99b385d..d3c995b 100644 --- a/naoki/generators.py +++ b/naoki/generators.py @@ -32,6 +32,7 @@ class Generator(_Environment): "squashfs-tools", "syslinux", "util-linux-ng", + "zerofree", "/sbin/dmsetup", "/usr/bin/mkisofs", ] diff --git a/naoki/packages.py b/naoki/packages.py index f38afec..0c66ef5 100644 --- a/naoki/packages.py +++ b/naoki/packages.py @@ -209,7 +209,11 @@ class BinaryPackage(Package): return ret
def _readfile(self, name): - f = io.CpioArchive(self.filename) + try: + f = io.CpioArchive(self.filename) + except ValueError, e: + raise Exception, "Could not open package '%s' correctly: %s" \ + % (self.filename, e)
# If file is not available, return None ret = None diff --git a/pkgs/core/cups/cups.nm b/pkgs/core/cups/cups.nm index 029bde1..9b8693f 100644 --- a/pkgs/core/cups/cups.nm +++ b/pkgs/core/cups/cups.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include
PKG_NAME = cups -PKG_VER = 1.4.4 +PKG_VER = 1.4.5 PKG_REL = 0
PKG_MAINTAINER = diff --git a/pkgs/core/curl/curl.nm b/pkgs/core/curl/curl.nm index 3f049f0..9085941 100644 --- a/pkgs/core/curl/curl.nm +++ b/pkgs/core/curl/curl.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include
PKG_NAME = curl -PKG_VER = 7.21.1 +PKG_VER = 7.21.2 PKG_REL = 0
PKG_MAINTAINER = diff --git a/pkgs/core/curl/patches/curl-7.20.0-lrt.patch b/pkgs/core/curl/patches/curl-7.20.0-lrt.patch deleted file mode 100644 index 775f183..0000000 --- a/pkgs/core/curl/patches/curl-7.20.0-lrt.patch +++ /dev/null @@ -1,30 +0,0 @@ - src/Makefile.am | 2 +- - tests/libtest/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 3672458..890893d 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -49,7 +49,7 @@ include Makefile.inc - # This might hold -Werror - CFLAGS += @CURL_CFLAG_EXTRAS@ - --curl_LDADD = $(top_builddir)/lib/libcurl.la @CURL_LIBS@ -+curl_LDADD = $(top_builddir)/lib/libcurl.la @CURL_LIBS@ -lrt - curl_DEPENDENCIES = $(top_builddir)/lib/libcurl.la - BUILT_SOURCES = hugehelp.c - CLEANFILES = hugehelp.c -diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am -index 70b0f12..6512ce4 100644 ---- a/tests/libtest/Makefile.am -+++ b/tests/libtest/Makefile.am -@@ -54,7 +54,7 @@ EXTRA_DIST = test75.pl test307.pl test610.pl test613.pl test1013.pl \ - test1022.pl Makefile.inc - - # Dependencies (may need to be overriden) --LDADD = $(top_builddir)/lib/libcurl.la -+LDADD = $(top_builddir)/lib/libcurl.la -lrt - DEPENDENCIES = $(top_builddir)/lib/libcurl.la - - # Makefile.inc provides the source defines (TESTUTIL, SUPPORTFILES, diff --git a/pkgs/core/db/db.nm b/pkgs/core/db/db.nm index de0c54c..d216ac2 100644 --- a/pkgs/core/db/db.nm +++ b/pkgs/core/db/db.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include
PKG_NAME = db -PKG_VER_MAJ = 4.7 -PKG_VER_MIN = 25 +PKG_VER_MAJ = 5.1 +PKG_VER_MIN = 19 PKG_VER = $(PKG_VER_MAJ).$(PKG_VER_MIN) PKG_REL = 0
diff --git a/pkgs/core/db/patches/db-4.7.25-upstream_fixes-1.patch b/pkgs/core/db/patches/db-4.7.25-upstream_fixes-1.patch deleted file mode 100644 index a8de431..0000000 --- a/pkgs/core/db/patches/db-4.7.25-upstream_fixes-1.patch +++ /dev/null @@ -1,64 +0,0 @@ -Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org> -Date: 2008-09-28 -Initial Package Version: 4.7.25 -Upstream Status: From Upstream -Origin: http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch... -Description: Update to latest patch for 4.7.25 release (avoid improperly named - patches in LFS). - -diff -Naur db-4.7.25-orig/sequence/sequence.c db-4.7.25/sequence/sequence.c ---- db-4.7.25-orig/sequence/sequence.c 2008-05-05 15:25:09.000000000 -0500 -+++ db-4.7.25/sequence/sequence.c 2008-09-28 00:03:59.000000000 -0500 -@@ -187,7 +187,11 @@ - if ((ret = __db_get_flags(dbp, &tflags)) != 0) - goto err; - -- if (DB_IS_READONLY(dbp)) { -+ /* -+ * We can let replication clients open sequences, but must -+ * check later that they do not update them. -+ */ -+ if (F_ISSET(dbp, DB_AM_RDONLY)) { - ret = __db_rdonly(dbp->env, "DB_SEQUENCE->open"); - goto err; - } -@@ -244,6 +248,11 @@ - if ((ret != DB_NOTFOUND && ret != DB_KEYEMPTY) || - !LF_ISSET(DB_CREATE)) - goto err; -+ if (IS_REP_CLIENT(env) && -+ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { -+ ret = __db_rdonly(env, "DB_SEQUENCE->open"); -+ goto err; -+ } - ret = 0; - - rp = &seq->seq_record; -@@ -296,7 +305,12 @@ - */ - rp = seq->seq_data.data; - if (rp->seq_version == DB_SEQUENCE_OLDVER) { --oldver: rp->seq_version = DB_SEQUENCE_VERSION; -+oldver: if (IS_REP_CLIENT(env) && -+ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { -+ ret = __db_rdonly(env, "DB_SEQUENCE->open"); -+ goto err; -+ } -+ rp->seq_version = DB_SEQUENCE_VERSION; - if (!F_ISSET(env, ENV_LITTLEENDIAN)) { - if (IS_DB_AUTO_COMMIT(dbp, txn)) { - if ((ret = -@@ -707,6 +721,13 @@ - - MUTEX_LOCK(env, seq->mtx_seq); - -+ if (handle_check && IS_REP_CLIENT(env) && -+ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { -+ ret = __db_rdonly(env, "DB_SEQUENCE->get"); -+ goto err; -+ } -+ -+ - if (rp->seq_min + delta > rp->seq_max) { - __db_errx(env, "Sequence overflow"); - ret = EINVAL; diff --git a/pkgs/core/gdb/gdb.nm b/pkgs/core/gdb/gdb.nm index b7904aa..ea9ac1b 100644 --- a/pkgs/core/gdb/gdb.nm +++ b/pkgs/core/gdb/gdb.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include
PKG_NAME = gdb -PKG_VER = 6.8 +PKG_VER = 7.2 PKG_REL = 0
PKG_MAINTAINER = @@ -34,6 +34,8 @@ PKG_URL = http://gnu.org/software/gdb/ PKG_LICENSE = GPLv3+ PKG_SUMMARY = A GNU source-level debugger for C, C++, Java and other languages.
+PKG_PACKAGES += $(PKG_NAME_REAL)-devel + PKG_BUILD_DEPS+= ncurses-devel readline-devel zlib-devel PKG_DEPS += python
diff --git a/pkgs/core/htop/htop.nm b/pkgs/core/htop/htop.nm index 5c5524f..5c58d5e 100644 --- a/pkgs/core/htop/htop.nm +++ b/pkgs/core/htop/htop.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include
PKG_NAME = htop -PKG_VER = 0.8.1 -PKG_REL = 0 +PKG_VER = 0.9 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = Applications/System @@ -43,6 +43,9 @@ endef
PKG_TARBALL = $(THISAPP).tar.gz
+CONFIGURE_OPTIONS += \ + --sysconfdir=/etc + define STAGE_INSTALL_CMDS rm -rf $(BUILDROOT)/usr/share/{applications,pixmaps} endef diff --git a/pkgs/core/libpng/libpng.nm b/pkgs/core/libpng/libpng.nm index 1f5e077..7256922 100644 --- a/pkgs/core/libpng/libpng.nm +++ b/pkgs/core/libpng/libpng.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include
PKG_NAME = libpng -PKG_VER = 1.4.3 +PKG_VER = 1.4.4 PKG_REL = 0
PKG_MAINTAINER = diff --git a/pkgs/core/openssl/openssl.nm b/pkgs/core/openssl/openssl.nm index 0b5b0b3..b2803fa 100644 --- a/pkgs/core/openssl/openssl.nm +++ b/pkgs/core/openssl/openssl.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include
PKG_NAME = openssl -PKG_VER = 1.0.0 -PKG_REL = 1 +PKG_VER = 1.0.0b +PKG_REL = 3
PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org PKG_GROUP = System/Libraries @@ -60,11 +60,6 @@ endif #endif
define STAGE_PREPARE_CMDS - cd $(DIR_APP) && sed -e 's/__OpenBSD__/__linux__/' -e 's/arandom/urandom/' \ - -i crypto/rand/randfile.c - - cd $(DIR_APP) && sed -e 's/__OpenBSD__/__linux__/' -i crypto/rand/rand_unix.c - cd $(DIR_APP) && find crypto/ -name Makefile -exec \ sed 's/^ASFLAGS=/&-Wa,--noexecstack /' -i {} ;
diff --git a/pkgs/core/openssl/patches/openssl-1.0.0-version.patch b/pkgs/core/openssl/patches/openssl-1.0.0-version.patch deleted file mode 100644 index adaea6a..0000000 --- a/pkgs/core/openssl/patches/openssl-1.0.0-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up openssl-1.0.0/crypto/opensslv.h.version openssl-1.0.0/crypto/opensslv.h ---- openssl-1.0.0/crypto/opensslv.h.version 2010-03-30 10:59:26.000000000 +0200 -+++ openssl-1.0.0/crypto/opensslv.h 2010-03-30 11:00:52.000000000 +0200 -@@ -25,7 +25,8 @@ - * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for - * major minor fix final patch/beta) - */ --#define OPENSSL_VERSION_NUMBER 0x1000000fL -+/* we have to keep the version number to not break the abi */ -+#define OPENSSL_VERSION_NUMBER 0x10000003L - #ifdef OPENSSL_FIPS - #define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0-fips 29 Mar 2010" - #else diff --git a/pkgs/core/openssl/patches/openssl-1.0.0b-version.patch b/pkgs/core/openssl/patches/openssl-1.0.0b-version.patch new file mode 100644 index 0000000..bdb6ab6 --- /dev/null +++ b/pkgs/core/openssl/patches/openssl-1.0.0b-version.patch @@ -0,0 +1,22 @@ +diff -up openssl-1.0.0b/crypto/opensslv.h.version openssl-1.0.0b/crypto/opensslv.h +--- openssl-1.0.0b/crypto/opensslv.h.version 2010-11-16 17:31:23.000000000 +0100 ++++ openssl-1.0.0b/crypto/opensslv.h 2010-11-16 17:32:59.000000000 +0100 +@@ -25,7 +25,8 @@ + * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for + * major minor fix final patch/beta) + */ +-#define OPENSSL_VERSION_NUMBER 0x1000002f ++/* we have to keep the version number to not break the abi */ ++#define OPENSSL_VERSION_NUMBER 0x10000003 + #ifdef OPENSSL_FIPS + #define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0b-fips 16 Nov 2010" + #else +@@ -83,7 +84,7 @@ + * should only keep the versions that are binary compatible with the current. + */ + #define SHLIB_VERSION_HISTORY "" +-#define SHLIB_VERSION_NUMBER "1.0.0" ++#define SHLIB_VERSION_NUMBER "1.0.0b" + + + #endif /* HEADER_OPENSSLV_H */ diff --git a/pkgs/core/pango/pango.nm b/pkgs/core/pango/pango.nm index 5587122..fe450a0 100644 --- a/pkgs/core/pango/pango.nm +++ b/pkgs/core/pango/pango.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include
PKG_NAME = pango -PKG_VER = 1.28.1 +PKG_VER = 1.28.3 PKG_REL = 0
PKG_MAINTAINER = diff --git a/pkgs/core/syslog-ng/syslog-ng.nm b/pkgs/core/syslog-ng/syslog-ng.nm index 5083e9e..1cb7e57 100644 --- a/pkgs/core/syslog-ng/syslog-ng.nm +++ b/pkgs/core/syslog-ng/syslog-ng.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include
PKG_NAME = syslog-ng -PKG_VER = 2.1.3 +PKG_VER = 3.1.3 PKG_REL = 0
PKG_MAINTAINER = diff --git a/pkgs/core/zerofree/zerofree.nm b/pkgs/core/zerofree/zerofree.nm new file mode 100644 index 0000000..99f2ea1 --- /dev/null +++ b/pkgs/core/zerofree/zerofree.nm @@ -0,0 +1,63 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# 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 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = zerofree +PKG_VER = 1.0.1 +PKG_REL = 1 + +PKG_MAINTAINER = +PKG_GROUP = Filesystem/Tools +PKG_URL = http://intgat.tigress.co.uk/rmy/uml/ +PKG_LICENSE = GPL+ +PKG_SUMMARY = Utility to force unused ext2 inodes and blocks to zero. + +PKG_BUILD_DEPS+= e2fsprogs-devel + +define PKG_DESCRIPTION + zerofree is a utility to set unused filesystem inodes and blocks of an + ext2 filesystem to zero. This can improve the compressibility and + privacy of an ext2 filesystem. + + This tool was inspired by the ext2fs privacy (i.e. secure deletion) + patch described in a Linux kernel mailing list thread. + + WARNING: The filesystem to be processed should be unmounted or mounted + read-only. The tool tries to check this before running, but you + should be careful. +endef + +PKG_TARBALL = $(THISAPP).tgz + +define STAGE_BUILD + cd $(DIR_APP) && make $(PARALLELISMFLAGS) \ + CC="gcc $(CFLAGS)" +endef + +define STAGE_INSTALL + -mkdir -pv $(BUILDROOT)/usr/sbin + cd $(DIR_APP) && install -D -p -m 755 zerofree \ + $(BUILDROOT)/usr/sbin +endef diff --git a/tools/generator b/tools/generator index 9cc31b0..a04b8bf 100755 --- a/tools/generator +++ b/tools/generator @@ -123,6 +123,9 @@ function _ext3fs_resize() {
e2fsck -f -y ${device} resize2fs ${device} ${size} + + # Resparse after every resize operation + _ext3fs_resparse ${device} }
function _ext3fs_sparse() { @@ -135,16 +138,8 @@ function _ext3fs_sparse() {
function _ext3fs_resparse() { local file=${1} - local device=${2} - - local size=$(stat --format="%s" ${file}) - - # Shrink FS to minimal size - _ext3fs_resize ${device} - truncate -s $(_ext3fs_bytes ${device}) ${file}
- _ext3fs_sparse ${file} ${size} - _ext3fs_resize ${device} ${size} + zerofree ${file} }
function _installer_image_ext3fs() { @@ -180,10 +175,10 @@ function _installer_image_ext3fs() { cp -frp ${dir}/* ${tmp_dir} umount ${tmp_dir}
- #_ext3fs_resparse ${file} ${loop} - losetup -d ${loop}
+ _ext3fs_resparse ${file} + rm -rf ${tmp_dir} }
hooks/post-receive -- IPFire 3.x development tree
-
git＠ipfire.org