summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrent s2018-03-08 19:36:41 -0500
committerbrent s2018-03-08 19:36:41 -0500
commit5ef4a18c9a5288b4e71ab429da22788c07cf6f12 (patch)
treea59c7a4fcc1f6fb19c9a4f1ed544fe641adf2202
parent6a299cba8c7fe40dc6584e4e19cac9c18f23f1e7 (diff)
downloadaur-5ef4a18c9a5288b4e71ab429da22788c07cf6f12.tar.gz
whoops, file conflict with sks
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD7
-rw-r--r--sks-local.install4
3 files changed, 7 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index af89fc22ad51..569707a30c74 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Wed Feb 28 05:21:41 UTC 2018
+# Fri Mar 9 00:36:41 UTC 2018
pkgbase = sks-local
pkgdesc = A modified version of AUR/sks that can be used in tandem to perform localized keydumps
pkgver = 1.1.6
- pkgrel = 3
+ pkgrel = 4
url = https://bitbucket.org/skskeyserver/sks-keyserver/
install = sks-local.install
arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 2b61cebd5624..74c3352956bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ validpgpkeys=('748231EBCBD808A14F5E85D28C004C2F93481F6B')
# https://bitbucket.org/skskeyserver/sks-keyserver/issues/55/unbound-module-nat-in-cryptokit-on-ocaml
pkgname=sks-local
pkgver=1.1.6
-pkgrel=3
+pkgrel=4
pkgdesc="A modified version of AUR/sks that can be used in tandem to perform localized keydumps"
arch=('i686' 'x86_64')
url="https://bitbucket.org/skskeyserver/sks-keyserver/"
@@ -84,14 +84,13 @@ package() {
mv ${pkgdir}/usr/bin/${_pkgname} ${pkgdir}/usr/bin/${pkgname}
mv ${pkgdir}/usr/bin/sks_add_mail ${pkgdir}/usr/bin/sks-local_add_mail
mv ${pkgdir}/usr/bin/sks_build.sh ${pkgdir}/usr/bin/sks-local_build.sh
+ mv ${pkgdir}/usr/share/man/man8/sks.8.gz ${pkgdir}/usr/share/man/man8/sks-local.8.gz
sed -i -e 's#/usr/sbin/sks#/usr/bin/sks-local#g' -e 's#/var/lib/sks#/var/lib/sks-local#g' ${pkgdir}/usr/bin/sks-local_build.sh
# directories
- for d in etc/${pkgname} var/run/${pkgname} var/log/${pkgname} var/lib/${pkgname} var/spool/${pkgname};
+ for d in etc/${pkgname} var/log/${pkgname} var/lib/${pkgname} var/spool/${pkgname};
do
install -d -m0755 ${pkgdir}/${d}
done
- # tweaks
- chmod 0775 ${pkgdir}/var/run/${pkgname}
cp -a ${srcdir}/${_pkgname}-${pkgver}/sampleWeb/OpenPKG "${pkgdir}/var/lib/${pkgname}"
diff --git a/sks-local.install b/sks-local.install
index ab20b490aa69..69070c2c2bce 100644
--- a/sks-local.install
+++ b/sks-local.install
@@ -10,7 +10,7 @@ post_install() {
echo
# chowns
- for d in /var/run/${dname} /var/log/${dname} /var/lib/${dname} /var/spool/${dname}
+ for d in /var/log/${dname} /var/lib/${dname} /var/spool/${dname}
do
chown sks:sks ${d}
done
@@ -26,7 +26,7 @@ post_remove() {
echo -n -e "\nremoving sks system user (if needed)... "
pacman -Q sks > /dev/null 2>&1 || userdel sks && echo "done."
- rm -r /var/run/sks-local
+ rm -rf /var/run/sks-local
echo "Keeping /var/lib/sks-local, /var/spool/sks-local, and /var/log/sks-local;"
echo "Remove them manually if you want."