[arch-commits] Commit in ppp/trunk (LICENSE PKGBUILD)

[Antonio Rojas]

    Date: Sunday, September 17, 2017 @ 19:51:43
  Author: arojas
Revision: 305732

Clarify license (FS#36510)

Added:
  ppp/trunk/LICENSE
Modified:
  ppp/trunk/PKGBUILD

----------+
 LICENSE  |    7 +++++++
 PKGBUILD |   12 ++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

Added: LICENSE
===================================================================
--- LICENSE	                        (rev 0)
+++ LICENSE	2017-09-17 19:51:43 UTC (rev 305732)
@@ -0,0 +1,7 @@
+Copyrights:
+***********
+
+All of the code can be freely used and redistributed.  The individual
+source files each have their own copyright and permission notice.
+Pppd, pppstats and pppdump are under BSD-style notices.  Some of the
+pppd plugins are GPL'd.  Chat is public domain.

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-09-17 17:50:59 UTC (rev 305731)
+++ PKGBUILD	2017-09-17 19:51:43 UTC (rev 305732)
@@ -2,11 +2,11 @@
 # Maintainer: Thomas Baechler <thomas at archlinux.org>
 pkgname=ppp
 pkgver=2.4.7
-pkgrel=3
+pkgrel=4
 pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking"
 arch=(i686 x86_64) 
 url="http://www.samba.org/ppp/"
-license=('custom:GPL/BSD')
+license=('GPL' 'BSD')
 depends=('glibc' 'libpcap>=1.0.0')
 backup=(etc/ppp/{chap-secrets,pap-secrets,options,ip-up,ip-down,ip-down.d/00-dns.sh,ip-up.d/00-dns.sh,ipv6-up.d/00-iface-config.sh})
 source=(https://download.samba.org/pub/ppp/ppp-${pkgver}.tar.gz{,.asc}
@@ -21,7 +21,8 @@
         ipv6-up.d.iface-config.sh
         ppp.systemd
         CVE-2015-3310.patch
-        ppp-build-fix.patch::"https://github.com/paulusmack/ppp/commit/50a2997b.patch")
+        ppp-build-fix.patch::"https://github.com/paulusmack/ppp/commit/50a2997b.patch"
+        LICENSE)
 sha256sums=('02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30'
             'SKIP'
             'f04f47318226c79594f45b8b75877c30710d22fe0fb1e2e17db3b4257dc4218c'
@@ -35,7 +36,8 @@
             '20780cf4bd0774bebb55ecb3bdae7667c9ae5cbe003a52a1ecb0bbc77d46260f'
             'eb8ab2e2d71c3bb9c4297cf847b6e9d52616a3fdbf2257c479cc43dff318c831'
             'f0fe7e7d9b35141c2565a09e39c4f66b475ed3fe8e2528d10faa4412f480e338'
-            '94225c64e806e75d6f792649c4beb26a791c4994c2701dc6a47cfccf3d91e4bf')
+            '94225c64e806e75d6f792649c4beb26a791c4994c2701dc6a47cfccf3d91e4bf'
+            '96fd35104e3d0ec472517afecead88419913ae73ae0189476d5dad9029c2be42')
 validpgpkeys=('631E179E370CD727A7F2A33A9E4295D605F66CE9') # Paul Mackerras (Signing key) <paulus at samba.org>
 
 prepare() {
@@ -88,4 +90,6 @@
   chmod 0755 "${pkgdir}/usr/lib/pppd/${pkgver}"/*.so
 
   install -D -m644 "${srcdir}"/ppp.systemd "${pkgdir}"/usr/lib/systemd/system/ppp at .service
+
+  install -Dm644 "$srcdir"/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }