Revision: 6441
http://ipcop.svn.sourceforge.net/ipcop/?rev=6441&view=rev
Author: gespinasse
Date: 2012-03-01 06:52:46 +0000 (Thu, 01 Mar 2012)
Log Message:
-----------
Upgrade gnupg to 1.4.12
Remove -fno-strict-aliasing as fixed in this release
Remove the patch needed to pass the test suite on 1.4.11 as fixed
Skip the broken clock_gettime.
That make no difference for us as gettimeofday is found and is earlier in an
elif chain
Really fixing clock_gettime would so pull a librt/libpthread dependency for
nothing.
Modified Paths:
--------------
ipcop/trunk/lfs/gnupg
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
ipcop/trunk/updates/2.1.0/information.xml
Removed Paths:
-------------
ipcop/trunk/src/patches/gnupg-1.4.11_bug1179-minimal.patch
Modified: ipcop/trunk/lfs/gnupg
===================================================================
--- ipcop/trunk/lfs/gnupg 2012-02-29 21:08:49 UTC (rev 6440)
+++ ipcop/trunk/lfs/gnupg 2012-03-01 06:52:46 UTC (rev 6441)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = gnupg
-VER = 1.4.11
+VER = 1.4.12
HOST_ARCH = all
OTHER_SRC = yes
@@ -43,8 +43,6 @@
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-# -fno-strict-aliasing could be removed for 1.4.12
-CFLAGS += -fno-strict-aliasing
LDFLAGS += -pie
###############################################################################
@@ -55,7 +53,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 411744e1ef8ce90b87938c4203f001f1
+$(DL_FILE)_MD5 = ce3742e5c7912559cab7894ad8ba7f6b
install : $(TARGET)
@@ -85,10 +83,11 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- # fix a false positive with --enable-minimal (to be removed with 1.4.12)
- cd $(DIR_APP) && patch -Np0 -i
$(DIR_PATCHES)/$(THISAPP)_bug1179-minimal.patch
rm -rf /home/nobody/.gnupg /root/.gnupg
+ # elif defined (HAVE_GETTIMEOFDAY) is before elif defined
(HAVE_CLOCK_GETTIME) in cipher/random.c
+ # So broken clock_gettime test is not an issue for us and could be
skipped
+ cd $(DIR_APP) && sed -i 's/setrlimit clock_gettime/setrlimit/' configure
cd $(DIR_APP) && ./configure --prefix=/usr \
--build=$(TARGET_2) \
--disable-nls \
Deleted: ipcop/trunk/src/patches/gnupg-1.4.11_bug1179-minimal.patch
===================================================================
--- ipcop/trunk/src/patches/gnupg-1.4.11_bug1179-minimal.patch 2012-02-29
21:08:49 UTC (rev 6440)
+++ ipcop/trunk/src/patches/gnupg-1.4.11_bug1179-minimal.patch 2012-03-01
06:52:46 UTC (rev 6441)
@@ -1,50 +0,0 @@
-# svn diff -r 5457:5459 > ../gnupg-1.4.11_bug1179-minimal.patch
-Index: checks/ChangeLog
-===================================================================
---- checks/ChangeLog (revision 5457)
-+++ checks/ChangeLog (revision 5459)
-@@ -1,3 +1,8 @@
-+2010-10-19 David Shaw <ds...@jabberwocky.com>
-+
-+ * armor.test: Tweak the bug 1179 test to only run if Twofish is
-+ included in the program. The sample message requires Twofish.
-+
- 2010-05-12 Werner Koch <w...@g10code.com>
-
- * armor.test: Extend to test bug 1179.
-Index: checks/armor.test
-===================================================================
---- checks/armor.test (revision 5457)
-+++ checks/armor.test (revision 5459)
-@@ -739,16 +739,20 @@
- # armor filter gpg swalled the CRC line and passed the '-----END...'
- # line on to the decryption layer.
-
--i=alpha_seckey
--info "importing: $i"
--eval "(IFS=; echo \"\$$i\")" >x
--$GPG --import x || true
-+# Can only perform this test if we have Twofish
-
--i=nopad_armored_msg
--info "checking: $i"
--eval "(IFS=; echo \"\$$i\")" >x
--if echo "abc" | $GPG --passphrase-fd 0 -o - x > /dev/null ; then
-- :
--else
-- error "bug#1179 is back in town"
-+if $GPG --with-colons --list-config ciphername | grep TWOFISH > /dev/null
2>/dev/null ; then
-+ i=alpha_seckey
-+ info "importing: $i"
-+ eval "(IFS=; echo \"\$$i\")" >x
-+ $GPG --import x || true
-+
-+ i=nopad_armored_msg
-+ info "checking: $i"
-+ eval "(IFS=; echo \"\$$i\")" >x
-+ if echo "abc" | $GPG --passphrase-fd 0 -o - x > /dev/null ; then
-+ :
-+ else
-+ error "bug#1179 is back in town"
-+ fi
- fi
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-02-29 21:08:49 UTC
(rev 6440)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-03-01 06:52:46 UTC
(rev 6441)
@@ -96,6 +96,9 @@
/usr/lib/libgmp.so.10
/usr/lib/libgmp.so.10.0.4
##
+## gnupg-1.4.12
+/usr/bin/gpg
+##
## hdparm-9.39
/usr/sbin/hdparm
##
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2012-02-29 21:08:49 UTC (rev
6440)
+++ ipcop/trunk/updates/2.1.0/information.xml 2012-03-01 06:52:46 UTC (rev
6441)
@@ -7,7 +7,7 @@
Add URL filter.<br />
Language updates.<br />
Upgrade arping to 2.11, dhcpcd to 5.5.4, e2fsprogs to 1.42.1,
ethtool to 3.2, gmp to 5.0.4,
- hdparm to 9.39, kernel to 3.0.22, krb5 to 1.9.3,
+ gnupg to 1.4.12, hdparm to 9.39, kernel to 3.0.22, krb5 to 1.9.3,
libgcrypt to 1.5.0, libtool to 2.4.2, pixman to 0.24.4
procps to 3.3.2, shadow to 4.1.5, util-linux to 2.21.
<br />
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
