Revision: 6709
http://ipcop.svn.sourceforge.net/ipcop/?rev=6709&view=rev
Author: gespinasse
Date: 2012-07-18 19:16:45 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
Upgrade krb to 1.10.2
This need a bit of hack as gcc-4.4 start to be old.
Remove -D_GNU_SOURCE to CFLAGS as on this version, this add more warning than
it remove.
Force rebuilding squid after krb5
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/krb5
ipcop/trunk/lfs/krb5
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
ipcop/trunk/updates/2.1.0/information.xml
ipcop/trunk/updates/2.1.0/setup
Modified: ipcop/trunk/config/rootfiles/common/krb5
===================================================================
--- ipcop/trunk/config/rootfiles/common/krb5 2012-07-18 17:56:40 UTC (rev
6708)
+++ ipcop/trunk/config/rootfiles/common/krb5 2012-07-18 19:16:45 UTC (rev
6709)
@@ -7,6 +7,7 @@
#usr/bin/kpasswd
#usr/bin/krb5-config
#usr/bin/ksu
+#usr/bin/kswitch
#usr/bin/ktutil
#usr/bin/kvno
#usr/bin/sclient
@@ -47,8 +48,11 @@
#usr/include/krb5/krb5.h
#usr/include/krb5/locate_plugin.h
#usr/include/krb5/plugin.h
+#usr/include/krb5/preauth_plugin.h
#usr/include/krb5/pwqual_plugin.h
#usr/include/profile.h
+#usr/include/verto-module.h
+#usr/include/verto.h
#usr/lib/krb5
#usr/lib/krb5/plugins
#usr/lib/krb5/plugins/authdata
@@ -56,7 +60,6 @@
#usr/lib/krb5/plugins/kdb/db2.so
#usr/lib/krb5/plugins/libkrb5
#usr/lib/krb5/plugins/preauth
-#usr/lib/krb5/plugins/preauth/encrypted_challenge.so
#usr/lib/krb5/plugins/preauth/pkinit.so
#usr/lib/libgssapi_krb5.so
usr/lib/libgssapi_krb5.so.2
@@ -76,14 +79,20 @@
#usr/lib/libkadm5srv_mit.so.8
#usr/lib/libkadm5srv_mit.so.8.0
#usr/lib/libkdb5.so
-#usr/lib/libkdb5.so.5
-#usr/lib/libkdb5.so.5.0
+usr/lib/libkdb5.so.6
+usr/lib/libkdb5.so.6.0
#usr/lib/libkrb5.so
usr/lib/libkrb5.so.3
usr/lib/libkrb5.so.3.3
#usr/lib/libkrb5support.so
#usr/lib/libkrb5support.so.0
#usr/lib/libkrb5support.so.0.1
+#usr/lib/libverto-k5ev.so
+#usr/lib/libverto-k5ev.so.0
+#usr/lib/libverto-k5ev.so.0.0
+#usr/lib/libverto.so
+#usr/lib/libverto.so.0
+#usr/lib/libverto.so.0.0
#usr/sbin/gss-server
#usr/sbin/kadmin.local
#usr/sbin/kadmind
@@ -103,6 +112,9 @@
#usr/share/examples/krb5/services.append
#usr/share/gnats
#usr/share/gnats/mit
+#usr/share/locale/en_US
+#usr/share/locale/en_US/LC_MESSAGES
+#usr/share/locale/en_US/LC_MESSAGES/mit-krb5.mo
#usr/share/man/man1/k5srvutil.1
#usr/share/man/man1/kadmin.1
#usr/share/man/man1/kdestroy.1
@@ -113,10 +125,14 @@
#usr/share/man/man1/krb5-config.1
#usr/share/man/man1/krb5-send-pr.1
#usr/share/man/man1/ksu.1
+#usr/share/man/man1/kswitch.1
#usr/share/man/man1/ktutil.1
#usr/share/man/man1/kvno.1
#usr/share/man/man1/sclient.1
+#usr/share/man/man5/.k5identity.5
#usr/share/man/man5/.k5login.5
+#usr/share/man/man5/k5identity.5
+#usr/share/man/man5/k5login.5
#usr/share/man/man5/kdc.conf.5
#usr/share/man/man5/krb5.conf.5
#usr/share/man/man8/kadmin.local.8
Modified: ipcop/trunk/lfs/krb5
===================================================================
--- ipcop/trunk/lfs/krb5 2012-07-18 17:56:40 UTC (rev 6708)
+++ ipcop/trunk/lfs/krb5 2012-07-18 19:16:45 UTC (rev 6709)
@@ -33,18 +33,19 @@
include Config
PKG_NAME = krb5
-VER = 1.9.4
+VER = 1.10.2
HOST_ARCH = all
OTHER_SRC = yes
THISAPP = $(PKG_NAME)-$(VER)
DL_FILE = $(THISAPP)-signed.tar
-DL_FROM = http://web.mit.edu/kerberos/dist/krb5/1.9
+DL_FROM = http://web.mit.edu/kerberos/dist/krb5/1.10
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-# -D_GNU_SOURCE solve no previous prototype for 'ptsname_r' warning
-CFLAGS += -fno-strict-aliasing -D_GNU_SOURCE
+# -D_GNU_SOURCE show a mess. It solve no previous prototype for 'ptsname_r'
warning
+# but trigger other warnings with asprintf, basename, gai_error, read, stat,
write
+CFLAGS += -fno-strict-aliasing
###############################################################################
# Top-level Rules
@@ -54,7 +55,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 7e689ed93ea491bc2850c5fd665d0d25
+$(DL_FILE)_MD5 = ddacb6ad7399681ad1506f435a2683b6
install : $(TARGET)
@@ -86,8 +87,21 @@
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
cd $(DIR_SRC) && tar zxf $(THISAPP).tar.gz && rm $(THISAPP).tar.gz*
- # -no-fatal-warnings is at least for the various warning: no previous
prototype for ...
+ # Hack : disable -Werror=uninitialized or build fail
+ # Probably gcc-4.4 is less smart than later versions for uninitialized
matter
+ cd $(DIR_APP)/src && sed -i 's/ error=uninitialized //' configure
+
+ # gcc-4.4 don't know about #pragma GCC diagnostic push/pop and warn
during compilation.
+ # gcc-4.6 is required for that push/pop feature.
+ # That mean gcc-4.4 can't pop diagnostic ignored "-Wuninitialized" and
not ignore that warning
+ # Replace pop with diagnostic error
+ sed -i -e 's/^#pragma GCC diagnostic push$$//g' \
+ -e 's/^#pragma GCC diagnostic pop/#pragma GCC diagnostic error
"-Wuninitialized"/g' $(DIR_APP)/src/lib/krb5/krb/{x-deltat.y,deltat.c}
+
+ # -no-fatal-warnings is at least for the various warning: no previous
prototype for and mktemp is dangerous
# Do not detect python on rebuild with ac_cv_prog_PYTHON=
+ # Don't care that much about libverto that may be used too on a more
recent glib.
+ # libverto linked code (krb5kdc kadmind) is not include.
cd $(DIR_APP)/src && \
ac_cv_prog_PYTHON= \
./configure \
@@ -111,5 +125,5 @@
# Some files may remain after tests
@rm -rf /var/tmp/*
- @rm -rf $(DIR_APP)
+ @rm -rf $(DIR_APP) $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/squid-*
@$(POSTBUILD)
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-07-18 17:56:40 UTC
(rev 6708)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-07-18 19:16:45 UTC
(rev 6709)
@@ -366,10 +366,16 @@
## iw-3.4
/usr/sbin/iw
##
-## krb5-1.9.4
+## krb5-1.10.2
+/usr/lib/libgssapi_krb5.so.2
/usr/lib/libgssapi_krb5.so.2.2
+/usr/lib/libgssrpc.so.4
/usr/lib/libgssrpc.so.4.1
+/usr/lib/libk5crypto.so.3
/usr/lib/libk5crypto.so.3.1
+/usr/lib/libkdb5.so.6
+/usr/lib/libkdb5.so.6.0
+/usr/lib/libkrb5.so.3
/usr/lib/libkrb5.so.3.3
##
## libffi-3.0.11
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2012-07-18 17:56:40 UTC (rev
6708)
+++ ipcop/trunk/updates/2.1.0/information.xml 2012-07-18 19:16:45 UTC (rev
6709)
@@ -11,7 +11,7 @@
dhcpcd to 5.5.6, dnsmasq to 2.62,
e2fsprogs to 1.42.4, ethtool to 3.2, expat to 2.1.0, freetype to
2.4.10, fontconfig to 2.9, gawk to 4.0.1, glib to 2.30.3,
gmp to 5.0.5, gnupg to 1.4.12, grep to 2.13, gzip to 1.5,
- iproute2 to 3.4.0, iptables to 1.4.14, iptstate to 2.2.5, iw to
3.4 hdparm to 9.39, kernel to 3.0.37, krb5 to 1.9.4,
+ iproute2 to 3.4.0, iptables to 1.4.14, iptstate to 2.2.5, iw to
3.4 hdparm to 9.39, kernel to 3.0.37, krb5 to 1.10.2,
libffi to 3.0.11, libgd to 2.0.36~rc1, libgcrypt to 1.5.0, libnet
to 1.1.6,
libnetfiltercontrack to 1.0.1, libnl to 3.2.11, libpng to 1.5.12,
libusb to 1.0.9, libusb-compat to 0.1.4, libtool to 2.4.2, libxml2
to 2.8.0, logrotate to 3.8.1, lsof to 4.86,
Modified: ipcop/trunk/updates/2.1.0/setup
===================================================================
--- ipcop/trunk/updates/2.1.0/setup 2012-07-18 17:56:40 UTC (rev 6708)
+++ ipcop/trunk/updates/2.1.0/setup 2012-07-18 19:16:45 UTC (rev 6709)
@@ -137,6 +137,7 @@
/bin/rm -f /usr/lib/libgcrypt.so
/bin/rm -f /usr/lib/libgcrypt.so.11.7.0
/bin/rm -f /usr/lib/libgmp.so.10.0.{2,3,4}
+/bin/rm -f /usr/lib/libkdb5.so.5.0
/bin/rm -f /usr/lib/liblber-2.4.so.2.8.1
/bin/rm -f /usr/lib/libldap-2.4.so.2.8.1
/bin/rm -f /usr/lib/libltdl.so
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
