[arch-commits] Commit in ipset/repos (10 files)
Sébastien Luttringer
seblu at archlinux.org
Sun Mar 20 22:30:05 UTC 2016
Date: Sunday, March 20, 2016 @ 23:30:05
Author: seblu
Revision: 262139
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
ipset/repos/extra-i686/PKGBUILD
(from rev 262138, ipset/trunk/PKGBUILD)
ipset/repos/extra-i686/ipset.service
(from rev 262138, ipset/trunk/ipset.service)
ipset/repos/extra-x86_64/PKGBUILD
(from rev 262138, ipset/trunk/PKGBUILD)
ipset/repos/extra-x86_64/ipset.service
(from rev 262138, ipset/trunk/ipset.service)
Deleted:
ipset/repos/extra-i686/0001-Fix-configure-breakage-due-to-pkg-config-related-cha.patch
ipset/repos/extra-i686/PKGBUILD
ipset/repos/extra-i686/ipset.service
ipset/repos/extra-x86_64/0001-Fix-configure-breakage-due-to-pkg-config-related-cha.patch
ipset/repos/extra-x86_64/PKGBUILD
ipset/repos/extra-x86_64/ipset.service
------------------------------------------------------------------------------+
/PKGBUILD | 110 ++++++++++
/ipset.service | 28 ++
extra-i686/0001-Fix-configure-breakage-due-to-pkg-config-related-cha.patch | 27 --
extra-i686/PKGBUILD | 57 -----
extra-i686/ipset.service | 14 -
extra-x86_64/0001-Fix-configure-breakage-due-to-pkg-config-related-cha.patch | 27 --
extra-x86_64/PKGBUILD | 57 -----
extra-x86_64/ipset.service | 14 -
8 files changed, 138 insertions(+), 196 deletions(-)
Deleted: extra-i686/0001-Fix-configure-breakage-due-to-pkg-config-related-cha.patch
===================================================================
--- extra-i686/0001-Fix-configure-breakage-due-to-pkg-config-related-cha.patch 2016-03-20 22:29:42 UTC (rev 262138)
+++ extra-i686/0001-Fix-configure-breakage-due-to-pkg-config-related-cha.patch 2016-03-20 22:30:05 UTC (rev 262139)
@@ -1,27 +0,0 @@
-From fc7221d243c44be917dc21cbdc70df7d14e4ce4d Mon Sep 17 00:00:00 2001
-From: Jozsef Kadlecsik <kadlec at blackhole.kfki.hu>
-Date: Sun, 13 Mar 2016 12:10:47 +0100
-Subject: [PATCH] Fix "configure" breakage due to pkg-config related changes
-
-The support for older pkg-config packages broke the "configure" script
-(reported by Jan Engelhardt).
----
- configure.ac | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 1988836..b05646b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -12,6 +12,8 @@ LT_INIT([dlopen])
- LT_CONFIG_LTDL_DIR([libltdl])
- LTDL_INIT([nonrecursive])
-
-+PKG_PROG_PKG_CONFIG
-+
- dnl Shortcut: Linux supported alone
- case "$host" in
- *-*-linux* | *-*-uclinux*) ;;
---
-2.7.2
-
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-03-20 22:29:42 UTC (rev 262138)
+++ extra-i686/PKGBUILD 2016-03-20 22:30:05 UTC (rev 262139)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-
-pkgname=ipset
-pkgver=6.28
-pkgrel=1
-pkgdesc='Administration tool for IP sets'
-arch=('i686' 'x86_64')
-url='http://ipset.netfilter.org'
-license=('GPL2')
-depends=('glibc' 'libmnl')
-backup=("etc/$pkgname.conf")
-source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2"
- '0001-Fix-configure-breakage-due-to-pkg-config-related-cha.patch'
- "$pkgname.service")
-md5sums=('68217d8031045d9e5dbd451f3933399e'
- 'fc177910dc5110f2a3d76427f6a54163'
- 'e20fe62881993078591f1bb8b2fa22bb')
-
-prepare() {
- cd $pkgname-$pkgver
- # apply patch from the source array (should be a pacman feature)
- local filename
- for filename in "${source[@]}"; do
- if [[ "$filename" =~ \.patch$ ]]; then
- msg2 "Applying patch $filename"
- patch -p1 -i "$srcdir/$filename"
- fi
- done
- :
- # needed because we patch configure.ac (TO BE REMOVED)
- ./autogen.sh
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sbindir=/usr/bin --with-kmod=no
- make
-}
-
-package() {
- pushd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
- # install doc
- install -dm755 "$pkgdir/usr/share/doc/$pkgname"
- install -m644 README UPGRADE ChangeLog "$pkgdir/usr/share/doc/$pkgname"
- # install pkgconfig file
- install -Dm644 lib/libipset.pc "$pkgdir/usr/lib/pkgconfig/libipset.pc"
- popd
- # systemd
- install -Dm 644 $pkgname.service \
- "$pkgdir/usr/lib/systemd/system/$pkgname.service"
- # default config file
- install -Dm 644 /dev/null "$pkgdir/etc/$pkgname.conf"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: ipset/repos/extra-i686/PKGBUILD (from rev 262138, ipset/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-03-20 22:30:05 UTC (rev 262139)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+
+pkgname=ipset
+pkgver=6.29
+pkgrel=1
+pkgdesc='Administration tool for IP sets'
+arch=('i686' 'x86_64')
+url='http://ipset.netfilter.org'
+license=('GPL2')
+depends=('glibc' 'libmnl')
+backup=("etc/$pkgname.conf")
+source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2"
+ "$pkgname.service")
+md5sums=('fd8ea35997115c5c630eee22f0beecec'
+ 'e20fe62881993078591f1bb8b2fa22bb')
+
+prepare() {
+ cd $pkgname-$pkgver
+ # apply patch from the source array (should be a pacman feature)
+ local filename
+ for filename in "${source[@]}"; do
+ if [[ "$filename" =~ \.patch$ ]]; then
+ msg2 "Applying patch $filename"
+ patch -p1 -N -i "$srcdir/$filename"
+ fi
+ done
+ :
+ # needed because we patch configure.ac (TO BE REMOVED)
+ ./autogen.sh
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --sbindir=/usr/bin --with-kmod=no
+ make
+}
+
+package() {
+ pushd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ # install doc
+ install -dm755 "$pkgdir/usr/share/doc/$pkgname"
+ install -m644 README UPGRADE ChangeLog "$pkgdir/usr/share/doc/$pkgname"
+ # install pkgconfig file
+ install -Dm644 lib/libipset.pc "$pkgdir/usr/lib/pkgconfig/libipset.pc"
+ popd
+ # systemd
+ install -Dm 644 $pkgname.service \
+ "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+ # default config file
+ install -Dm 644 /dev/null "$pkgdir/etc/$pkgname.conf"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-i686/ipset.service
===================================================================
--- extra-i686/ipset.service 2016-03-20 22:29:42 UTC (rev 262138)
+++ extra-i686/ipset.service 2016-03-20 22:30:05 UTC (rev 262139)
@@ -1,14 +0,0 @@
-[Unit]
-Description=Loading IP Sets
-Before=network-pre.target iptables.service ip6tables.service
-Wants=network-pre.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/ipset -f /etc/ipset.conf restore
-ExecReload=/usr/bin/ipset -f /etc/ipset.conf restore
-ExecStop=/usr/bin/ipset destroy
-
-[Install]
-WantedBy=multi-user.target
Copied: ipset/repos/extra-i686/ipset.service (from rev 262138, ipset/trunk/ipset.service)
===================================================================
--- extra-i686/ipset.service (rev 0)
+++ extra-i686/ipset.service 2016-03-20 22:30:05 UTC (rev 262139)
@@ -0,0 +1,14 @@
+[Unit]
+Description=Loading IP Sets
+Before=network-pre.target iptables.service ip6tables.service
+Wants=network-pre.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/ipset -f /etc/ipset.conf restore
+ExecReload=/usr/bin/ipset -f /etc/ipset.conf restore
+ExecStop=/usr/bin/ipset destroy
+
+[Install]
+WantedBy=multi-user.target
Deleted: extra-x86_64/0001-Fix-configure-breakage-due-to-pkg-config-related-cha.patch
===================================================================
--- extra-x86_64/0001-Fix-configure-breakage-due-to-pkg-config-related-cha.patch 2016-03-20 22:29:42 UTC (rev 262138)
+++ extra-x86_64/0001-Fix-configure-breakage-due-to-pkg-config-related-cha.patch 2016-03-20 22:30:05 UTC (rev 262139)
@@ -1,27 +0,0 @@
-From fc7221d243c44be917dc21cbdc70df7d14e4ce4d Mon Sep 17 00:00:00 2001
-From: Jozsef Kadlecsik <kadlec at blackhole.kfki.hu>
-Date: Sun, 13 Mar 2016 12:10:47 +0100
-Subject: [PATCH] Fix "configure" breakage due to pkg-config related changes
-
-The support for older pkg-config packages broke the "configure" script
-(reported by Jan Engelhardt).
----
- configure.ac | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 1988836..b05646b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -12,6 +12,8 @@ LT_INIT([dlopen])
- LT_CONFIG_LTDL_DIR([libltdl])
- LTDL_INIT([nonrecursive])
-
-+PKG_PROG_PKG_CONFIG
-+
- dnl Shortcut: Linux supported alone
- case "$host" in
- *-*-linux* | *-*-uclinux*) ;;
---
-2.7.2
-
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-03-20 22:29:42 UTC (rev 262138)
+++ extra-x86_64/PKGBUILD 2016-03-20 22:30:05 UTC (rev 262139)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-
-pkgname=ipset
-pkgver=6.28
-pkgrel=1
-pkgdesc='Administration tool for IP sets'
-arch=('i686' 'x86_64')
-url='http://ipset.netfilter.org'
-license=('GPL2')
-depends=('glibc' 'libmnl')
-backup=("etc/$pkgname.conf")
-source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2"
- '0001-Fix-configure-breakage-due-to-pkg-config-related-cha.patch'
- "$pkgname.service")
-md5sums=('68217d8031045d9e5dbd451f3933399e'
- 'fc177910dc5110f2a3d76427f6a54163'
- 'e20fe62881993078591f1bb8b2fa22bb')
-
-prepare() {
- cd $pkgname-$pkgver
- # apply patch from the source array (should be a pacman feature)
- local filename
- for filename in "${source[@]}"; do
- if [[ "$filename" =~ \.patch$ ]]; then
- msg2 "Applying patch $filename"
- patch -p1 -i "$srcdir/$filename"
- fi
- done
- :
- # needed because we patch configure.ac (TO BE REMOVED)
- ./autogen.sh
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sbindir=/usr/bin --with-kmod=no
- make
-}
-
-package() {
- pushd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
- # install doc
- install -dm755 "$pkgdir/usr/share/doc/$pkgname"
- install -m644 README UPGRADE ChangeLog "$pkgdir/usr/share/doc/$pkgname"
- # install pkgconfig file
- install -Dm644 lib/libipset.pc "$pkgdir/usr/lib/pkgconfig/libipset.pc"
- popd
- # systemd
- install -Dm 644 $pkgname.service \
- "$pkgdir/usr/lib/systemd/system/$pkgname.service"
- # default config file
- install -Dm 644 /dev/null "$pkgdir/etc/$pkgname.conf"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: ipset/repos/extra-x86_64/PKGBUILD (from rev 262138, ipset/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-03-20 22:30:05 UTC (rev 262139)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+
+pkgname=ipset
+pkgver=6.29
+pkgrel=1
+pkgdesc='Administration tool for IP sets'
+arch=('i686' 'x86_64')
+url='http://ipset.netfilter.org'
+license=('GPL2')
+depends=('glibc' 'libmnl')
+backup=("etc/$pkgname.conf")
+source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2"
+ "$pkgname.service")
+md5sums=('fd8ea35997115c5c630eee22f0beecec'
+ 'e20fe62881993078591f1bb8b2fa22bb')
+
+prepare() {
+ cd $pkgname-$pkgver
+ # apply patch from the source array (should be a pacman feature)
+ local filename
+ for filename in "${source[@]}"; do
+ if [[ "$filename" =~ \.patch$ ]]; then
+ msg2 "Applying patch $filename"
+ patch -p1 -N -i "$srcdir/$filename"
+ fi
+ done
+ :
+ # needed because we patch configure.ac (TO BE REMOVED)
+ ./autogen.sh
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --sbindir=/usr/bin --with-kmod=no
+ make
+}
+
+package() {
+ pushd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ # install doc
+ install -dm755 "$pkgdir/usr/share/doc/$pkgname"
+ install -m644 README UPGRADE ChangeLog "$pkgdir/usr/share/doc/$pkgname"
+ # install pkgconfig file
+ install -Dm644 lib/libipset.pc "$pkgdir/usr/lib/pkgconfig/libipset.pc"
+ popd
+ # systemd
+ install -Dm 644 $pkgname.service \
+ "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+ # default config file
+ install -Dm 644 /dev/null "$pkgdir/etc/$pkgname.conf"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-x86_64/ipset.service
===================================================================
--- extra-x86_64/ipset.service 2016-03-20 22:29:42 UTC (rev 262138)
+++ extra-x86_64/ipset.service 2016-03-20 22:30:05 UTC (rev 262139)
@@ -1,14 +0,0 @@
-[Unit]
-Description=Loading IP Sets
-Before=network-pre.target iptables.service ip6tables.service
-Wants=network-pre.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/ipset -f /etc/ipset.conf restore
-ExecReload=/usr/bin/ipset -f /etc/ipset.conf restore
-ExecStop=/usr/bin/ipset destroy
-
-[Install]
-WantedBy=multi-user.target
Copied: ipset/repos/extra-x86_64/ipset.service (from rev 262138, ipset/trunk/ipset.service)
===================================================================
--- extra-x86_64/ipset.service (rev 0)
+++ extra-x86_64/ipset.service 2016-03-20 22:30:05 UTC (rev 262139)
@@ -0,0 +1,14 @@
+[Unit]
+Description=Loading IP Sets
+Before=network-pre.target iptables.service ip6tables.service
+Wants=network-pre.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/ipset -f /etc/ipset.conf restore
+ExecReload=/usr/bin/ipset -f /etc/ipset.conf restore
+ExecStop=/usr/bin/ipset destroy
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list