[arch-commits] Commit in ipsec-tools/repos (5 files)

2019-01-10 Thread Felix Yan via arch-commits
Date: Friday, January 11, 2019 @ 07:40:48
  Author: felixonmars
Revision: 422263

archrelease: copy trunk to community-staging-x86_64

Added:
  ipsec-tools/repos/community-staging-x86_64/
  ipsec-tools/repos/community-staging-x86_64/PKGBUILD
(from rev 422261, ipsec-tools/trunk/PKGBUILD)
  ipsec-tools/repos/community-staging-x86_64/ipsec-tools-linux-3.7-compat.patch
(from rev 422261, ipsec-tools/trunk/ipsec-tools-linux-3.7-compat.patch)
  ipsec-tools/repos/community-staging-x86_64/ipsec.service
(from rev 422261, ipsec-tools/trunk/ipsec.service)
  ipsec-tools/repos/community-staging-x86_64/racoon.service
(from rev 422261, ipsec-tools/trunk/racoon.service)

+
 PKGBUILD   |   45 +++
 ipsec-tools-linux-3.7-compat.patch |   50 +++
 ipsec.service  |   12 
 racoon.service |   10 +++
 4 files changed, 117 insertions(+)

Copied: ipsec-tools/repos/community-staging-x86_64/PKGBUILD (from rev 422261, 
ipsec-tools/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2019-01-11 07:40:48 UTC (rev 422263)
@@ -0,0 +1,45 @@
+# Maintainer: Sergej Pupykin 
+# Contributor: Allan Henriksen 
+
+pkgname=ipsec-tools
+pkgver=0.8.2
+pkgrel=9
+pkgdesc="KAME IPSec tools ported to Linux"
+arch=('x86_64')
+url="http://ipsec-tools.sourceforge.net/";
+depends=('readline' 'openssl-1.0' 'krb5' 'flex')
+makedepends=('linux-headers')
+license=('GPL')
+options=('!makeflags')
+source=(https://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgver.tar.bz2
+   racoon.service
+   ipsec.service
+   ipsec-tools-linux-3.7-compat.patch)
+sha256sums=('8eb6b38716e2f3a8a72f1f549c9444c2bc28d52c9536792690564c74fe722f2d'
+'721ef004a93d16ce1e0c4c6951d65b8bf9bfe0e101d1b9b0756dd7c349e2ccc0'
+'2f10696f93aa0e88fa623318644f42332118dee4c3666948a12eb2fa108e2665'
+'34529108d013f5ad6dce9fa8e2acec7367f29319e4049e82dcb54fb0970ff520')
+
+build() {
+  cd "$srcdir"/$pkgname-$pkgver
+
+  patch -p1 <"$srcdir"/ipsec-tools-linux-3.7-compat.patch
+  sed -i 's#-Werror##' configure.ac
+
+  ./bootstrap
+  CFLAGS+=" -I/usr/include/openssl-1.0" \
+  CPPFLAGS+=" -I/usr/include/openssl-1.0" \
+  LDFLAGS+=" -L/usr/lib/openssl-1.0" \
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var 
--sbindir=/usr/bin \
+   --enable-security-context=no --enable-hybrid --enable-dpd --enable-natt 
\
+   --enable-adminport --enable-gssapi \
+   --with-kernel-headers=/usr/include
+  make
+}
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  install -Dm0644 "$srcdir"/racoon.service 
"$pkgdir"/usr/lib/systemd/system/racoon.service
+  install -Dm0644 "$srcdir"/ipsec.service 
"$pkgdir"/usr/lib/systemd/system/ipsec.service
+}

Copied: 
ipsec-tools/repos/community-staging-x86_64/ipsec-tools-linux-3.7-compat.patch 
(from rev 422261, ipsec-tools/trunk/ipsec-tools-linux-3.7-compat.patch)
===
--- community-staging-x86_64/ipsec-tools-linux-3.7-compat.patch 
(rev 0)
+++ community-staging-x86_64/ipsec-tools-linux-3.7-compat.patch 2019-01-11 
07:40:48 UTC (rev 422263)
@@ -0,0 +1,50 @@
+--- a/configure.ac
 b/configure.ac
+@@ -74,9 +74,10 @@ case "$host_os" in
+   [ KERNEL_INCLUDE="/lib/modules/`uname -r`/build/include" ])
+ 
+ AC_CHECK_HEADER($KERNEL_INCLUDE/linux/pfkeyv2.h, ,
+-  [ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h,
+-KERNEL_INCLUDE=/usr/src/linux/include ,
+-[ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) 
] ) ] )
++  [ AC_CHECK_HEADER($KERNEL_INCLUDE/uapi/linux/pfkeyv2.h, ,
++[ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h,
++  KERNEL_INCLUDE=/usr/src/linux/include ,
++  [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. 
Aborting.]) ] ) ] ) ] )
+ AC_SUBST(KERNEL_INCLUDE)
+ # We need the configure script to run with correct kernel headers.
+ # However we don't want to point to kernel source tree in compile time,
+@@ -643,7 +644,14 @@ AC_EGREP_CPP(yes,
+ #ifdef SADB_X_EXT_NAT_T_TYPE
+ yes
+ #endif
+-], [kernel_natt="yes"])
++], [kernel_natt="yes"], [
++  AC_EGREP_CPP(yes,
++  [#include 
++  #ifdef SADB_X_EXT_NAT_T_TYPE
++  yes
++  #endif
++  ], [kernel_natt="yes"])
++])
+   ;;
+ freebsd*|netbsd*)
+ # NetBSD case
+--- a/src/include-glibc/Makefile.am
 b/src/include-glibc/Makefile.am
+@@ -1,14 +1,7 @@
+-
+-.includes: ${top_builddir}/config.status
+-  ln -snf $(KERNEL_INCLUDE)/linux
+-  touch .includes
+-
+-all: .includes
+-
+ EXTRA_DIST = \
+   glibc-bugs.h \
+   net/pfkeyv2.h \
+   netinet/ipsec.h \
+   sys/queue.h
+ 
+-DISTCLEANFILES = .

[arch-commits] Commit in ipsec-tools/repos (5 files)

2018-11-09 Thread Evangelos Foutras via arch-commits
Date: Friday, November 9, 2018 @ 22:52:49
  Author: foutrelis
Revision: 405111

archrelease: copy trunk to community-staging-x86_64

Added:
  ipsec-tools/repos/community-staging-x86_64/
  ipsec-tools/repos/community-staging-x86_64/PKGBUILD
(from rev 405110, ipsec-tools/trunk/PKGBUILD)
  ipsec-tools/repos/community-staging-x86_64/ipsec-tools-linux-3.7-compat.patch
(from rev 405110, ipsec-tools/trunk/ipsec-tools-linux-3.7-compat.patch)
  ipsec-tools/repos/community-staging-x86_64/ipsec.service
(from rev 405110, ipsec-tools/trunk/ipsec.service)
  ipsec-tools/repos/community-staging-x86_64/racoon.service
(from rev 405110, ipsec-tools/trunk/racoon.service)

+
 PKGBUILD   |   45 +++
 ipsec-tools-linux-3.7-compat.patch |   50 +++
 ipsec.service  |   12 
 racoon.service |   10 +++
 4 files changed, 117 insertions(+)

Copied: ipsec-tools/repos/community-staging-x86_64/PKGBUILD (from rev 405110, 
ipsec-tools/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-11-09 22:52:49 UTC (rev 405111)
@@ -0,0 +1,45 @@
+# Maintainer: Sergej Pupykin 
+# Contributor: Allan Henriksen 
+
+pkgname=ipsec-tools
+pkgver=0.8.2
+pkgrel=8
+pkgdesc="KAME IPSec tools ported to Linux"
+arch=('x86_64')
+url="http://ipsec-tools.sourceforge.net/";
+depends=('readline' 'openssl-1.0' 'krb5' 'flex')
+makedepends=('linux-headers')
+license=('GPL')
+options=('!makeflags')
+source=(https://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgver.tar.bz2
+   racoon.service
+   ipsec.service
+   ipsec-tools-linux-3.7-compat.patch)
+sha256sums=('8eb6b38716e2f3a8a72f1f549c9444c2bc28d52c9536792690564c74fe722f2d'
+'721ef004a93d16ce1e0c4c6951d65b8bf9bfe0e101d1b9b0756dd7c349e2ccc0'
+'2f10696f93aa0e88fa623318644f42332118dee4c3666948a12eb2fa108e2665'
+'34529108d013f5ad6dce9fa8e2acec7367f29319e4049e82dcb54fb0970ff520')
+
+build() {
+  cd "$srcdir"/$pkgname-$pkgver
+
+  patch -p1 <"$srcdir"/ipsec-tools-linux-3.7-compat.patch
+  sed -i 's#-Werror##' configure.ac
+
+  ./bootstrap
+  CFLAGS+=" -I/usr/include/openssl-1.0" \
+  CPPFLAGS+=" -I/usr/include/openssl-1.0" \
+  LDFLAGS+=" -L/usr/lib/openssl-1.0" \
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var 
--sbindir=/usr/bin \
+   --enable-security-context=no --enable-hybrid --enable-dpd --enable-natt 
\
+   --enable-adminport --enable-gssapi \
+   --with-kernel-headers=/usr/include
+  make
+}
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  install -Dm0644 "$srcdir"/racoon.service 
"$pkgdir"/usr/lib/systemd/system/racoon.service
+  install -Dm0644 "$srcdir"/ipsec.service 
"$pkgdir"/usr/lib/systemd/system/ipsec.service
+}

Copied: 
ipsec-tools/repos/community-staging-x86_64/ipsec-tools-linux-3.7-compat.patch 
(from rev 405110, ipsec-tools/trunk/ipsec-tools-linux-3.7-compat.patch)
===
--- community-staging-x86_64/ipsec-tools-linux-3.7-compat.patch 
(rev 0)
+++ community-staging-x86_64/ipsec-tools-linux-3.7-compat.patch 2018-11-09 
22:52:49 UTC (rev 405111)
@@ -0,0 +1,50 @@
+--- a/configure.ac
 b/configure.ac
+@@ -74,9 +74,10 @@ case "$host_os" in
+   [ KERNEL_INCLUDE="/lib/modules/`uname -r`/build/include" ])
+ 
+ AC_CHECK_HEADER($KERNEL_INCLUDE/linux/pfkeyv2.h, ,
+-  [ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h,
+-KERNEL_INCLUDE=/usr/src/linux/include ,
+-[ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) 
] ) ] )
++  [ AC_CHECK_HEADER($KERNEL_INCLUDE/uapi/linux/pfkeyv2.h, ,
++[ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h,
++  KERNEL_INCLUDE=/usr/src/linux/include ,
++  [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. 
Aborting.]) ] ) ] ) ] )
+ AC_SUBST(KERNEL_INCLUDE)
+ # We need the configure script to run with correct kernel headers.
+ # However we don't want to point to kernel source tree in compile time,
+@@ -643,7 +644,14 @@ AC_EGREP_CPP(yes,
+ #ifdef SADB_X_EXT_NAT_T_TYPE
+ yes
+ #endif
+-], [kernel_natt="yes"])
++], [kernel_natt="yes"], [
++  AC_EGREP_CPP(yes,
++  [#include 
++  #ifdef SADB_X_EXT_NAT_T_TYPE
++  yes
++  #endif
++  ], [kernel_natt="yes"])
++])
+   ;;
+ freebsd*|netbsd*)
+ # NetBSD case
+--- a/src/include-glibc/Makefile.am
 b/src/include-glibc/Makefile.am
+@@ -1,14 +1,7 @@
+-
+-.includes: ${top_builddir}/config.status
+-  ln -snf $(KERNEL_INCLUDE)/linux
+-  touch .includes
+-
+-all: .includes
+-
+ EXTRA_DIST = \
+   glibc-bugs.h \
+   net/pfkeyv2.h \
+   netinet/ipsec.h \
+   sys/queue.h
+ 
+-DISTCLEANFILES = .in