[arch-commits] Commit in isatapd/repos/community-x86_64 (5 files)

Antonio Rojas arojas at archlinux.org
Wed Jun 13 07:44:52 UTC 2018


    Date: Wednesday, June 13, 2018 @ 07:44:52
  Author: arojas
Revision: 342872

archrelease: copy trunk to community-x86_64

Added:
  isatapd/repos/community-x86_64/PKGBUILD
    (from rev 342871, isatapd/trunk/PKGBUILD)
  isatapd/repos/community-x86_64/isatapd-linux-4.8.patch
    (from rev 342871, isatapd/trunk/isatapd-linux-4.8.patch)
  isatapd/repos/community-x86_64/isatapd at .service
    (from rev 342871, isatapd/trunk/isatapd at .service)
Deleted:
  isatapd/repos/community-x86_64/PKGBUILD
  isatapd/repos/community-x86_64/isatapd at .service

-------------------------+
 PKGBUILD                |   72 +++++++++++++++++++++++-----------------------
 isatapd-linux-4.8.patch |   25 +++++++++++++++
 isatapd at .service        |   20 ++++++------
 3 files changed, 71 insertions(+), 46 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-13 07:44:27 UTC (rev 342871)
+++ PKGBUILD	2018-06-13 07:44:52 UTC (rev 342872)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: xgdgsc<xgdgsc at gmail.com>
-# Contributor: Philanecros Heliostein <philanecros at gmail.com>
-
-pkgname=isatapd
-pkgver=0.9.7
-pkgrel=5
-pkgdesc="Creates and maintains an ISATAP tunnel (rfc5214) in Linux"
-arch=('x86_64')
-url="http://www.saschahlusiak.de/linux/isatap.htm"
-license=('GPL')
-depends=('glibc')
-source=("http://www.saschahlusiak.de/linux/${pkgname}-${pkgver}.tar.gz"
-        isatapd at .service isatapd-linux-4.8.patch)
-md5sums=('79f13a360b9a14cb0afcdf7a2af9c6de'
-         'e33e0a5b31f958b9d52c345439b455af'
-         '5bccaa89ccc7bfb4402941adef0c0637')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -p1 -i ../isatapd-linux-4.8.patch # Fix build with linux-headers 4.8 (Debian)
-}
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sbindir=/usr/bin
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}/" install
-
-  install -Dm644 "${srcdir}/${pkgname}@.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}@.service"
-}

Copied: isatapd/repos/community-x86_64/PKGBUILD (from rev 342871, isatapd/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-06-13 07:44:52 UTC (rev 342872)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: xgdgsc<xgdgsc at gmail.com>
+# Contributor: Philanecros Heliostein <philanecros at gmail.com>
+
+pkgname=isatapd
+pkgver=0.9.7
+pkgrel=5
+pkgdesc="Creates and maintains an ISATAP tunnel (rfc5214) in Linux"
+arch=('x86_64')
+url="http://www.saschahlusiak.de/linux/isatap.htm"
+license=('GPL')
+depends=('glibc')
+source=("http://www.saschahlusiak.de/linux/${pkgname}-${pkgver}.tar.gz"
+        isatapd at .service isatapd-linux-4.8.patch)
+md5sums=('79f13a360b9a14cb0afcdf7a2af9c6de'
+         'e33e0a5b31f958b9d52c345439b455af'
+         '5bccaa89ccc7bfb4402941adef0c0637')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../isatapd-linux-4.8.patch # Fix build with linux-headers 4.8 (Debian)
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sbindir=/usr/bin
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}/" install
+
+  install -Dm644 "${srcdir}/${pkgname}@.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}@.service"
+}

Copied: isatapd/repos/community-x86_64/isatapd-linux-4.8.patch (from rev 342871, isatapd/trunk/isatapd-linux-4.8.patch)
===================================================================
--- isatapd-linux-4.8.patch	                        (rev 0)
+++ isatapd-linux-4.8.patch	2018-06-13 07:44:52 UTC (rev 342872)
@@ -0,0 +1,25 @@
+From: Bernhard Schmidt <berni at debian.org>
+Subject: Fix FTBFS with headers from Linux 4.8+
+Bug-Debian: https://bugs.debian.org/844869
+
+Linux 4.8+ adds a few includes to linux/if_tunnel.h, which conflict with
+concurrent use of netinet/ip.h. Drop the latter and manually define IP_DF
+which is not found anywhere else
+--- a/src/tunnel.c
++++ b/src/tunnel.c
+@@ -18,10 +18,13 @@
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+-#include <netinet/ip.h>
+ #include <net/if.h>
+ #include <linux/if_tunnel.h>
+ 
++#ifndef IP_DF
++	#define IP_DF	0x4000		/* dont fragment flag */
++#endif
++
+ #ifdef HAVE_CONFIG_H
+ 	#include <config.h>
+ #endif
+

Deleted: isatapd at .service
===================================================================
--- isatapd at .service	2018-06-13 07:44:27 UTC (rev 342871)
+++ isatapd at .service	2018-06-13 07:44:52 UTC (rev 342872)
@@ -1,10 +0,0 @@
-[Unit]
-Description=isatap daemon
-After=network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/isatapd --router "%I"  --pid "/var/run/isatapd-%I.pid" --quiet
-
-[Install]
-WantedBy=multi-user.target

Copied: isatapd/repos/community-x86_64/isatapd at .service (from rev 342871, isatapd/trunk/isatapd at .service)
===================================================================
--- isatapd at .service	                        (rev 0)
+++ isatapd at .service	2018-06-13 07:44:52 UTC (rev 342872)
@@ -0,0 +1,10 @@
+[Unit]
+Description=isatap daemon
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/isatapd --router "%I"  --pid "/var/run/isatapd-%I.pid" --quiet
+
+[Install]
+WantedBy=multi-user.target



More information about the arch-commits mailing list