summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-11-09 21:47:09 -0200
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-11-09 21:47:09 -0200
commita851915f28923b2cd1979471c64d75e527f117cf (patch)
treea0cd3a72cfe2657d16a0275fe67e3745577cb9d5 /libre
parent5b9506770ce84ac053de4d3500b56a1da84b1694 (diff)
parent39e7daddb73f205693ff52cae7f77601a1eaea00 (diff)
Merge branch 'master' of ssh://projects.parabola.nu/~git/abslibre
Diffstat (limited to 'libre')
-rw-r--r--libre/usermin/PKGBUILD4
-rw-r--r--libre/webmin/PKGBUILD4
-rw-r--r--libre/xarchiver/PKGBUILD4
-rw-r--r--libre/xarchiver/remove-nonfree-unrar-support.patch3
4 files changed, 8 insertions, 7 deletions
diff --git a/libre/usermin/PKGBUILD b/libre/usermin/PKGBUILD
index 2ec5cae60..600e34db0 100644
--- a/libre/usermin/PKGBUILD
+++ b/libre/usermin/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
pkgname=usermin
pkgver=1.610
-pkgrel=1.parabola1
+pkgrel=1.parabola2
pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding (Parabola rebranded)"
arch=(i686 x86_64 mips64el)
license=('custom:usermin')
@@ -109,7 +109,7 @@ package() {
"$pkgdir"/opt/usermin/setup.sh
# Fixup the config files to use their real locations
- sed -i 's:^pidfile=.*$:pidfile=/var/run/usermin.pid:' "$pkgdir"/etc/usermin/miniserv.conf
+ sed -i 's:^pidfile=.*$:pidfile=/run/usermin.pid:' "$pkgdir"/etc/usermin/miniserv.conf
find "$pkgdir"/etc/usermin -type f -exec sed -i "s:$pkgdir::g" {} \;
# make it only accessible by localhost
diff --git a/libre/webmin/PKGBUILD b/libre/webmin/PKGBUILD
index 3dc4b709a..fac84125b 100644
--- a/libre/webmin/PKGBUILD
+++ b/libre/webmin/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
pkgname=webmin
pkgver=1.710
-pkgrel=1.parabola1
+pkgrel=1.parabola2
pkgdesc="a web-based interface for system administration (Parabola rebranded)"
arch=(i686 x86_64 mips64el)
license=('custom:webmin')
@@ -192,7 +192,7 @@ package() {
"$pkgdir"/opt/webmin/setup.sh
# Fixup the config files to use their real locations
- sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' "$pkgdir"/etc/webmin/miniserv.conf
+ sed -i 's:^pidfile=.*$:pidfile=/run/webmin.pid:' "$pkgdir"/etc/webmin/miniserv.conf
find "$pkgdir"/etc/webmin -type f -exec sed -i "s:$pkgdir::g" {} \;
# make it only accessible by localhost
diff --git a/libre/xarchiver/PKGBUILD b/libre/xarchiver/PKGBUILD
index c50f53572..f5bac7d3f 100644
--- a/libre/xarchiver/PKGBUILD
+++ b/libre/xarchiver/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=xarchiver
pkgver=0.5.4
-pkgrel=1.parabola1
+pkgrel=1.parabola2
pkgdesc="GTK+ frontend to various command line archivers, without nonfree unrar support"
arch=('i686' 'x86_64' 'mips64el')
url="http://xarchiver.sourceforge.net/"
@@ -31,7 +31,7 @@ md5sums=('1b4cd37a6af03afc957a8e307417e8d0'
'812b93339f5e3332621f3c5abebfe277'
'35ab96d98521a0a36f3e9e9ec0969107'
'0cee887b3c989ba2cdce9154813843fb'
- '064ec8984be6e0e7bbf20c435a9f4ef0')
+ 'd2cf9b38b439a548553cf0f33d627bcc')
prepare() {
cd $pkgname-$pkgver
diff --git a/libre/xarchiver/remove-nonfree-unrar-support.patch b/libre/xarchiver/remove-nonfree-unrar-support.patch
index 5473cf3b3..10c68052b 100644
--- a/libre/xarchiver/remove-nonfree-unrar-support.patch
+++ b/libre/xarchiver/remove-nonfree-unrar-support.patch
@@ -66,7 +66,8 @@ diff -Nur xarchiver-0.5.3.orig/doc/xarchiver.docbook xarchiver-0.5.3/doc/xarchiv
<listitem><para>All the the output of the cmd-line archiver is displayed in the Xarchiver window</para></listitem>
- <listitem><para>All common formats are supported: arj, bzip2, lha, gzip, 7z, rar, tar, tar.bz2, tar.gz, zip, DEB and RPM (only open,view and extract)</para></listitem>
+ <listitem><para>All common formats are supported: arj, bzip2, lha, gzip, 7z, tar, tar.bz2, tar.gz, zip, DEB and RPM (only open,view and extract)</para></listitem>
- <listitem><para>Support of RPM files without RPM executable. This is useful on not RPM-based distributions like Slackware and Arch Linux</para></listitem>
+- <listitem><para>Support of RPM files without RPM executable. This is useful on not RPM-based distributions like Slackware and Arch Linux</para></listitem>
++ <listitem><para>Support of RPM files without RPM executable. This is useful on not RPM-based distributions</para></listitem>
- <listitem><para>Zip, rar, arj and 7z password encrypted archives are fully supported (7z automatic password detection is not supported)</para></listitem>
+ <listitem><para>Zip, arj and 7z password encrypted archives are fully supported (7z automatic password detection is not supported)</para></listitem>
</itemizedlist>