Hello community, here is the log from the commit of package ipsec-tools for openSUSE:Factory checked in at Mon May 9 10:18:33 CEST 2011.
-------- --- ipsec-tools/ipsec-tools.changes 2009-11-03 20:18:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/ipsec-tools/ipsec-tools.changes 2011-05-04 14:04:07.000000000 +0200 @@ -1,0 +2,9 @@ +Wed May 4 12:02:13 UTC 2011 - idoen...@novell.com + +- Add ipsec-tools-0.7.3-linkerflag.patch: remove wrong linker flag +- Add ipsec-tools-0.7.2-nodevel.patch: don't install development + files, instead of manually removing them in the spec file. +- Drop no_werror.patch: Remove Werror flag by sed, its all over the + configure file, old patch was incomplete anyway. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- no_werror.patch New: ---- ipsec-tools-0.7.2-nodevel.patch ipsec-tools-0.7.3-linkerflag.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ipsec-tools.spec ++++++ --- /var/tmp/diff_new_pack.LXtf7c/_old 2011-05-09 10:06:28.000000000 +0200 +++ /var/tmp/diff_new_pack.LXtf7c/_new 2011-05-09 10:06:28.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package ipsec-tools (Version 0.7.3) +# spec file for package ipsec-tools # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,8 +21,8 @@ Name: ipsec-tools Summary: IPsec Utilities Version: 0.7.3 -Release: 2 -License: BSD 3-clause (or similar) +Release: 12 +License: BSD3c(or similar) Group: Productivity/Networking/Security AutoReqProv: on Url: http://ipsec-tools.sourceforge.net/ @@ -31,8 +31,9 @@ Source2: sysconfig.racoon Source3: setkey.conf.sample Source4: racoon.pam -Patch0: no_werror.patch -Patch3: racoon.conf_macros.patch +Patch1: racoon.conf_macros.patch +Patch2: ipsec-tools-0.7.3-linkerflag.patch +Patch3: ipsec-tools-0.7.2-nodevel.patch Prefix: /usr BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq @@ -68,8 +69,11 @@ %prep %setup -q -%patch0 -p1 +%patch1 -p1 +%patch2 %patch3 -p1 +./bootstrap +sed -i 's|-Werror||g' configure %build %{suse_update_config -f . src/racoon} @@ -102,23 +106,6 @@ %install make install DESTDIR=$RPM_BUILD_ROOT -rm $RPM_BUILD_ROOT/usr/include/racoon/admin.h \ - $RPM_BUILD_ROOT/usr/include/racoon/evt.h \ - $RPM_BUILD_ROOT/usr/include/racoon/gcmalloc.h \ - $RPM_BUILD_ROOT/usr/include/racoon/ipsec_doi.h \ - $RPM_BUILD_ROOT/usr/include/racoon/isakmp.h \ - $RPM_BUILD_ROOT/usr/include/racoon/isakmp_cfg.h \ - $RPM_BUILD_ROOT/usr/include/racoon/isakmp_unity.h \ - $RPM_BUILD_ROOT/usr/include/racoon/isakmp_var.h \ - $RPM_BUILD_ROOT/usr/include/racoon/isakmp_xauth.h \ - $RPM_BUILD_ROOT/usr/include/racoon/misc.h \ - $RPM_BUILD_ROOT/usr/include/racoon/racoonctl.h \ - $RPM_BUILD_ROOT/usr/include/racoon/schedule.h \ - $RPM_BUILD_ROOT/usr/include/racoon/sockmisc.h \ - $RPM_BUILD_ROOT/usr/include/racoon/var.h \ - $RPM_BUILD_ROOT/usr/include/racoon/vmbuf.h \ - $RPM_BUILD_ROOT/usr/%{_lib}/libracoon.a \ - $RPM_BUILD_ROOT/usr/%{_lib}/libracoon.la mkdir -p $RPM_BUILD_ROOT/etc/init.d install -m 0755 $RPM_SOURCE_DIR/racoon.init $RPM_BUILD_ROOT/etc/init.d/racoon ln -sf /etc/init.d/racoon $RPM_BUILD_ROOT/usr/sbin/rcracoon @@ -166,10 +153,6 @@ %dir /etc/racoon %dir /etc/racoon/cert /usr/sbin/rcracoon -%dir /usr/include/libipsec/ -/usr/include/libipsec/libpfkey.h -/usr/%{_lib}/libipsec.a -/usr/%{_lib}/libipsec.la /usr/sbin/racoon /usr/sbin/racoonctl /usr/sbin/setkey ++++++ ipsec-tools-0.7.2-nodevel.patch ++++++ diff -up ipsec-tools-0.7.2/src/libipsec/Makefile.am.nodevel ipsec-tools-0.7.2/src/libipsec/Makefile.am --- ipsec-tools-0.7.2/src/libipsec/Makefile.am.nodevel 2009-07-15 10:15:40.000000000 +0200 +++ ipsec-tools-0.7.2/src/libipsec/Makefile.am 2009-07-15 10:15:40.000000000 +0200 @@ -1,11 +1,10 @@ #bin_PROGRAMS = test-policy test-policy-priority -lib_LTLIBRARIES = libipsec.la +noinst_LTLIBRARIES = libipsec.la libipsecdir = $(includedir)/libipsec -libipsec_HEADERS = libpfkey.h -man3_MANS = ipsec_set_policy.3 ipsec_strerror.3 +#man3_MANS = ipsec_set_policy.3 ipsec_strerror.3 AM_CFLAGS = @GLIBC_BUGS@ AM_YFLAGS = -d -p __libipsec @@ -28,7 +27,7 @@ libipsec_la_SOURCES = \ libipsec_la_LDFLAGS = -version-info 0:1:0 libipsec_la_LIBADD = $(LEXLIB) -noinst_HEADERS = ipsec_strerror.h +noinst_HEADERS = ipsec_strerror.h libpfkey.h #test_policy_SOURCES = test-policy.c #test_policy_LDFLAGS = libipsec.la diff -up ipsec-tools-0.7.2/src/racoon/Makefile.am.nodevel ipsec-tools-0.7.2/src/racoon/Makefile.am --- ipsec-tools-0.7.2/src/racoon/Makefile.am.nodevel 2009-07-15 10:15:40.000000000 +0200 +++ ipsec-tools-0.7.2/src/racoon/Makefile.am 2009-07-15 10:31:18.000000000 +0200 @@ -2,10 +2,10 @@ sbin_PROGRAMS = racoon racoonctl plainrsa-gen noinst_PROGRAMS = eaytest -include_racoon_HEADERS = racoonctl.h var.h vmbuf.h misc.h gcmalloc.h admin.h \ +racoonhdr = racoonctl.h var.h vmbuf.h misc.h gcmalloc.h admin.h \ schedule.h sockmisc.h vmbuf.h isakmp_var.h isakmp.h isakmp_xauth.h \ isakmp_cfg.h isakmp_unity.h ipsec_doi.h evt.h -lib_LTLIBRARIES = libracoon.la +noinst_LTLIBRARIES = libracoon.la adminsockdir=${localstatedir}/racoon @@ -63,7 +63,7 @@ eaytest_LDADD = crypto_openssl_test.o vm eaytest_DEPENDENCIES = crypto_openssl_test.o vmbuf.o str2val.o \ misc_noplog.o $(CRYPTOBJS) -noinst_HEADERS = \ +noinst_HEADERS = $(racoonhdr) \ admin.h dnssec.h isakmp_base.h oakley.h session.h \ admin_var.h dump.h isakmp_ident.h pfkey.h sockmisc.h \ algorithm.h gcmalloc.h isakmp_inf.h plog.h str2val.h \ ++++++ ipsec-tools-0.7.3-linkerflag.patch ++++++ --- configure.ac 2011-05-04 13:22:09.841920703 +0200 +++ configure.ac 2011-05-04 13:27:18.964920650 +0200 @@ -315,7 +315,7 @@ AC_MSG_ERROR([ICONV libs or includes not found. Aborting.]) fi fi - LIBS="$LIBS -L$libiconv_dir/lib -R$libiconv_dir/lib -liconv" + LIBS="$LIBS -L$libiconv_dir/lib -liconv" AC_CHECK_FUNCS(iconv_open) fi @@ -379,7 +379,7 @@ fi fi AC_DEFINE([HAVE_LIBRADIUS], [], [Hybrid authentication uses RADIUS]) - LIBS="$LIBS -L$libradius_dir/lib -R$libradius_dir/lib -lradius" + LIBS="$LIBS -L$libradius_dir/lib -lradius" AC_CHECK_FUNCS(rad_create_request) fi @@ -405,7 +405,7 @@ fi fi AC_DEFINE([HAVE_LIBPAM], [], [Hybrid authentication uses PAM]) - LIBS="$LIBS -L$libpam_dir/lib -R$libpam_dir/lib -lpam" + LIBS="$LIBS -L$libpam_dir/lib -lpam" AC_CHECK_FUNCS(pam_start) fi @@ -431,7 +431,7 @@ fi fi AC_DEFINE([HAVE_LIBLDAP], [], [Hybrid authentication uses LDAP]) - LIBS="$LIBS -L$libldap_dir/lib -R$libldap_dir/lib -lldap" + LIBS="$LIBS -L$libldap_dir/lib -lldap" saved_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -Wall -Werror" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
