[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop:[7038] ipcop/trunk/lfs/krb5
From:       gespinasse () users ! sourceforge ! net
Date:       2013-05-17 8:59:48
Message-ID: E1UdGVw-000639-Ob () sfp-svn-4 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 7038
          http://ipcop.svn.sourceforge.net/ipcop/?rev=7038&view=rev
Author:   gespinasse
Date:     2013-05-17 08:59:47 +0000 (Fri, 17 May 2013)
Log Message:
-----------
Fix a few warnings
Remove the python hack as there is no more a reason to do that.
Python is always build before krb5 and our version is not outdated, even the oldest \
as possible.

Modified Paths:
--------------
    ipcop/trunk/lfs/krb5

Modified: ipcop/trunk/lfs/krb5
===================================================================
--- ipcop/trunk/lfs/krb5	2013-05-17 08:51:11 UTC (rev 7037)
+++ ipcop/trunk/lfs/krb5	2013-05-17 08:59:47 UTC (rev 7038)
@@ -102,11 +102,23 @@
 				-e 's/^#pragma GCC diagnostic pop/#pragma GCC diagnostic error \
                "-Wuninitialized"/g' \
 				-e '/Wmaybe-uninitialized/d' lib/krb5/krb/{x-deltat.y,deltat.c}
 
-	# Do not detect python on rebuild with ac_cv_prog_PYTHON=
+
+	# 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 +	cd $(DIR_APP) && sed -i '$$!N;s/^bool_t\nxdr_int32_t/static \
&/;P;D' lib/kdb/iprop_xdr.c +	cd $(DIR_APP) && sed -i \
'$$!N;s/^bool_t\nxdr_uint16_t/static &/;P;D' lib/kdb/iprop_xdr.c +	cd $(DIR_APP) && \
sed -i '$$!N;s/^bool_t\nxdr_uint32_t/static &/;P;D' lib/kdb/iprop_xdr.c +
+	# Fix initialization discards qualifiers from pointer target type, accepted \
upstream +	cd $(DIR_APP) && sed -i 's/  krb5_crypto_iov/  const krb5_crypto_iov/' \
lib/crypto/openssl/hmac.c +
 	# 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) && \
-		ac_cv_prog_PYTHON=					\
 		./configure						\
 			CPPFLAGS="-I/usr/include/et -I/usr/include/ss"	\
 			--prefix=/usr					\
@@ -123,12 +135,11 @@
 	# Some tests may still fail due to IPv6 host state
 	# des : kprop test fail if host is not connected to internet
 	-cd $(DIR_APP) && make -k check &> $(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
+	# Some files may remain after tests
+	@rm -rf /var/tmp/*
 endif
 
 	cd $(DIR_APP) && make install
 
-	# Some files may remain after tests
-	@rm -rf /var/tmp/*
-
 	@rm -rf $(DIR_SRC)/$(THISAPP) $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/squid-*
 	@$(POSTBUILD)

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


------------------------------------------------------------------------------
AlienVault Unified Security Management (USM) platform delivers complete
security visibility with the essential security capabilities. Easily and
efficiently configure, manage, and operate all of your security controls
from a single console and one unified framework. Download a free trial.
http://p.sf.net/sfu/alienvault_d2d
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn


[prev in list] [next in list] [prev in thread] [next in thread]