Revision: 7020
http://ipcop.svn.sourceforge.net/ipcop/?rev=7020&view=rev
Author: gespinasse
Date: 2013-05-01 20:46:54 +0000 (Wed, 01 May 2013)
Log Message:
-----------
Upgrade krb5 to 1.10.5
Use --with-crypto-impl=openssl decrease libk5crypto.so.3.1 size by 2.
Add src to $(DIR_SRC)/$(THISAPP) for DIR_APP value as it is used everywhere
here.
Fix t_fortuna.o linking failure when using --with-crypto-impl=openssl
Remove LDFLAGS="-no-fatal-warnings" as it is no more needed (probably since
1.10)
Add a comment for the tests that fail on 3.2 kernel or 3.4
Modified Paths:
--------------
ipcop/trunk/lfs/krb5
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
ipcop/trunk/updates/2.1.0/information.xml
Modified: ipcop/trunk/lfs/krb5
===================================================================
--- ipcop/trunk/lfs/krb5 2013-05-01 06:39:28 UTC (rev 7019)
+++ ipcop/trunk/lfs/krb5 2013-05-01 20:46:54 UTC (rev 7020)
@@ -33,18 +33,16 @@
include Config
PKG_NAME = krb5
-VER = 1.10.3
+VER = 1.10.5
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.10
-DIR_APP = $(DIR_SRC)/$(THISAPP)
+DIR_APP = $(DIR_SRC)/$(THISAPP)/src
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-# -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
###############################################################################
@@ -55,7 +53,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = a31eaa949d663cccca6b790af4573368
+$(DL_FILE)_MD5 = 03bda611b1e13d5bf7a3d2c714c01bbc
install : $(TARGET)
@@ -87,44 +85,50 @@
@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*
+ # Using --with-crypto-impl=openssl show this make check issue
/usr/bin/ld: t_fortuna.o: undefined reference to symbol 'AES_set_encrypt_key'
+ # Adding LIBS fix the issue.
+ cd $(DIR_APP) && sed -i 's/o t_fortuna t_fortuna.o .*/& $$(LIBS)/'
lib/crypto/krb/Makefile.in
+
# 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
+ cd $(DIR_APP) && 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}
+ cd $(DIR_APP) && sed -i -e 's/^#pragma GCC diagnostic push$$//g' \
+ -e 's/^#pragma GCC diagnostic pop/#pragma GCC
diagnostic error "-Wuninitialized"/g' 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 && \
+ cd $(DIR_APP) && \
ac_cv_prog_PYTHON= \
./configure \
CPPFLAGS="-I/usr/include/et -I/usr/include/ss" \
- LDFLAGS="-no-fatal-warnings" \
--prefix=/usr \
--localstatedir=/var/lib \
+ --with-crypto-impl=openssl \
--with-tcl=/$(TOOLS_DIR) \
--with-system-et \
--with-system-ss
- cd $(DIR_APP)/src && make -j $(PARALLELISM)
+ cd $(DIR_APP) && make -j $(PARALLELISM)
ifeq "$(RUNNING_TEST)" "yes"
+ # Tests work fine most of the time on 2.6.32 kernel
+ # but src/lib/rpc/unit-test/rpc_test.0/expire.exp fail on udp with
linux-3.2 or more recent kernel
# Some tests may still fail due to IPv6 host state
# des : kprop test fail if host is not connected to internet
- -cd $(DIR_APP)/src && make -k check &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
+ -cd $(DIR_APP) && make -k check &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
endif
- cd $(DIR_APP)/src && make install
+ cd $(DIR_APP) && make install
# Some files may remain after tests
@rm -rf /var/tmp/*
- @rm -rf $(DIR_APP) $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/squid-*
+ @rm -rf $(DIR_SRC)/$(THISAPP)
$(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 2013-05-01 06:39:28 UTC
(rev 7019)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2013-05-01 20:46:54 UTC
(rev 7020)
@@ -401,7 +401,7 @@
## iw-3.8
/usr/sbin/iw
##
-## krb5-1.10.3
+## krb5-1.10.5
/usr/lib/libgssapi_krb5.so.2
/usr/lib/libgssapi_krb5.so.2.2
/usr/lib/libgssrpc.so.4
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2013-05-01 06:39:28 UTC (rev
7019)
+++ ipcop/trunk/updates/2.1.0/information.xml 2013-05-01 20:46:54 UTC (rev
7020)
@@ -12,7 +12,7 @@
e2fsprogs to 1.42.7, ethtool to 3.6, expat to 2.1.0, freetype to
2.4.11, fontconfig to 2.9,
gawk to 4.0.2, GD to 2.49, gettext to 0.18.2, glib to 2.30.3, gmp
to 5.0.5, gnupg to 1.4.13, grep to 2.14, gzip to 1.5,
iproute2 to 3.7.0, iptables to 1.4.18, iptstate to 2.2.5, iputils
to s20121221, iw to 3.8,
- hdparm to 9.39, httpd to 2.2.24, krb5 to 1.10.3,
+ hdparm to 9.39, httpd to 2.2.24, krb5 to 1.10.5,
less to 451, libffi to 3.0.13, libgd to 2.0.36~rc1, libgcrypt to
1.5.1, libnet to 1.1.6,
libnfnetlink to 1.0.1, libnetfiltercontrack to 1.0.2, libnl to
3.2.16, libpcap to 1.3.0, libpng to 1.5.15,
libusb to 1.0.9, libusb-compat to 0.1.4, libtool to 2.4.2, libxml2
to 2.9.1, logrotate to 3.8.1, lsof to 4.87,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET
Get 100% visibility into your production application - at no cost.
Code-level diagnostics for performance bottlenecks with <2% overhead
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap1
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
