Improved PKGBUILD.

3 files changed, 36 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9fed39360bff..8215c79aa7bc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Mar  5 20:49:59 UTC 2016
+# Sat Mar  5 21:16:00 UTC 2016
 pkgbase = wwwoffle-svn
 	pkgdesc = Simple caching proxy server with special features (request, recursive fetch, ...) for use with dial-up internet links. Includes startup scripts for OpenRC, System V init, systemd.
 	pkgver = 2.9j.r2220
-	pkgrel = 2
+	pkgrel = 4
 	url = http://www.gedanken.org.uk/software/wwwoffle/
 	install = wwwoffle.install
 	arch = i686
@@ -26,8 +26,8 @@ pkgbase = wwwoffle-svn
 	replaces = wwwoffle-sysvinit<=2.9j.r2220
 	replaces = wwwoffle-openrc<=2.9j.r2220
 	replaces = wwwoffle-systemd<=2.9j.r2220
-	backup = etc/wwwoffle
 	backup = etc/wwwoffle/wwwoffle.conf
+	backup = etc/wwwoffle/wwwoffle.conf.template
 	source = wwwoffle::svn+http://gedanken.org.uk/svn/wwwoffle/trunk
 	source = conf_d_wwwoffle
 	source = initscript_openrc
@@ -39,7 +39,7 @@ pkgbase = wwwoffle-svn
 	sha256sums = 0d5bfcd1e348f6bdad042f780b2ea8a235314d5750a66ae008a0ea391bc5cc11
 	sha256sums = 04fd88f2a100e3ff9a96da6a70e58457252722cbf6350ffdbf08f17e62b64869
 	sha256sums = 47f3df8ed05888452c00f8246f97456a4c55499b67e59c40da272b0e7fb1f2df
-	sha256sums = 87eb11ad6e43eb9ac866806e413b187196d2d3b9383de76139d4e4ff71ffe855
+	sha256sums = 1b5ac98fff7a5c7b32439410cffdbdd8224c19fe8ca02db948d1a4430de793fd
 
 pkgname = wwwoffle-svn
 
diff --git a/PKGBUILD b/PKGBUILD
index b7f4e9079a72..3cf483f9c9f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _pkgname=wwwoffle
 pkgname="${_pkgname}-svn"
 # _pkgver=2.9i
 pkgver=2.9j.r2220
-pkgrel=2
+pkgrel=4
 pkgdesc="Simple caching proxy server with special features (request, recursive fetch, ...) for use with dial-up internet links. Includes startup scripts for OpenRC, System V init, systemd."
 arch=('i686' 'x86_64' 'arm' 'arm64')
 url="http://www.gedanken.org.uk/software/wwwoffle/"
@@ -33,8 +33,8 @@ conflicts=(
 )
 
 backup=(
-  'etc/wwwoffle'
   'etc/wwwoffle/wwwoffle.conf'
+  'etc/wwwoffle/wwwoffle.conf.template'
 )
 
 install="${_pkgname}.install"
@@ -58,7 +58,7 @@ sha256sums=(
   '0d5bfcd1e348f6bdad042f780b2ea8a235314d5750a66ae008a0ea391bc5cc11'
   '04fd88f2a100e3ff9a96da6a70e58457252722cbf6350ffdbf08f17e62b64869'
   '47f3df8ed05888452c00f8246f97456a4c55499b67e59c40da272b0e7fb1f2df'
-  '87eb11ad6e43eb9ac866806e413b187196d2d3b9383de76139d4e4ff71ffe855'
+  '1b5ac98fff7a5c7b32439410cffdbdd8224c19fe8ca02db948d1a4430de793fd'
 )
 
 _pgmver() {
@@ -158,11 +158,10 @@ build() {
 package() {
   _unpackeddir="${srcdir}/${_pkgname}"
   cd "${_unpackeddir}"
-  
+
   ### Install the software.
   make DESTDIR="${pkgdir}" install
-  mv "${pkgdir}/etc/wwwoffle/wwwoffle.conf" "${pkgdir}/etc/wwwoffle/wwwoffle.conf.template"
-  
+
   ### Move documentation into the place we want it.
   mkdir -p "${pkgdir}/usr/share"
   mv -v "${pkgdir}/usr/doc" "${pkgdir}/usr/share/doc"
@@ -175,13 +174,14 @@ package() {
   install -D -m755 "${srcdir}/initscript_sysvinit" "${pkgdir}/etc/rc.d/wwwoffle"
   install -D -m755 "${srcdir}/initscript_openrc" "${pkgdir}/etc/init.d/wwwoffle"
   install -D -m644 "${srcdir}/initscript_systemd" "${pkgdir}/usr/lib/systemd/system/wwwoffle.service"
-  
+
   ### Install a default initscript configuration file (for openrc and sysvinit only; for systemd user has to manually edit the systemd service file).
   install -D -m644 "${srcdir}/conf_d_wwwoffle" "${pkgdir}/etc/conf.d/wwwoffle"
 
   ### Change config such that wwwoffle runs as user wwwoffle and group wwwoffle. (Adding user and group is handled by the ${install}-script.)
-  sed -i -e 's/^#run-uid.*/ run-uid           = wwwoffle/' \
-    "${pkgdir}/etc/wwwoffle/wwwoffle.conf"
-  sed -i -e 's/^#run-gid.*/ run-gid           = wwwoffle/' \
-    "${pkgdir}/etc/wwwoffle/wwwoffle.conf"
+  sed -i -e 's/^#run-uid.*/ run-uid           = wwwoffle/' "${pkgdir}/etc/wwwoffle/wwwoffle.conf"
+  sed -i -e 's/^#run-gid.*/ run-gid           = wwwoffle/' "${pkgdir}/etc/wwwoffle/wwwoffle.conf"
+
+  ### Move config into final place (such that it is not automatically used, but user actually has to do some manual work).
+  mv "${pkgdir}/etc/wwwoffle/wwwoffle.conf" "${pkgdir}/etc/wwwoffle/wwwoffle.conf.template"
 }
diff --git a/wwwoffle.install b/wwwoffle.install
index 80626e6d5310..3b4c2ec7e8e9 100644
--- a/wwwoffle.install
+++ b/wwwoffle.install
@@ -5,19 +5,39 @@ post_install() {
 post_upgrade() {
   echo "ATTENTION WWWOFFLE:"
   echo "-------------------"
+  echo ""
+  echo "Configuration file template is installed at"
+  echo "  /etc/wwwoffle/wwwoffle.conf.template"
+  echo ""
+  echo "Copy it to /etc/wwwoffle/wwwoffle.conf and edit it to your needs"
+  echo "in order to make wwwoffle work."
+  echo ""
+  echo "-------------------"
+  echo ""
   echo "init-scripts were installed for:"
   echo "  * sysvinit ('/etc/rc.d/wwwoffle'),"
   echo "  * openrc ('/etc/init.d/wwwoffle') and"
   echo "  * systemd ('/usr/lib/systemd/system/wwwoffle.service')."
   echo "Which one will be used depends on your init system you use."
   echo ""
+  echo "Also, if you want to run wwwoffled at boot, you need to enable the"
+  echo "service the way it is applicable for your initsystem. By default"
+  echo "it won't be launched at bootup."
+  echo ""
+  echo "-------------------"
+  echo ""
   echo "In order to define the options passed to wwwoffle during startup"
   echo "(including which configuration file to use), edit"
-  echo "  * the file '/etc/conf.d/wwwoffle' when using sysvinit or openrc,"
+  echo "  * the file '/etc/conf.d/wwwoffle' when using"
+  echo "    - sysvinit or"
+  echo "    - openrc,"
   echo "  * the file '/usr/lib/systemd/system/wwwoffle.service' when using"
   echo "    systemd."
+  echo ""
   echo "-------------------"
+  echo ""
   echo "Set bind-ipv4 = none in wwwoffle.conf if you get ipv4 related warnings."
+  echo ""
   echo "-------------------"
   if [ ! `grep wwwoffle /etc/group` ]; then
     echo ">>> Adding group wwwoffle."