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 1f26ad8535e941eabe44a7ced807cba197bd8271 (commit) via dd6ea837303dfd8288f456bb8d31ffe22f8d860d (commit) via 9a9d82f688a21cdab40565180caf9a135f954dcd (commit) via f9cf289927abe4ac6433167e21ee1b02d3b73f29 (commit) via 5e5d8f51b6339455e2991cec0ea1b897de224a9e (commit) via ec476d554f9014d801a8d07836efa9ac5c5b65a0 (commit) from 2bd9b33ab279017554e98e7aa43f0a34555ba18b (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 1f26ad8535e941eabe44a7ced807cba197bd8271 Merge: dd6ea83 2bd9b33 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jan 5 16:07:00 2012 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
Conflicts: openssl/openssl.nm
commit dd6ea837303dfd8288f456bb8d31ffe22f8d860d Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jan 5 16:06:05 2012 +0100
memtest86+: Only build on x86 architectures.
commit 9a9d82f688a21cdab40565180caf9a135f954dcd Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jan 5 16:04:52 2012 +0100
openssl: Update to 1.0.0f.
* DTLS Plaintext Recovery Attack (CVE-2011-4108) * Double-free in Policy Checks (CVE-2011-4109) * Uninitialized SSL 3.0 Padding (CVE-2011-4576) * Malformed RFC 3779 Data Can Cause Assertion Failures (CVE-2011-4577) * Affected users should upgrade to OpenSSL 1.0.0f or 0.9.8s. * SGC Restart DoS Attack (CVE-2011-4619)
http://www.openssl.org/news/secadv_20120104.txt
commit f9cf289927abe4ac6433167e21ee1b02d3b73f29 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Dec 23 14:21:57 2011 +0100
perl-Tk: New package.
Required by perl itself.
commit 5e5d8f51b6339455e2991cec0ea1b897de224a9e Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Dec 19 01:19:22 2011 +0100
memtest86+: Remove debuginfo package.
There are no ELF binaries in there.
commit ec476d554f9014d801a8d07836efa9ac5c5b65a0 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Dec 19 00:44:55 2011 +0100
Remove libaal and reiser4progs.
It is not likely that we will support reiser4 in the future.
It is a really nice file system, but it is not getting very much support in the Linux kernel.
-----------------------------------------------------------------------
Summary of changes: libaal/libaal.nm | 49 -------------- memtest86+/memtest86+.nm | 7 +-- openssl/openssl.nm | 4 +- ...-version.patch => openssl-1.0.0f-version.patch} | 12 ++-- perl-Tk/patches/perl-Tk-debian.patch | 71 ++++++++++++++++++++ perl-Tk/patches/perl-Tk-seg.patch | 33 +++++++++ perl-Tk/patches/perl-Tk-widget.patch0 | 26 +++++++ perl-Tk/perl-Tk.nm | 65 ++++++++++++++++++ .../patches/reiser4progs-1.0.7-bad_elif.patch | 12 --- reiser4progs/patches/reiser4progs-libaal.patch | 12 --- reiser4progs/patches/reiser4progs-makefile.patch | 8 -- reiser4progs/patches/reiser4progs-opt.patch | 18 ----- reiser4progs/reiser4progs.nm | 69 ------------------- 13 files changed, 205 insertions(+), 181 deletions(-) delete mode 100644 libaal/libaal.nm rename openssl/patches/{openssl-1.0.0e-version.patch => openssl-1.0.0f-version.patch} (57%) create mode 100644 perl-Tk/patches/perl-Tk-debian.patch create mode 100644 perl-Tk/patches/perl-Tk-seg.patch create mode 100644 perl-Tk/patches/perl-Tk-widget.patch0 create mode 100644 perl-Tk/perl-Tk.nm delete mode 100644 reiser4progs/patches/reiser4progs-1.0.7-bad_elif.patch delete mode 100644 reiser4progs/patches/reiser4progs-libaal.patch delete mode 100644 reiser4progs/patches/reiser4progs-makefile.patch delete mode 100644 reiser4progs/patches/reiser4progs-opt.patch delete mode 100644 reiser4progs/reiser4progs.nm
Difference in files: diff --git a/libaal/libaal.nm b/libaal/libaal.nm deleted file mode 100644 index 2287807..0000000 --- a/libaal/libaal.nm +++ /dev/null @@ -1,49 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libaal -version = 1.0.5 -release = 1 - -groups = System/Filesystems -url = http://www.kernel.org/pub/linux/utils/fs/reiser4/libaal/ -license = GPL -summary = Reiser4's application abstraction library. - -description - This library is part of the Reiser4's filesystem support tools. -end - -source_dl = - -build - requires - gcc-c++ - end - - configure_options += \ - --libdir=/lib - - install_cmds - rm -vf %{BUILDROOT}/lib/libaal{,-minimal}.so - mkdir -pv %{BUILDROOT}/usr/lib - ln -svf ../../lib/libaal-1.0.so.5 %{BUILDROOT}/usr/lib/libaal-1.0.so - ln -svf libaal-1.0.so %{BUILDROOT}/usr/lib/libaal.so - ln -svf ../../lib/libaal-minimal.so.0 %{BUILDROOT}/usr/lib/libaal-minimal.so - end -end - -packages - package %{name} - end - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/memtest86+/memtest86+.nm b/memtest86+/memtest86+.nm index ee08866..0e5e444 100644 --- a/memtest86+/memtest86+.nm +++ b/memtest86+/memtest86+.nm @@ -5,7 +5,8 @@
name = memtest86+ version = 4.20 -release = 2 +release = 4 +sup_arches = i686 x86_64
groups = System/Base url = http://www.memtest.org/ @@ -40,8 +41,4 @@ end
packages package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end end diff --git a/openssl/openssl.nm b/openssl/openssl.nm index 1801749..4c27b89 100644 --- a/openssl/openssl.nm +++ b/openssl/openssl.nm @@ -4,8 +4,8 @@ ###############################################################################
name = openssl -version = 1.0.0e -release = 4 +version = 1.0.0f +release = 2
maintainer = Michael Tremer michael.tremer@ipfire.org groups = System/Libraries diff --git a/openssl/patches/openssl-1.0.0e-version.patch b/openssl/patches/openssl-1.0.0e-version.patch deleted file mode 100644 index 0a45f74..0000000 --- a/openssl/patches/openssl-1.0.0e-version.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up openssl-1.0.0e/crypto/opensslv.h.version openssl-1.0.0e/crypto/opensslv.h ---- openssl-1.0.0e/crypto/opensslv.h.version 2011-09-07 13:55:52.000000000 +0200 -+++ openssl-1.0.0e/crypto/opensslv.h 2011-09-07 13:59:28.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 0x1000005fL -+/* 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.0e-fips 6 Sep 2011" - #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.0e" - - - #endif /* HEADER_OPENSSLV_H */ diff --git a/openssl/patches/openssl-1.0.0f-version.patch b/openssl/patches/openssl-1.0.0f-version.patch new file mode 100644 index 0000000..6c67a5e --- /dev/null +++ b/openssl/patches/openssl-1.0.0f-version.patch @@ -0,0 +1,22 @@ +diff -up openssl-1.0.0f/crypto/opensslv.h.version openssl-1.0.0f/crypto/opensslv.h +--- openssl-1.0.0f/crypto/opensslv.h.version 2012-01-05 13:28:32.000000000 +0100 ++++ openssl-1.0.0f/crypto/opensslv.h 2012-01-05 13:29:37.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 0x1000006fL ++/* 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.0f-fips 4 Jan 2012" + #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.0f" + + + #endif /* HEADER_OPENSSLV_H */ diff --git a/perl-Tk/patches/perl-Tk-debian.patch b/perl-Tk/patches/perl-Tk-debian.patch new file mode 100644 index 0000000..6b945b4 --- /dev/null +++ b/perl-Tk/patches/perl-Tk-debian.patch @@ -0,0 +1,71 @@ +--- perl-tk-804.027.orig/objGlue.c ++++ perl-tk-804.027/objGlue.c +@@ -529,6 +529,10 @@ + sv_utf8_upgrade(objPtr); + #endif + s = SvPV(objPtr, len); ++ if (!s) ++ { ++ return NULL; ++ } + #ifdef SvUTF8 + if (!is_utf8_string(s,len)) + { +@@ -555,6 +559,10 @@ + else + { + s = LangString(objPtr); ++ if (!s) ++ { ++ return NULL; ++ } + #ifdef SvUTF8 + if (!is_utf8_string(s,strlen(s))) + { +--- perl-tk-804.027.orig/pTk/mTk/generic/tkFont.c ++++ perl-tk-804.027/pTk/mTk/generic/tkFont.c +@@ -1044,6 +1044,7 @@ + TkFont *fontPtr, *firstFontPtr, *oldFontPtr; + int new, descent; + NamedFont *nfPtr; ++ char *fontString; + + fiPtr = ((TkWindow *) tkwin)->mainPtr->fontInfoPtr; + if (objPtr->typePtr != &tkFontObjType) { +@@ -1077,8 +1078,12 @@ + cacheHashPtr = oldFontPtr->cacheHashPtr; + FreeFontObjProc(objPtr); + } else { ++ fontString = Tcl_GetString(objPtr); ++ if (fontString == NULL) { ++ fontString = ""; ++ } + cacheHashPtr = Tcl_CreateHashEntry(&fiPtr->fontCache, +- Tcl_GetString(objPtr), &new); ++ fontString, &new); + } + firstFontPtr = (TkFont *) Tcl_GetHashValue(cacheHashPtr); + for (fontPtr = firstFontPtr; (fontPtr != NULL); +@@ -1095,8 +1100,12 @@ + * The desired font isn't in the table. Make a new one. + */ + ++ fontString = Tcl_GetString(objPtr); ++ if (fontString == NULL) { ++ fontString = ""; ++ } + namedHashPtr = Tcl_FindHashEntry(&fiPtr->namedTable, +- Tcl_GetString(objPtr)); ++ fontString); + if (namedHashPtr != NULL) { + /* + * Construct a font based on a named font. +@@ -1111,7 +1120,7 @@ + * Native font? + */ + +- fontPtr = TkpGetNativeFont(tkwin, Tcl_GetString(objPtr)); ++ fontPtr = TkpGetNativeFont(tkwin, fontString); + if (fontPtr == NULL) { + TkFontAttributes fa; + Tcl_Obj *dupObjPtr = Tcl_DuplicateObj(objPtr); diff --git a/perl-Tk/patches/perl-Tk-seg.patch b/perl-Tk/patches/perl-Tk-seg.patch new file mode 100644 index 0000000..26201fa --- /dev/null +++ b/perl-Tk/patches/perl-Tk-seg.patch @@ -0,0 +1,33 @@ +diff -up Tk-804.028/pTk/mTk/generic/tkConfig.c.seg Tk-804.028/pTk/mTk/generic/tkConfig.c +--- Tk-804.028/pTk/mTk/generic/tkConfig.c.seg 2008-03-11 23:29:39.000000000 -0400 ++++ Tk-804.028/pTk/mTk/generic/tkConfig.c 2008-03-11 23:28:09.000000000 -0400 +@@ -1210,11 +1210,11 @@ GetOptionFromObj(interp, objPtr, tablePt + * First, check to see if the object already has the answer cached. + */ + +- if (objPtr->typePtr == &tkOptionObjType) { ++/* if (objPtr->typePtr == &tkOptionObjType) { + if (objPtr->internalRep.twoPtrValue.ptr1 == (VOID *) tablePtr) { + return (Option *) objPtr->internalRep.twoPtrValue.ptr2; + } +- } ++ }*/ + + /* + * The answer isn't cached. +@@ -2277,9 +2277,15 @@ Tk_GetOptionValue(interp, recordPtr, opt + if (optionPtr == NULL) { + return NULL; + } ++ ++ if (optionPtr->specPtr == NULL) { ++ return NULL; ++ } ++ + if (optionPtr->specPtr->type == TK_OPTION_SYNONYM) { + optionPtr = optionPtr->extra.synonymPtr; + } ++ + if (optionPtr->specPtr->objOffset >= 0) { + resultPtr = *((Tcl_Obj **) (recordPtr + optionPtr->specPtr->objOffset)); + if (resultPtr == NULL) { diff --git a/perl-Tk/patches/perl-Tk-widget.patch0 b/perl-Tk/patches/perl-Tk-widget.patch0 new file mode 100644 index 0000000..ec44658 --- /dev/null +++ b/perl-Tk/patches/perl-Tk-widget.patch0 @@ -0,0 +1,26 @@ +--- demos/widget.orig 2008-01-02 13:24:14.000000000 +0100 ++++ demos/widget 2008-01-02 13:27:10.000000000 +0100 +@@ -3,7 +3,8 @@ + use 5.008; + use Config; + use Tk 804.000; +-use lib Tk->findINC( 'demos/widget_lib' ); ++#use lib Tk->findINC( 'demos/widget_lib' ); ++use lib "@demopath@/widget_lib"; + use Tk::widgets qw/ DialogBox ErrorDialog LabEntry ROText /; + use Tk::Config (); + use WidgetDemo; +@@ -62,9 +63,11 @@ + $l->destroy; + } + +-my $widget_lib = Tk->findINC('demos/widget_lib'); ++#my $widget_lib = Tk->findINC('demos/widget_lib'); ++my $widget_lib = "@demopath@/widget_lib"; + my $wd = "$widget_lib/WidgetDemo.pm"; +-$WIDTRIB = Tk->findINC('demos/widtrib'); ++#$WIDTRIB = Tk->findINC('demos/widtrib'); ++$WIDTRIB = "@demopath@/widtrib"; + unless (Tk::tainting) { + $WIDTRIB = $ENV{WIDTRIB} if defined $ENV{WIDTRIB}; + $WIDTRIB = $ARGV[0] if defined $ARGV[0]; diff --git a/perl-Tk/perl-Tk.nm b/perl-Tk/perl-Tk.nm new file mode 100644 index 0000000..f73502e --- /dev/null +++ b/perl-Tk/perl-Tk.nm @@ -0,0 +1,65 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = perl-Tk +version = 804.029 +release = 1 +thisapp = Tk-%{version} + +groups = Development/Libraries +url = http://search.cpan.org/dist/Tk/ +license = GPL+ or Artistic +summary = Perl Graphical User Interface ToolKit. + +description + This a re-port of a perl interface to Tk8.4. + C code is derived from Tcl/Tk8.4.5. + It also includes all the C code parts of Tix8.1.4 from SourceForge. + The perl code corresponding to Tix's Tcl code is not fully implemented. + + Perl API is essentially the same as Tk800 series Tk800.025 but has not + been verified as compliant. There ARE differences see pod/804delta.pod. +end + +source_dl = http://cpan.org/modules/by-module/Tk/ + +build + requires + perl(ExtUtils::ParseXS) + perl(ExtUtils::MakeMaker) + perl-devel + libjpeg-devel + libpng-devel + libX11-devel + libXft-devel + end + + build + perl Makefile.PL INSTALLDIRS=vendor X11LIB=%{libdir} XFT=1 + make %{PARALLELISMFLAGS} + end + + install + make pure_install PERL_INSTALL_ROOT=%{BUILDROOT} + end +end + +packages + package %{name} + provides + perl(Tk::LabRadio) = 4.004 + perl(Tk::TextReindex) + perl(Tk) = %{version} + end + end + + package %{name}-devel + template DEVEL + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/reiser4progs/patches/reiser4progs-1.0.7-bad_elif.patch b/reiser4progs/patches/reiser4progs-1.0.7-bad_elif.patch deleted file mode 100644 index dd7cb20..0000000 --- a/reiser4progs/patches/reiser4progs-1.0.7-bad_elif.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur reiser4progs-1.0.7.org/plugin/node/node40/node40.c reiser4progs-1.0.7/plugin/node/node40/node40.c ---- reiser4progs-1.0.7.org/plugin/node/node40/node40.c 2009-01-08 22:34:27.000000000 +0100 -+++ reiser4progs-1.0.7/plugin/node/node40/node40.c 2009-04-28 14:15:04.000000000 +0200 -@@ -996,7 +996,7 @@ - func = cb_comp_key3; - #elif defined(ENABLE_LARGE_KEYS) - func = cb_comp_key4; --#elif -+#else - func = NULL; - #endif - diff --git a/reiser4progs/patches/reiser4progs-libaal.patch b/reiser4progs/patches/reiser4progs-libaal.patch deleted file mode 100644 index 667f07d..0000000 --- a/reiser4progs/patches/reiser4progs-libaal.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur old/configure.in new/configure.in ---- old/configure.in 2010-02-23 16:00:54.000000000 +0100 -+++ new/configure.in 2010-02-23 16:00:15.000000000 +0100 -@@ -71,7 +71,7 @@ - sed 's/([[0-9]]*).([[0-9]]*).([[0-9]]*)/\3/'` - - OLD_CFLAGS=$CFLAGS --CFLAGS="$CFLAGS -static" -+CFLAGS="$CFLAGS" - - # Compare MINIMUM-VERSION with libaal version - AC_TRY_RUN([ diff --git a/reiser4progs/patches/reiser4progs-makefile.patch b/reiser4progs/patches/reiser4progs-makefile.patch deleted file mode 100644 index 365a98c..0000000 --- a/reiser4progs/patches/reiser4progs-makefile.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- reiser4progs-1.0.6/include/repair/Makefile.am.wiget 2009-08-28 19:11:05.000000000 +0200 -+++ reiser4progs-1.0.6/include/repair/Makefile.am 2009-08-28 19:11:34.000000000 +0200 -@@ -3,4 +3,4 @@ repairinclude_HEADERS = librepair.h re - master.h format.h journal.h node.h place.h item.h \ - filter.h disk_scan.h twig_scan.h add_missing.h \ - semantic.h lost_found.h cleanup.h tree.h alloc.h \ -- object.h status.h backup.h oid.h pset.h -+ status.h backup.h oid.h pset.h diff --git a/reiser4progs/patches/reiser4progs-opt.patch b/reiser4progs/patches/reiser4progs-opt.patch deleted file mode 100644 index 5cbd95a..0000000 --- a/reiser4progs/patches/reiser4progs-opt.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- reiser4progs-1.0.2/configure.in.orig 2004-10-21 19:38:08.000000000 +0200 -+++ reiser4progs-1.0.2/configure.in 2004-10-24 22:08:44.861671296 +0200 -@@ -576,13 +576,8 @@ - - CFLAGS="$CFLAGS -W -Wall" - --if test x$enable_debug = xyes; then -- GENERIC_CFLAGS="$GENERIC_CFLAGS -O1 -g" -- MINIMAL_CFLAGS="$MINIMAL_CFLAGS -O1 -g" --else -- GENERIC_CFLAGS="$GENERIC_CFLAGS -O3" -- MINIMAL_CFLAGS="$MINIMAL_CFLAGS -Os" -- -+MINIMAL_CFLAGS="$MINIMAL_CFLAGS -Os" -+if test x$enable_debug != xyes; then - if test x$uninitialized = xyes; then - CFLAGS="$CFLAGS -Wuninitialized" - fi diff --git a/reiser4progs/reiser4progs.nm b/reiser4progs/reiser4progs.nm deleted file mode 100644 index 12b3d6a..0000000 --- a/reiser4progs/reiser4progs.nm +++ /dev/null @@ -1,69 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = reiser4progs -version = 1.0.7 -release = 1 - -groups = System/Filesystems -url = http://www.kernel.org/pub/linux/utils/fs/reiser4/reiser4progs/ -license = GPL -summary = Administration utilities for the Reiser4 filesystem. - -description - The filesystem utilities for the reiser4 filesystem, including: \ - fsck.reiser4, measurefs.reiser4, mkfs.reiser4 and resizefs.reiser4. -end - -source_dl = http://www.kernel.org/pub/linux/utils/fs/reiser4/reiser4progs/ -sources = %{thisapp}.tar.bz2 - -build - requires - autoconf - automake - e2fsprogs-devel - libaal-devel - libtool - libuuid-devel - ncurses-devel - readline-devel - end - - configure_options += \ - --sbindir=/sbin \ - --libdir=/lib \ - --disable-static \ - --disable-libminimal - - prepare_cmds - # Regenerate the buildsystem - libtoolize --install - aclocal - autoheader - autoconf - automake --add-missing - end - - install_cmds - rm -vf %{BUILDROOT}/lib/lib{reiser4,repair}.so - mkdir -pv %{BUILDROOT}/usr/lib - ln -svf ../../lib/libreiser4-1.0.so.7 %{BUILDROOT}/usr/lib/libreiser4-1.0.so - ln -svf ../../lib/librepair-1.0.so.7 %{BUILDROOT}/usr/lib/librepair-1.0.so - end -end - -packages - package %{name} - end - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end
hooks/post-receive -- IPFire 3.x development tree