Revision: 7750
          http://sourceforge.net/p/ipcop/svn/7750
Author:   owes
Date:     2014-12-15 07:15:26 +0000 (Mon, 15 Dec 2014)
Log Message:
-----------
Update krb5 to 1.12.2

Modified Paths:
--------------
    ipcop/trunk/config/rootfiles/common/krb5
    ipcop/trunk/lfs/krb5
    ipcop/trunk/updates/2.1.8/information.xml
    ipcop/trunk/updates/2.1.8/setup

Modified: ipcop/trunk/config/rootfiles/common/krb5
===================================================================
--- ipcop/trunk/config/rootfiles/common/krb5    2014-12-15 07:06:13 UTC (rev 
7749)
+++ ipcop/trunk/config/rootfiles/common/krb5    2014-12-15 07:15:26 UTC (rev 
7750)
@@ -42,10 +42,16 @@
 #usr/include/kadm5/chpass_util_strings.h
 #usr/include/kadm5/kadm_err.h
 #usr/include/kdb.h
+#usr/include/krad.h
 #usr/include/krb5
 #usr/include/krb5.h
+#usr/include/krb5/ccselect_plugin.h
+#usr/include/krb5/clpreauth_plugin.h
+#usr/include/krb5/hostrealm_plugin.h
 #usr/include/krb5/kadm5_hook_plugin.h
+#usr/include/krb5/kdcpreauth_plugin.h
 #usr/include/krb5/krb5.h
+#usr/include/krb5/localauth_plugin.h
 #usr/include/krb5/locate_plugin.h
 #usr/include/krb5/plugin.h
 #usr/include/krb5/preauth_plugin.h
@@ -60,39 +66,48 @@
 #usr/lib/krb5/plugins/kdb/db2.so
 #usr/lib/krb5/plugins/libkrb5
 #usr/lib/krb5/plugins/preauth
+#usr/lib/krb5/plugins/preauth/otp.so
 #usr/lib/krb5/plugins/preauth/pkinit.so
 #usr/lib/libgssapi_krb5.so
 usr/lib/libgssapi_krb5.so.2
 usr/lib/libgssapi_krb5.so.2.2
 #usr/lib/libgssrpc.so
 usr/lib/libgssrpc.so.4
-usr/lib/libgssrpc.so.4.1
+usr/lib/libgssrpc.so.4.2
 #usr/lib/libk5crypto.so
 usr/lib/libk5crypto.so.3
 usr/lib/libk5crypto.so.3.1
 #usr/lib/libkadm5clnt.so
 #usr/lib/libkadm5clnt_mit.so
-#usr/lib/libkadm5clnt_mit.so.8
-#usr/lib/libkadm5clnt_mit.so.8.0
+#usr/lib/libkadm5clnt_mit.so.9
+#usr/lib/libkadm5clnt_mit.so.9.0
 #usr/lib/libkadm5srv.so
 #usr/lib/libkadm5srv_mit.so
-#usr/lib/libkadm5srv_mit.so.8
-#usr/lib/libkadm5srv_mit.so.8.0
+#usr/lib/libkadm5srv_mit.so.9
+#usr/lib/libkadm5srv_mit.so.9.0
 #usr/lib/libkdb5.so
-usr/lib/libkdb5.so.6
-usr/lib/libkdb5.so.6.0
+usr/lib/libkdb5.so.7
+usr/lib/libkdb5.so.7.0
+#usr/lib/libkrad.so
+#usr/lib/libkrad.so.0
+#usr/lib/libkrad.so.0.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/lib/pkgconfig/gssrpc.pc
+#usr/lib/pkgconfig/kadm-client.pc
+#usr/lib/pkgconfig/kadm-server.pc
+#usr/lib/pkgconfig/kdb.pc
+#usr/lib/pkgconfig/krb5-gssapi.pc
+#usr/lib/pkgconfig/krb5.pc
+#usr/lib/pkgconfig/mit-krb5-gssapi.pc
+#usr/lib/pkgconfig/mit-krb5.pc
 #usr/sbin/gss-server
 #usr/sbin/kadmin.local
 #usr/sbin/kadmind
@@ -115,10 +130,12 @@
 #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/cat1
+#usr/share/man/cat5
+#usr/share/man/cat8
 #usr/share/man/man1/k5srvutil.1
 #usr/share/man/man1/kadmin.1
 #usr/share/man/man1/kdestroy.1
-#usr/share/man/man1/kerberos.1
 #usr/share/man/man1/kinit.1
 #usr/share/man/man1/klist.1
 #usr/share/man/man1/kpasswd.1
@@ -133,10 +150,12 @@
 #usr/share/man/man5/.k5login.5
 #usr/share/man/man5/k5identity.5
 #usr/share/man/man5/k5login.5
+#usr/share/man/man5/kadm5.acl.5
 #usr/share/man/man5/kdc.conf.5
 #usr/share/man/man5/krb5.conf.5
 #usr/share/man/man8/kadmin.local.8
 #usr/share/man/man8/kadmind.8
+#usr/share/man/man8/kdb5_ldap_util.8
 #usr/share/man/man8/kdb5_util.8
 #usr/share/man/man8/kprop.8
 #usr/share/man/man8/kpropd.8

Modified: ipcop/trunk/lfs/krb5
===================================================================
--- ipcop/trunk/lfs/krb5        2014-12-15 07:06:13 UTC (rev 7749)
+++ ipcop/trunk/lfs/krb5        2014-12-15 07:15:26 UTC (rev 7750)
@@ -33,13 +33,13 @@
 include Config
 
 PKG_NAME   = krb5
-VER        = 1.10.7
+VER        = 1.12.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.10
+DL_FROM    = http://web.mit.edu/kerberos/dist/krb5/1.12
 DIR_APP    = $(DIR_SRC)/$(THISAPP)/src
 TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
@@ -53,7 +53,7 @@
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4b2dc34ae78a9ebb459c7145421d5852
+$(DL_FILE)_MD5 = 357f1312b7720a0a591e22db0f7829fe
 
 install : $(TARGET)
 
@@ -85,12 +85,6 @@
        @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, accepted upstream (for 1.12)
-       cd $(DIR_APP) && sed -i 's/o t_fortuna t_fortuna.o .*/& $$(LIBS)/' 
lib/crypto/krb/Makefile.in
-       # Fix ld: warning libkrb5support.so.0, needed by ../libdb.so, not 
found, accepted upstream (for 1.12)
-       cd $(DIR_APP) && sed -i 's/^DB_LIB.*/& -lkrb5support/' 
plugins/kdb/db2/libdb2/test/Makefile.in
-
        # Hack : disable -Werror=uninitialized or build fail, probably gcc-4.4 
is less smart than later versions for uninitialized matter
        # Skip rpc udp tests that fail on kernel 3.2 or higher, upstream does 
the same (commit 11bd102c0e3793204111f712e5bd4bf54f2d9573)
        cd $(DIR_APP) && sed -i -e 's/ error=uninitialized //' -e 's/PASS="tcp 
udp"/PASS="tcp"/' configure
@@ -104,9 +98,6 @@
                                -e 's/^#pragma GCC diagnostic pop/#pragma GCC 
diagnostic error "-Wuninitialized"/g' \
                                -e '/Wmaybe-uninitialized/d' 
lib/krb5/krb/{x-deltat.y,deltat.c}
 
-       # Fix no previous prototype for 'k5_getcurtime', file disappear in 
master branch
-       cd $(DIR_APP) && sed -i 's/#include "cm.h"/#include "os-proto.h"\n&/' 
lib/krb5/os/cm.c
-
        # Hack against generated file by rpcgen, so probably not right for 
upstream
        # Add static to function to solve 'no previous prototype for'
        cd $(DIR_APP) && sed -i '$$!N;s/^bool_t\nxdr_int16_t/static &/;P;D' 
lib/kdb/iprop_xdr.c

Modified: ipcop/trunk/updates/2.1.8/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.8/information.xml   2014-12-15 07:06:13 UTC (rev 
7749)
+++ ipcop/trunk/updates/2.1.8/information.xml   2014-12-15 07:15:26 UTC (rev 
7750)
@@ -7,7 +7,7 @@
         <description>
         Upgrade acpid to 2.0.23, apache to 2.2.29, bind to 9.10.1, cairo to 
1.14.0, dhcpcd to 6.6.5,
         ethtool to 3.16, fontconfig to 2.11.1, freetype to 2.5.4, grep to 2.21,
-        harfbuzz to 0.9.36, hdparm to 9.45, iproute2 to 3.17.0, iw to 3.17,
+        harfbuzz to 0.9.36, hdparm to 9.45, iproute2 to 3.17.0, iw to 3.17, 
krb5 to 1.12.2,
         libpcap to 1.6.2, libpng to 1.6.15, libxml2 to 2.9.2, lsof to 4.88, 
openvpn to 2.3.6,
         pango to 1.36.8, pciutils to 3.3.0, pcre to 8.36, pixman to 0.32.6, 
procps to 3.3.10,
         rrdtool to 1.4.9, smartmontools to 6.3, sqlite to 3.8.7.2, squid to 
3.4.10, squid-langpack to 20141030,

Modified: ipcop/trunk/updates/2.1.8/setup
===================================================================
--- ipcop/trunk/updates/2.1.8/setup     2014-12-15 07:06:13 UTC (rev 7749)
+++ ipcop/trunk/updates/2.1.8/setup     2014-12-15 07:15:26 UTC (rev 7750)
@@ -94,6 +94,10 @@
 /bin/rm -f /usr/lib/libcairo.so.2.11200.16
 /bin/rm -f /usr/lib/libfreetype.so.6.11.2
 /bin/rm -f /usr/lib/libharfbuzz.so.0.927.0
+/bin/rm -f /usr/lib/libgssrpc.so.4
+/bin/rm -f /usr/lib/libgssrpc.so.4.1
+/bin/rm -f /usr/lib/libkdb5.so.6
+/bin/rm -f /usr/lib/libkdb5.so.6.0
 /bin/rm -f /usr/lib/libpcap.so.1.5.3
 /bin/rm -f /usr/lib/libpci.so.3.2.1
 /bin/rm -f /usr/lib/libpcre.so.1.2.2

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn

Reply via email to