Hello community,
here is the log from the commit of package novell-ipsec-tools for
openSUSE:Factory checked in at 2014-08-20 10:50:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/novell-ipsec-tools (Old)
and /work/SRC/openSUSE:Factory/.novell-ipsec-tools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "novell-ipsec-tools"
Changes:
--------
--- /work/SRC/openSUSE:Factory/novell-ipsec-tools/novell-ipsec-tools.changes
2012-02-07 14:46:21.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.novell-ipsec-tools.new/novell-ipsec-tools.changes
2014-08-20 10:51:08.000000000 +0200
@@ -1,0 +2,20 @@
+Thu Aug 7 01:23:13 UTC 2014 - sfal...@opensuse.org
+
+- Modified to clear rpmlint check failure in oS:Factory (sr #243365)
+- Updated:
+ novell-ipsec-tools.spec
+ changed /var/run to /run
+ racoon.conf.turnpike
+ changed /var/run to /run
+ racoon.init
+ changed /var/run to /run
+
+-------------------------------------------------------------------
+Tue Jul 8 14:20:17 UTC 2014 - meiss...@suse.com
+
+- ipsec-tools-0.8.0-certasn1txtbroken.patch:
+ disable the certificate test in src/racoon/eaytest.c as the
+ internal X.509 ASN.1 string presentation was changed in openssl
+ and the test currently does not work.
+
+-------------------------------------------------------------------
New:
----
ipsec-tools-0.8.0-certasn1txtbroken.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ novell-ipsec-tools.spec ++++++
--- /var/tmp/diff_new_pack.omX4QU/_old 2014-08-20 10:51:10.000000000 +0200
+++ /var/tmp/diff_new_pack.omX4QU/_new 2014-08-20 10:51:10.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package novell-ipsec-tools
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -16,7 +16,6 @@
#
-
Name: novell-ipsec-tools
BuildRequires: autoconf
BuildRequires: automake
@@ -26,10 +25,10 @@
BuildRequires: openssl-devel
Version: 0.7.3
Release: 0
-License: BSD-3-Clause
-Group: Productivity/Networking/Security
PreReq: %insserv_prereq %fillup_prereq
Summary: IPsec Utilities with turnpike plugin enabled
+License: BSD-3-Clause
+Group: Productivity/Networking/Security
Source: ipsec-tools-%{version}.tar.bz2
Source1: racoon.init
Source2: sysconfig.racoon
@@ -44,13 +43,14 @@
Patch6: novell-ipsec-tools_plugins-am111.patch
Patch7: novell-ipsec-tools_nit-includes.patch
Patch8: novell-ipsec-tools_ldl_warning.patch
+Patch9: ipsec-tools-0.8.0-certasn1txtbroken.patch
Url: http://forge.novell.com/modules/xfmod/project/?turnpike
Prefix: /usr
Conflicts: ipsec-tools
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _sysconfdir /etc/racoon
-%define _sharedstatedir /var/run
-%define _localstatedir /var/run
+%define _sharedstatedir /run
+%define _localstatedir /run
%define sysconfdir /etc
%description
@@ -80,13 +80,14 @@
%package devel
-License: BSD-3-Clause
-Provides: libipsec libracoon
-Requires: novell-ipsec-tools = %{version} flex glibc-devel
+Provides: libipsec
+Provides: libracoon
+Requires: flex
+Requires: glibc-devel
+Requires: novell-ipsec-tools = %{version}
Summary: IPsec Utilities with turnpike plugin enabled
-Provides: ipsec-tools-devel
Group: Development/Libraries/Other
-AutoReqProv: on
+Provides: ipsec-tools-devel
PreReq: %install_info_prereq
PreReq: %install_info_prereq %insserv_prereq %fillup_prereq
@@ -124,6 +125,7 @@
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
ln -sf acracoon.m4 acinclude.m4
%build
@@ -156,9 +158,7 @@
cp -rv src/racoon/samples $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/
cp -v src/setkey/sample* $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}
-#mkdir -p -m 0755 $RPM_BUILD_ROOT/%{_sharedstatedir}/%{name}
install -m 0600 src/racoon/samples/psk.txt $RPM_BUILD_ROOT/%{_sysconfdir}
-#install -m 0644 src/racoon/samples/racoon.conf $RPM_BUILD_ROOT/{_sysconfdir}
cp -v %{S:3} $RPM_BUILD_ROOT/%{_sysconfdir}/setkey.conf
cp -v %{S:4} $RPM_BUILD_ROOT/%{_sysconfdir}/racoon.conf
cp -v %{S:4} $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/
++++++ ipsec-tools-0.8.0-certasn1txtbroken.patch ++++++
Index: ipsec-tools-0.8.0/src/racoon/eaytest.c
===================================================================
--- ipsec-tools-0.8.0.orig/src/racoon/eaytest.c
+++ ipsec-tools-0.8.0/src/racoon/eaytest.c
@@ -67,7 +67,10 @@
#define PVDUMP(var) racoon_hexdump((var)->v, (var)->l)
-/*#define CERTTEST_BROKEN */
+/* openssl 1.0.1h changed the ASN.1 encoding of strings
+ * to something different than we use. See if we can revert
+ * or fix this at a later stage. Marcus 20140708 */
+#define CERTTEST_BROKEN
/* prototype */
++++++ racoon.conf.turnpike ++++++
--- /var/tmp/diff_new_pack.omX4QU/_old 2014-08-20 10:51:10.000000000 +0200
+++ /var/tmp/diff_new_pack.omX4QU/_new 2014-08-20 10:51:10.000000000 +0200
@@ -33,7 +33,7 @@
#isakmp 202.249.11.124 [500];
#admin [7002]; # administrative's port by kmpstat.
#strict_address; # required all addresses must be bound.
- adminsock "/var/run/racoon/racoon.sock" "root" "users" 660;
+ adminsock "/run/racoon/racoon.sock" "root" "users" 660;
}
# Specification of default various timer.
++++++ racoon.init ++++++
--- /var/tmp/diff_new_pack.omX4QU/_old 2014-08-20 10:51:10.000000000 +0200
+++ /var/tmp/diff_new_pack.omX4QU/_new 2014-08-20 10:51:10.000000000 +0200
@@ -26,7 +26,7 @@
RACOON="IPsec IKE daemon (racoon)"
RACOON_BIN=/usr/sbin/racoon
RACOON_CONF=/etc/racoon/racoon.conf
-RACOON_PIDFILE=/var/run/racoon.pid
+RACOON_PIDFILE=/run/racoon.pid
test -x $SETKEY_BIN || exit 5
test -x $RACOON_BIN || exit 5
@@ -84,7 +84,7 @@
fi
# Create runtime socket dir if it does not exist
- [ -d /var/run/racoon ] || mkdir -m 0755 /var/run/racoon
+ [ -d /run/racoon ] || mkdir -m 0755 /run/racoon
# startproc should return 0, even if service is
# already running to match LSB spec.
startproc $RACOON_BIN $RACOON_OPTIONS -f $RACOON_CONF
@@ -150,7 +150,7 @@
# Status has a slightly different for the status command:
# 0 - service running
- # 1 - service dead, but /var/run/ pid file exists
+ # 1 - service dead, but /run/ pid file exists
# 2 - service dead, but /var/lock/ lock file exists
# 3 - service not running
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
