Date: Friday, December 9, 2016 @ 21:29:23 Author: bpiotrowski Revision: 282981
upgpkg: wpa_supplicant 1:2.6-3 Added: wpa_supplicant/trunk/wpa_supplicant.install Modified: wpa_supplicant/trunk/PKGBUILD wpa_supplicant/trunk/config ------------------------+ PKGBUILD | 46 +++++++++++++++++++++++++--------------------- config | 2 +- wpa_supplicant.install | 7 +++++++ 3 files changed, 33 insertions(+), 22 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-12-09 20:45:10 UTC (rev 282980) +++ PKGBUILD 2016-12-09 21:29:23 UTC (rev 282981) @@ -1,9 +1,10 @@ # $Id$ -# Maintainer: Thomas Bächler <tho...@archlinux.org> +# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: Thomas Bächler <tho...@archlinux.org> pkgname=wpa_supplicant pkgver=2.6 -pkgrel=2 +pkgrel=3 epoch=1 pkgdesc="A utility providing key negotiation for WPA wireless networks" url="http://hostap.epitest.fi/wpa_supplicant" @@ -11,21 +12,21 @@ depends=('openssl' 'libdbus' 'readline' 'libnl') optdepends=('wpa_supplicant_gui: wpa_gui program') license=('GPL') -backup=('etc/wpa_supplicant/wpa_supplicant.conf') +install=wpa_supplicant.install source=(https://w1.fi/releases/${pkgname}-${pkgver}.tar.gz{,.asc} config) validpgpkeys=('EC4AA0A991A5F2464582D52D2B6EF432EFC895FA') # Jouni Malinen sha256sums=('b4936d34c4e6cdd44954beba74296d964bc2c9668ecaa5255e499636fe2b1450' 'SKIP' - '5163609e133851dfbbee5982954fab22e45bf2c9093e43eb466d8a2c39f8a012') + 'f882bf5c929789841688645f7f8bbcf389a2e88049d6064e2950f998d929e793') prepare() { - cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}" - cp "${srcdir}/config" ./.config + cd "$srcdir/$pkgname-$pkgver/$pkgname" + cp "$srcdir/config" ./.config } build() { - cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}" + cd "$srcdir/$pkgname-$pkgver/$pkgname" # The Makefile does not pick up our CPPFLAGS export CFLAGS="$CPPFLAGS $CFLAGS" @@ -33,23 +34,26 @@ } package() { - cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}" - make LIBDIR=/usr/lib BINDIR=/usr/bin DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver/$pkgname" + make LIBDIR=/usr/lib BINDIR=/usr/bin DESTDIR="$pkgdir" install - install -d -m755 "${pkgdir}/etc/wpa_supplicant" - install -m644 wpa_supplicant.conf "${pkgdir}/etc/wpa_supplicant/wpa_supplicant.conf" + install -d -m755 "$pkgdir/etc/wpa_supplicant" + install -Dm644 wpa_supplicant.conf \ + "$pkgdir/usr/share/doc/wpa_supplicant/wpa_supplicant.conf" - install -d -m755 "${pkgdir}/usr/share/man/man"{5,8} - install -m644 doc/docbook/*.5 "${pkgdir}/usr/share/man/man5/" - install -m644 doc/docbook/*.8 "${pkgdir}/usr/share/man/man8/" - rm -f "${pkgdir}/usr/share/man/man8/wpa_"{priv,gui}.8 + install -d -m755 "$pkgdir/usr/share/man/man"{5,8} + install -m644 doc/docbook/*.5 "$pkgdir/usr/share/man/man5/" + install -m644 doc/docbook/*.8 "$pkgdir/usr/share/man/man8/" + rm -f "$pkgdir/usr/share/man/man8/wpa_"{priv,gui}.8 - install -d -m755 "${pkgdir}/usr/share/dbus-1/system-services" - install -m644 dbus/{fi.epitest.hostap.WPASupplicant.service,fi.w1.wpa_supplicant1.service} "${pkgdir}/usr/share/dbus-1/system-services/" + install -d -m755 "$pkgdir/usr/share/dbus-1/system-services" + install -m644 \ + dbus/fi.{epitest.hostap.WPASupplicant,w1.wpa_supplicant1}.service \ + "$pkgdir/usr/share/dbus-1/system-services/" - install -d -m755 "${pkgdir}/etc/dbus-1/system.d" - install -m644 dbus/dbus-wpa_supplicant.conf "${pkgdir}/etc/dbus-1/system.d/wpa_supplicant.conf" + install -Dm644 dbus/dbus-wpa_supplicant.conf \ + "$pkgdir/etc/dbus-1/system.d/wpa_supplicant.conf" - install -d -m755 "${pkgdir}/usr/lib/systemd/system" - install -m644 systemd/*.service "${pkgdir}/usr/lib/systemd/system/" + install -d -m755 "$pkgdir/usr/lib/systemd/system" + install -m644 systemd/*.service "$pkgdir/usr/lib/systemd/system/" } Modified: config =================================================================== --- config 2016-12-09 20:45:10 UTC (rev 282980) +++ config 2016-12-09 21:29:23 UTC (rev 282981) @@ -118,7 +118,7 @@ #CONFIG_EAP_PSK=y # EAP-pwd (secure authentication using only a password) -#CONFIG_EAP_PWD=y +CONFIG_EAP_PWD=y # EAP-PAX #CONFIG_EAP_PAX=y Added: wpa_supplicant.install =================================================================== --- wpa_supplicant.install (rev 0) +++ wpa_supplicant.install 2016-12-09 21:29:23 UTC (rev 282981) @@ -0,0 +1,7 @@ +post_upgrade() { + if [[ $(vercmp '1:2.6-2' "$2") -lt 1 ]]; then + echo ':: The /etc/wpa_supplicant/wpa_supplicant.conf is file no longer managed by pacman' + echo ' and if it was modified, it has been renamed to wpa_supplicant.conf.pacsave.' + echo ' Move it to the original location if needed.' + fi +}