[arch-commits] Commit in ufw/trunk (PKGBUILD ufw.install)

[Kyle Keen]

    Date: Sunday, June 3, 2018 @ 20:13:39
  Author: kkeen
Revision: 339541

upgpkg: ufw 0.35-4 FS#49359 python3

Modified:
  ufw/trunk/PKGBUILD
Deleted:
  ufw/trunk/ufw.install

-------------+
 PKGBUILD    |   14 ++++----------
 ufw.install |   13 -------------
 2 files changed, 4 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-03 19:52:23 UTC (rev 339540)
+++ PKGBUILD	2018-06-03 20:13:39 UTC (rev 339541)
@@ -7,13 +7,12 @@
 
 pkgname=ufw
 pkgver=0.35
-pkgrel=3
+pkgrel=4
 pkgdesc="Uncomplicated and easy to use CLI tool for managing a netfilter firewall"
 arch=('any')
 url="https://launchpad.net/ufw"
 license=('GPL3')
-depends=('iptables' 'python2')
-install=ufw.install
+depends=('iptables' 'python')
 backup=('etc/ufw/before.rules'
         'etc/ufw/before6.rules'
         'etc/ufw/after.rules'
@@ -22,18 +21,13 @@
         'etc/ufw/user.rules'
         'etc/ufw/sysctl.conf'
         'etc/default/ufw'
-        'usr/lib/ufw/user.rules'
-        'usr/lib/ufw/user6.rules'
         'etc/ufw/user.rules'
         'etc/ufw/user6.rules')
-source=(http://launchpad.net/$pkgname/$pkgver/$pkgver/+download/$pkgname-$pkgver.tar.gz
+source=("http://launchpad.net/$pkgname/$pkgver/$pkgver/+download/$pkgname-$pkgver.tar.gz"
         service)
 sha256sums=('662f865bc83bf8aa1a40a6fe578bc2ce796ff60a1be2c1103def7db1b91f8509'
             'fdface6f4690e4748fbbd5661c02e1967a8750fdb23581d35516174017a3fe39')
 
-# this /usr/lib/ufw/ rules were moved to /etc/ufw
-# remove /usr/lib from backup in O.36?
-
 prepare() {
   cd "$pkgname-$pkgver"
   # FS#28769 - move from /lib to /usr/lib
@@ -48,7 +42,7 @@
 package() {
   cd "$pkgname-$pkgver"
   
-  python2 setup.py install --root="$pkgdir"
+  python3 setup.py install --root="$pkgdir"
 
   install -Dm644 "$srcdir/service" "$pkgdir/usr/lib/systemd/system/ufw.service"
   chmod 644 "$pkgdir/etc/ufw/"*.rules

Deleted: ufw.install
===================================================================
--- ufw.install	2018-06-03 19:52:23 UTC (rev 339540)
+++ ufw.install	2018-06-03 20:13:39 UTC (rev 339541)
@@ -1,13 +0,0 @@
-post_upgrade() {
-  if [ "$(vercmp $2 0.35-2)" -lt 0 ]; then
-    echo ">>>"
-    echo ">>> IMPORTANT UFW UPGRADE NOTICE"
-    echo ">>> ----------------------------"
-    echo ">>> Version 0.35 has moved several config files."
-    echo ">>> You may need to copy your versions of the files"
-    echo ">>> to the new location."
-    echo ">>> /usr/lib/ufw/user.rules.pacsave  -> /etc/ufw/user.rules"
-    echo ">>> /usr/lib/ufw/user6.rules.pacsave -> /etc/ufw/user6.rules"
-    echo ">>>"
-  fi
-}