Date: Tuesday, November 15, 2022 @ 11:22:17
Author: kpcyrd
Revision: 1348828
archrelease: copy trunk to community-x86_64
Added:
isatapd/repos/community-x86_64/PKGBUILD
(from rev 1348827, isatapd/trunk/PKGBUILD)
isatapd/repos/community-x86_64/isatapd-linux-4.8.patch
(from rev 1348827, isatapd/trunk/isatapd-linux-4.8.patch)
isatapd/repos/community-x86_64/[email protected]
(from rev 1348827, isatapd/trunk/[email protected])
Deleted:
isatapd/repos/community-x86_64/PKGBUILD
isatapd/repos/community-x86_64/isatapd-linux-4.8.patch
isatapd/repos/community-x86_64/[email protected]
-------------------------+
PKGBUILD | 73 +++++++++++++++++++++++-----------------------
isatapd-linux-4.8.patch | 50 +++++++++++++++----------------
[email protected] | 20 ++++++------
3 files changed, 73 insertions(+), 70 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-11-15 11:21:54 UTC (rev 1348827)
+++ PKGBUILD 2022-11-15 11:22:17 UTC (rev 1348828)
@@ -1,35 +0,0 @@
-# Maintainer: Felix Yan <[email protected]>
-# Contributor: xgdgsc<[email protected]>
-# Contributor: Philanecros Heliostein <[email protected]>
-
-pkgname=isatapd
-pkgver=0.9.7
-pkgrel=6
-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";
- [email protected] 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 1348827,
isatapd/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-11-15 11:22:17 UTC (rev 1348828)
@@ -0,0 +1,38 @@
+# Maintainer: Felix Yan <[email protected]>
+# Contributor: xgdgsc<[email protected]>
+# Contributor: Philanecros Heliostein <[email protected]>
+
+pkgname=isatapd
+pkgver=0.9.7
+pkgrel=7
+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";
+ [email protected] isatapd-linux-4.8.patch)
+md5sums=('79f13a360b9a14cb0afcdf7a2af9c6de'
+ 'e33e0a5b31f958b9d52c345439b455af'
+ '5bccaa89ccc7bfb4402941adef0c0637')
+sha256sums=('927e1bb5fff4582723c642b41561c5ee6d57b15d05c19ea00c589168898897fa'
+ 'e5606303d560b97c6ab4554aaf2c8be29247015babfa7802511baade9752bcfd'
+ '786039838dfc4943662be7335baa0610587143132f60f1abc89593df24ea80d4')
+
+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"
+}
Deleted: isatapd-linux-4.8.patch
===================================================================
--- isatapd-linux-4.8.patch 2022-11-15 11:21:54 UTC (rev 1348827)
+++ isatapd-linux-4.8.patch 2022-11-15 11:22:17 UTC (rev 1348828)
@@ -1,25 +0,0 @@
-From: Bernhard Schmidt <[email protected]>
-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
-
Copied: isatapd/repos/community-x86_64/isatapd-linux-4.8.patch (from rev
1348827, isatapd/trunk/isatapd-linux-4.8.patch)
===================================================================
--- isatapd-linux-4.8.patch (rev 0)
+++ isatapd-linux-4.8.patch 2022-11-15 11:22:17 UTC (rev 1348828)
@@ -0,0 +1,25 @@
+From: Bernhard Schmidt <[email protected]>
+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: [email protected]
===================================================================
--- [email protected] 2022-11-15 11:21:54 UTC (rev 1348827)
+++ [email protected] 2022-11-15 11:22:17 UTC (rev 1348828)
@@ -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/[email protected] (from rev 1348827,
isatapd/trunk/[email protected])
===================================================================
--- [email protected] (rev 0)
+++ [email protected] 2022-11-15 11:22:17 UTC (rev 1348828)
@@ -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
