[arch-commits] Commit in lldpd/trunk (5 files)

[Christian Hesse]

    Date: Tuesday, November 13, 2018 @ 06:48:38
  Author: eworm
Revision: 406474

upgpkg: lldpd 1.0.1-3

* use upstream systemd files
* general cleanups

Modified:
  lldpd/trunk/PKGBUILD
Deleted:
  lldpd/trunk/LICENSE
  lldpd/trunk/lldpd.service
  lldpd/trunk/lldpd.sysusers
  lldpd/trunk/lldpd.tmpfiles

----------------+
 LICENSE        |   11 -----------
 PKGBUILD       |   40 ++++++++++++++++------------------------
 lldpd.service  |   26 --------------------------
 lldpd.sysusers |    3 ---
 lldpd.tmpfiles |    2 --
 5 files changed, 16 insertions(+), 66 deletions(-)

Deleted: LICENSE
===================================================================
--- LICENSE	2018-11-13 06:48:17 UTC (rev 406473)
+++ LICENSE	2018-11-13 06:48:38 UTC (rev 406474)
@@ -1,11 +0,0 @@
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-13 06:48:17 UTC (rev 406473)
+++ PKGBUILD	2018-11-13 06:48:38 UTC (rev 406474)
@@ -3,7 +3,7 @@
 
 pkgname=lldpd
 pkgver=1.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc='802.1ab implementation (LLDP) to help you locate neighbors'
 arch=('x86_64')
 url='https://vincentbernat.github.io/lldpd/'
@@ -12,21 +12,14 @@
          'libxml2' 'net-snmp' 'jansson')
 backup=('etc/lldpd.conf')
 validpgpkeys=('AEF2348766F371C689A7360095A42FE8353525F9') # Vincent Bernat <bernat at luffy.cx>
-source=("https://media.luffy.cx/files/lldpd/lldpd-$pkgver.tar.gz"
-        "lldpd-$pkgver.tar.gz.sig::https://media.luffy.cx/files/lldpd/lldpd-$pkgver.tar.gz.gpg"
-        'LICENSE'
-        'lldpd.service'
-        'lldpd.sysusers'
-        'lldpd.tmpfiles')
+source=("https://media.luffy.cx/files/lldpd/lldpd-${pkgver}.tar.gz"
+        "lldpd-${pkgver}.tar.gz.sig::https://media.luffy.cx/files/lldpd/lldpd-${pkgver}.tar.gz.gpg")
 sha512sums=('61b2a7a3a78276c613c6d0b34eb625e69e5c8a206b6658a167d6a09ac6d0e1c943e46c0ff6fc3538a791d9947f193185b65848da581b3d6ecb9bc0befadde8dd'
-            'SKIP'
-            'e8a218f0b8a9eca4e67b2e614c07375e3fc0489c88300cb323ca02250f6ffa12ca5b4accba8efd45dff577b5b42ac31aa4252389d5471b8fccad7163ebcc0bae'
-            '4ef437d38315ddcc594a6f58590830baf00647b2076cdee13186f8b176c92b180b6dcc744d6a364eeb593c3e255892f866145f70a21bb189be54b156432d585e'
-            '51d044dfc8d1b88184a16c3ec9ffa7da6d631a6a442eaf9170fa17f37e4d10bee444860cd388343c59420ddbbc3878d8c657e0a19a0fd15aa325bcb269f2a2a6'
-            '3e8b1dcf9843c6f902684df8512a34b04d3c8df59d1c0962cea20d4205ad12e1e5cac764e3244944316271a0f099d3982e6740939b69fbe993ae88c29fd88d33')
+            'SKIP')
 
 build() {
-  cd $pkgname-$pkgver
+  cd "${srcdir}/${pkgname}-${pkgver}/"
+
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
@@ -43,23 +36,22 @@
 }
 
 check() {
-  cd $pkgname-$pkgver
+  cd "${srcdir}/${pkgname}-${pkgver}/"
+
   make check
 }
 
 package() {
+  cd "${srcdir}/${pkgname}-${pkgver}/"
+  
+  make DESTDIR="${pkgdir}" install
+
   # config stuff
-  install -D -m 644 /dev/null "$pkgdir/etc/lldpd.conf"
-  install -d -m 755  "$pkgdir/etc/lldpd.d"
-  # systemd stuff
-  install -D -m 644 lldpd.service "$pkgdir/usr/lib/systemd/system/lldpd.service"
-  install -D -m 644 lldpd.sysusers "$pkgdir/usr/lib/sysusers.d/lldpd.conf"
-  install -D -m 644 lldpd.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/lldpd.conf"
+  install -D -m 0644 /dev/null "${pkgdir}/etc/lldpd.conf"
+  install -d -m 0755 "${pkgdir}/etc/lldpd.d"
+
   # license
-  install -D -m 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
+  install -D -m 0644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et:

Deleted: lldpd.service
===================================================================
--- lldpd.service	2018-11-13 06:48:17 UTC (rev 406473)
+++ lldpd.service	2018-11-13 06:48:38 UTC (rev 406474)
@@ -1,26 +0,0 @@
-[Unit]
-Description=LLDP daemon
-Documentation=man:lldpd(8)
-After=network.target
-RequiresMountsFor=/run/lldpd
-
-[Service]
-Type=notify
-NotifyAccess=main
-ExecStart=/usr/bin/lldpd
-Restart=on-failure
-PrivateTmp=yes
-# systemd >= 211
-RestrictAddressFamilies=AF_INET AF_INET6 AF_PACKET AF_NETLINK AF_UNIX
-# systemd >= 214
-ProtectHome=yes
-# systemd >= 231
-ReadWritePaths=/run/lldpd/
-# systemd >= 232
-ProtectSystem=strict
-ProtectKernelTunables=yes
-ProtectControlGroups=yes
-ProtectKernelModules=yes
-
-[Install]
-WantedBy=multi-user.target

Deleted: lldpd.sysusers
===================================================================
--- lldpd.sysusers	2018-11-13 06:48:17 UTC (rev 406473)
+++ lldpd.sysusers	2018-11-13 06:48:38 UTC (rev 406474)
@@ -1,3 +0,0 @@
-# https://wiki.archlinux.org/index.php/DeveloperWiki:UID_/_GID_Database
-u lldpd 127 - -
-m lldpd lldpd

Deleted: lldpd.tmpfiles
===================================================================
--- lldpd.tmpfiles	2018-11-13 06:48:17 UTC (rev 406473)
+++ lldpd.tmpfiles	2018-11-13 06:48:38 UTC (rev 406474)
@@ -1,2 +0,0 @@
-d /run/lldpd 0750 lldpd lldpd
-d /run/lldpd/chroot 0750 lldpd lldpd