diff options
367 files changed, 6609 insertions, 9780 deletions
diff --git a/cross/cross-binutils/PKGBUILD b/cross/cross-binutils/PKGBUILD index 59a882d90..75e30b470 100644 --- a/cross/cross-binutils/PKGBUILD +++ b/cross/cross-binutils/PKGBUILD @@ -22,57 +22,43 @@ # +-------------+-------------+-------------+-----------+---------------------------------------------------------------------------+-----------+---------+ # | _march | CARCH | _arch | <machine> | _os_target (GNU/*) | _multilib | - | # +-------------+-------------+-------------+-----------+---------------------------------------------------------------------------+-----------+---------+ -# | mips64el | mips64el | mips64el | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu|elf | opt | bin/sys | -# | mips64 | mips64 | mips64 | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu|elf | opt | bin/sys | -# | * | mipsel | mipsel | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu|elf | no | bin/sys | -# | * | mips | mips | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu|elf | no | bin/sys | -# | x86_64 | x86_64 | x86_64 | unknown | gnu<|{linux,kfreebsd,kopenbsd,knetbsd,kdragonflybsd,kopensolaris}-gnu|elf | yes | bin/sys | -# | i[3-7]86 | i[3-7]86 | i[3-7]86 | pc | gnu|{linux,kfreebsd,kopenbsd,knetbsd,kdragonflybsd,kopensolaris}-gnu|elf | no | bin/sys | -# | armv8-a | aarch64 | aarch64 | unknown | {linux,kfreebsd,kopenbsd,knetbsd,kopensolaris}-gnu|elf | yes | - | -# | armv8-a | aarch64_be | aarch64_be | unknown | {linux,kfreebsd,kopenbsd,knetbsd,kopensolaris}-gnu|elf | yes | - | +# | x86_64 | x86_64 | x86_64 | unknown | {linux,kfreebsd,kopenbsd,knetbsd,kdragonflybsd,kopensolaris}-gnu|elf | yes | bin/sys | +# | i[3-7]86 | i[3-7]86 | i[3-7]86 | pc | gnu|{linux,kfreebsd,kopenbsd,knetbsd,kopensolaris}-gnu|elf | no | bin/sys | +# | armv8-a | aarch64 | aarch64 | unknown | {linux,kfreebsd,knetbsd}-gnu|elf | no | bin/sys | +# | armv8-a | aarch64_be | aarch64_be | unknown | {linux,kfreebsd,knetbsd}-gnu|elf | no | bin/sys | # | armv7-a | armv7h | armv7l | unknown | {linux,kfreebsd,kopenbsd,knetbsd,kopensolaris}-gnueabihf|elf | no | bin/sys | # | armv6 | armv6h | armv6l | unknown | {linux,kfreebsd,kopenbsd,knetbsd,kopensolaris}-gnueabihf|elf | no | bin/sys | # | armv5te | arm | armv5tel | unknown | {linux,kfreebsd,kopenbsd,knetbsd,kopensolaris}-gnueabi | no | bin/sys | # | * | arm | arm | unknown | eabi | no | bin/sys | # | arm | armeb | armeb | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnueabi|eabi | no | bin | -# | sparc64 | sparc64 | sparc64 | unknown | {linux,kfreebsd,kopenbsd,knetbsd,kopensolaris}-gnu | opt | bin/sys | -# | sparc | sparc | sparc | unknown | {linux,kopenbsd,knetbsd,kopensolaris}-gnu | no | bin/sys | -# | - | ia64 | ia64 | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu | yes | - | -# | - | s390 | s390 | ibm | linux-gnu | no | - | -# | - | s390x | s390x | ibm | linux-gnu | no | bin/sys | -#v| powerpc64 | powerpc64 | powerpc64 | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu{,eabi}|{elf,eabi} | opt | bin/sys |x|eabi -#x| powerpc64le | powerpc64le | powerpc64le | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu{,eabi}|{elf,eabi} | opt | - | +# | mips64el | mips64el | mips64el | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu|elf | no | bin/sys | +# | mips64 | mips64 | mips64 | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu|elf | no | bin/sys | +# | * | mipsel | mipsel | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu|elf | no | bin/sys | +# | * | mips | mips | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu|elf | no | bin/sys | +#v| powerpc64 | powerpc64 | powerpc64 | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu{,eabi}|{elf,eabi} | no | bin/sys |x|eabi +#x| powerpc64le | powerpc64le | powerpc64le | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu{,eabi}|{elf,eabi} | no | bin | # | powerpc | powerpc | powerpc | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu{,eabi}|{elf,eabi} | no | bin/sys | # | powerpcle | powerpcle | powerpcle | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu{,eabi}|{elf,eabi} | no | - | # | - | spu | spu | unknown | elf | no | - | -# | - | sh64 | sh64 | unknown | {linux,kopenbsd,knetbsd}-gnu|elf | opt | - | -# | - | sh64le | sh64le | unknown | {linux,kopenbsd,knetbsd}-gnu|elf | opt | - | +# | - | sh64 | sh64 | unknown | {linux,kopenbsd,knetbsd}-gnu|elf | no | - | +# | - | sh64le | sh64le | unknown | {linux,kopenbsd,knetbsd}-gnu|elf | no | - | # | - | sh4 | sh4 | unknown | {linux,kopenbsd,knetbsd}-gnu|elf | no | bin/sys | # | - | sh4le | sh4le | unknown | {linux,kopenbsd,knetbsd}-gnu|elf | no | bin/sys | # | - | sh | sh | unknown | {linux,kopenbsd,knetbsd}-gnu|elf | no | - @ | # | - | shle | shle | unknown | {linux,kopenbsd,knetbsd}-gnu|elf | no | - @ | -# | - | xtensa | xtensa | unknown | elf | no | sys | -# | * | avr | avr | unknown | elf | no | - | -# | * | m68k | m68k | unknown | gnu|{linux,kopenbsd,knetbsd}-gnu|elf | no | bin/sys | +# | - | m68k | m68k | unknown | gnu|{linux,knetbsd}-gnu|elf | no | bin/sys | +# | - | avr | avr | unknown | linux-gnu|elf | no | - | +# | - | xtensa | xtensa | unknown | linux-gnu|elf | no | sys | # | - | lm32 | lm32 | unknown | linux-gnu|elf | no | sys | -# | - | or32 | or32 | unknown | linux-gnu<|elf< | no | bin/sys |x|linux-gnu -# +-------------+-------------+-------------+-----------+---------------------------------------------------------------------------+-----------+---------+ - -# For "Wine" -# +-------------+-------------+-------------+-----------+---------------------------------------------------------------------------+-----------+---------+ -#i| * | x86_64 | x86_64 | unknown | mingw64 | yes | bin/sys | -#i| * | i[3-7]86 | i[3-7]86 | unknown | mingw32 | no | bin/sys | -#?| * | aarch64 | aarch64 | unknown | ??? | yes | - | -#?| * | aarch64_be | aarch64_be | unknown | ??? | yes | - | -#?| * | armv7h | armv7l | unknown | ??? | no | bin/sys | -#?| * | armv6h | armv6l | unknown | ??? | no | bin/sys | -#?| * | arm | armv5tel | unknown | ??? | no | bin/sys | -#?| * | armeb | armeb | unknown | ??? | no | bin | +# | - | or32 | or32 | unknown | linux-gnu|elf | no | bin/sys |x|linux-gnu # +-------------+-------------+-------------+-----------+---------------------------------------------------------------------------+-----------+---------+ -# For "DOSBox" +# For "Wine, Darling and DOSBox" # +-------------+-------------+-------------+-----------+---------------------------------------------------------------------------+-----------+---------+ -#i| * | i386 | i386 | pc | msdosdjgpp | no | bin/sys | +# | x86_64 | x86_64 | x86_64 | unknown | mingw64(Wine)|darwin | yes | bin/sys | +# | i[3-7]86 | i[3-7]86 | i[3-7]86 | pc | mingw32(Wine)|msdosdjgpp(DOSBox)|darwin | no | bin/sys | +# | armv7-a | armv7h | armv7l | unknown | mingw-arm(Wine)|darwin | no | bin/sys | +# | powerpc | powerpc | powerpc | unknown | darwin | no | bin/sys | # +-------------+-------------+-------------+-----------+---------------------------------------------------------------------------+-----------+---------+ # opt : Multilib is optional @@ -87,14 +73,14 @@ # Hardware architecture: -# options: "same", "mips64el", "x86_64", "i686" or "xtensa" -_arch_target=xtensa +# options: "same", "x86_64", "i686", "armv7l" or "xtensa" +_arch_target=armv7l # OS target: # system: <os> or <kernel>-<os> -# options: "gnu", "linux-gnu", "kfreebsd-gnu" or "elf" -_os_target=elf +# options: "gnu", "linux-gnu", "linux-gnueabi" or "elf" +_os_target=linux-gnueabi #-------------------------------------------------------------------------------- # variables @@ -122,15 +108,15 @@ fi _pkgname=binutils pkgname=$_target-$_pkgname -pkgver=2.25 -pkgrel=5 -_commit=69352378 +pkgver=2.25.1 +pkgrel=1 +_commit=2bd25930 pkgdesc="A set of programs to assemble and manipulate binary and object files" arch=('i686' 'x86_64' 'armv7h' 'aarch64' 'mips64el') url="http://www.gnu.org/software/$_pkgname/" license=('GPL') groups=('cross-devel') -depends=('glibc>=2.20' 'zlib') +depends=('glibc>=2.22' 'zlib') makedepends=('git') checkdepends=('dejagnu' 'bc') options=('staticlibs' '!distcc' '!ccache') @@ -169,6 +155,7 @@ build() { --with-bugurl=https://labs.parabola.nu/ \ --enable-threads --with-pic \ --enable-ld=default --enable-gold --enable-plugins \ + --enable-deterministic-archives \ --disable-werror --disable-gdb --disable-nls \ --target=$_target --with-sysroot=/usr/$_target diff --git a/cross/cross-gcc/PKGBUILD b/cross/cross-gcc/PKGBUILD index 3b9e5c4d3..1f3fcb3a8 100644 --- a/cross/cross-gcc/PKGBUILD +++ b/cross/cross-gcc/PKGBUILD @@ -22,57 +22,43 @@ # +-------------+-------------+-------------+-----------+---------------------------------------------------------------------------+-----------+---------+ # | _march | CARCH | _arch | <machine> | _os_target (GNU/*) | _multilib | - | # +-------------+-------------+-------------+-----------+---------------------------------------------------------------------------+-----------+---------+ -# | mips64el | mips64el | mips64el | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu|elf | opt | bin/sys | -# | mips64 | mips64 | mips64 | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu|elf | opt | bin/sys | -# | * | mipsel | mipsel | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu|elf | no | bin/sys | -# | * | mips | mips | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu|elf | no | bin/sys | -# | x86_64 | x86_64 | x86_64 | unknown | gnu<|{linux,kfreebsd,kopenbsd,knetbsd,kdragonflybsd,kopensolaris}-gnu|elf | yes | bin/sys | -# | i[3-7]86 | i[3-7]86 | i[3-7]86 | pc | gnu|{linux,kfreebsd,kopenbsd,knetbsd,kdragonflybsd,kopensolaris}-gnu|elf | no | bin/sys | -# | armv8-a | aarch64 | aarch64 | unknown | {linux,kfreebsd,kopenbsd,knetbsd,kopensolaris}-gnu|elf | yes | - | -# | armv8-a | aarch64_be | aarch64_be | unknown | {linux,kfreebsd,kopenbsd,knetbsd,kopensolaris}-gnu|elf | yes | - | +# | x86_64 | x86_64 | x86_64 | unknown | {linux,kfreebsd,kopenbsd,knetbsd,kdragonflybsd,kopensolaris}-gnu|elf | yes | bin/sys | +# | i[3-7]86 | i[3-7]86 | i[3-7]86 | pc | gnu|{linux,kfreebsd,kopenbsd,knetbsd,kopensolaris}-gnu|elf | no | bin/sys | +# | armv8-a | aarch64 | aarch64 | unknown | {linux,kfreebsd,knetbsd}-gnu|elf | no | bin/sys | +# | armv8-a | aarch64_be | aarch64_be | unknown | {linux,kfreebsd,knetbsd}-gnu|elf | no | bin/sys | # | armv7-a | armv7h | armv7l | unknown | {linux,kfreebsd,kopenbsd,knetbsd,kopensolaris}-gnueabihf|elf | no | bin/sys | # | armv6 | armv6h | armv6l | unknown | {linux,kfreebsd,kopenbsd,knetbsd,kopensolaris}-gnueabihf|elf | no | bin/sys | # | armv5te | arm | armv5tel | unknown | {linux,kfreebsd,kopenbsd,knetbsd,kopensolaris}-gnueabi | no | bin/sys | # | * | arm | arm | unknown | eabi | no | bin/sys | # | arm | armeb | armeb | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnueabi|eabi | no | bin | -# | sparc64 | sparc64 | sparc64 | unknown | {linux,kfreebsd,kopenbsd,knetbsd,kopensolaris}-gnu | opt | bin/sys | -# | sparc | sparc | sparc | unknown | {linux,kopenbsd,knetbsd,kopensolaris}-gnu | no | bin/sys | -# | - | ia64 | ia64 | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu | yes | - | -# | - | s390 | s390 | ibm | linux-gnu | no | - | -# | - | s390x | s390x | ibm | linux-gnu | no | bin/sys | -#v| powerpc64 | powerpc64 | powerpc64 | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu{,eabi}|{elf,eabi} | opt | bin/sys |x|eabi -#x| powerpc64le | powerpc64le | powerpc64le | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu{,eabi}|{elf,eabi} | opt | - | +# | mips64el | mips64el | mips64el | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu|elf | no | bin/sys | +# | mips64 | mips64 | mips64 | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu|elf | no | bin/sys | +# | * | mipsel | mipsel | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu|elf | no | bin/sys | +# | * | mips | mips | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu|elf | no | bin/sys | +#v| powerpc64 | powerpc64 | powerpc64 | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu{,eabi}|{elf,eabi} | no | bin/sys |x|eabi +#x| powerpc64le | powerpc64le | powerpc64le | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu{,eabi}|{elf,eabi} | no | bin | # | powerpc | powerpc | powerpc | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu{,eabi}|{elf,eabi} | no | bin/sys | # | powerpcle | powerpcle | powerpcle | unknown | {linux,kfreebsd,kopenbsd,knetbsd}-gnu{,eabi}|{elf,eabi} | no | - | # | - | spu | spu | unknown | elf | no | - | -# | - | sh64 | sh64 | unknown | {linux,kopenbsd,knetbsd}-gnu|elf | opt | - | -# | - | sh64le | sh64le | unknown | {linux,kopenbsd,knetbsd}-gnu|elf | opt | - | +# | - | sh64 | sh64 | unknown | {linux,kopenbsd,knetbsd}-gnu|elf | no | - | +# | - | sh64le | sh64le | unknown | {linux,kopenbsd,knetbsd}-gnu|elf | no | - | # | - | sh4 | sh4 | unknown | {linux,kopenbsd,knetbsd}-gnu|elf | no | bin/sys | # | - | sh4le | sh4le | unknown | {linux,kopenbsd,knetbsd}-gnu|elf | no | bin/sys | # | - | sh | sh | unknown | {linux,kopenbsd,knetbsd}-gnu|elf | no | - @ | # | - | shle | shle | unknown | {linux,kopenbsd,knetbsd}-gnu|elf | no | - @ | -# | - | xtensa | xtensa | unknown | elf | no | sys | -# | * | avr | avr | unknown | elf | no | - | -# | * | m68k | m68k | unknown | gnu|{linux,kopenbsd,knetbsd}-gnu|elf | no | bin/sys | +# | - | m68k | m68k | unknown | gnu|{linux,knetbsd}-gnu|elf | no | bin/sys | +# | - | avr | avr | unknown | linux-gnu|elf | no | - | +# | - | xtensa | xtensa | unknown | linux-gnu|elf | no | sys | # | - | lm32 | lm32 | unknown | linux-gnu|elf | no | sys | -# | - | or32 | or32 | unknown | linux-gnu<|elf< | no | bin/sys |x|linux-gnu +# | - | or32 | or32 | unknown | linux-gnu|elf | no | bin/sys |x|linux-gnu # +-------------+-------------+-------------+-----------+---------------------------------------------------------------------------+-----------+---------+ -# For "Wine" +# For "Wine, Darling and DOSBox" # +-------------+-------------+-------------+-----------+---------------------------------------------------------------------------+-----------+---------+ -#i| * | x86_64 | x86_64 | unknown | mingw64 | yes | bin/sys | -#i| * | i[3-7]86 | i[3-7]86 | unknown | mingw32 | no | bin/sys | -#?| * | aarch64 | aarch64 | unknown | ??? | yes | - | -#?| * | aarch64_be | aarch64_be | unknown | ??? | yes | - | -#?| * | armv7h | armv7l | unknown | ??? | no | bin/sys | -#?| * | armv6h | armv6l | unknown | ??? | no | bin/sys | -#?| * | arm | armv5tel | unknown | ??? | no | bin/sys | -#?| * | armeb | armeb | unknown | ??? | no | bin | -# +-------------+-------------+-------------+-----------+---------------------------------------------------------------------------+-----------+---------+ - -# For "DOSBox" -# +-------------+-------------+-------------+-----------+---------------------------------------------------------------------------+-----------+---------+ -#i| * | i386 | i386 | pc | msdosdjgpp | no | bin/sys | +# | x86_64 | x86_64 | x86_64 | unknown | mingw64(Wine)|darwin | yes | bin/sys | +# | i[3-7]86 | i[3-7]86 | i[3-7]86 | pc | mingw32(Wine)|msdosdjgpp(DOSBox)|darwin | no | bin/sys | +# | armv7-a | armv7h | armv7l | unknown | mingw-arm(Wine)|darwin | no | bin/sys | +# | powerpc | powerpc | powerpc | unknown | darwin | no | bin/sys | # +-------------+-------------+-------------+-----------+---------------------------------------------------------------------------+-----------+---------+ # opt : Multilib is optional @@ -87,14 +73,14 @@ # Hardware architecture: -# options: "same", "mips64el", "x86_64", "i686" or "xtensa" -_arch_target=xtensa +# options: "same", "x86_64", "i686", "armv7l" or "xtensa" +_arch_target=armv7l # OS target: # system: <os> or <kernel>-<os> -# options: "gnu", "linux-gnu", "kfreebsd-gnu" or "elf" -_os_target=elf +# options: "gnu", "linux-gnu", "linux-gnueabi" or "elf" +_os_target=linux-gnueabi #-------------------------------------------------------------------------------- # variables @@ -122,11 +108,11 @@ fi _pkgname=gcc pkgname=$_target-$_pkgname -pkgver=5.1.0 +pkgver=5.2.0 _pkgver=5 _islver=0.14.1 -pkgrel=4 -_snapshot=5-20150519 +pkgrel=1 +#_snapshot=5-20150623 pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64' 'armv7h' 'aarch64' 'mips64el') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -134,16 +120,14 @@ url="http://$_pkgname.gnu.org" makedepends=('binutils>=2.25' 'libmpc' 'doxygen') checkdepends=('dejagnu' 'inetutils') options=('!emptydirs') -source=(#ftp://$_pkgname.gnu.org/pub/$_pkgname/releases/$_pkgname-${pkgver}/$_pkgname-${pkgver}.tar.bz2 - ftp://$_pkgname.gnu.org/pub/$_pkgname/snapshots/${_snapshot}/$_pkgname-${_snapshot}.tar.bz2 +source=(ftp://$_pkgname.gnu.org/pub/$_pkgname/releases/$_pkgname-${pkgver}/$_pkgname-${pkgver}.tar.bz2 + #ftp://$_pkgname.gnu.org/pub/$_pkgname/snapshots/${_snapshot}/$_pkgname-${_snapshot}.tar.bz2 http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2 - pr65882.patch pr66035.patch $_pkgname-xtensa.patch::https://raw.githubusercontent.com/qca/open-ath9k-htc-firmware/1.3.2/local/patches/$_pkgname.patch mips-kfreebsd-gnu.patch) -md5sums=('84f261b2f23e154ec6d9bd4149851a21' +md5sums=('a51bcfeb3da7dd4c623e27207ed43467' '118d1a379abf7606a3334c98a8411c79' - '9a9cc98e916fd37c7b3dad50f29d2f48' '5b980076cd5fcbc3aff6014f306282dd' '81372ee980289a9f6df01dad31c64a63' '43282cddb2080b1180f7b76d3a8a832c') @@ -173,9 +157,6 @@ prepare() { # hack! - some configure tests for header files using "$CPP $CPPFLAGS" sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,$_pkgname}/configure - # https://gcc.gnu.org/ml/gcc-patches/2015-04/msg01558.html - patch -p1 -i ${srcdir}/pr65882.patch - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66035 patch -p1 -i ${srcdir}/pr66035.patch @@ -211,7 +192,7 @@ build() { --with-linker-hash-style=gnu --enable-gnu-indirect-function \ --disable-multilib --disable-werror \ --enable-checking=release \ - --with-default-libstdcxx-abi=c++98 --disable-nls \ + --with-default-libstdcxx-abi=gcc4-compatible --disable-nls \ --target=$_target make all-$_pkgname } diff --git a/cross/cross-gcc/pr65882.patch b/cross/cross-gcc/pr65882.patch deleted file mode 100644 index 673712b2b..000000000 --- a/cross/cross-gcc/pr65882.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/gcc/cp/call.c b/gcc/cp/call.c -index 7bdf236..689d542 100644 ---- a/gcc/cp/call.c -+++ b/gcc/cp/call.c -@@ -5677,8 +5677,9 @@ build_new_op_1 (location_t loc, enum tree_code code, int flags, tree arg1, - case TRUTH_ORIF_EXPR: - case TRUTH_AND_EXPR: - case TRUTH_OR_EXPR: -- warn_logical_operator (loc, code, boolean_type_node, -- code_orig_arg1, arg1, code_orig_arg2, arg2); -+ if (complain & tf_warning) -+ warn_logical_operator (loc, code, boolean_type_node, -+ code_orig_arg1, arg1, code_orig_arg2, arg2); - /* Fall through. */ - case GT_EXPR: - case LT_EXPR: -@@ -5686,8 +5687,9 @@ build_new_op_1 (location_t loc, enum tree_code code, int flags, tree arg1, - case LE_EXPR: - case EQ_EXPR: - case NE_EXPR: -- if ((code_orig_arg1 == BOOLEAN_TYPE) -- ^ (code_orig_arg2 == BOOLEAN_TYPE)) -+ if ((complain & tf_warning) -+ && ((code_orig_arg1 == BOOLEAN_TYPE) -+ ^ (code_orig_arg2 == BOOLEAN_TYPE))) - maybe_warn_bool_compare (loc, code, arg1, arg2); - /* Fall through. */ - case PLUS_EXPR: -diff --git a/gcc/testsuite/g++.dg/diagnostic/inhibit-warn.C b/gcc/testsuite/g++.dg/diagnostic/inhibit-warn.C -new file mode 100644 -index 0000000..5655eb4 ---- /dev/null -+++ b/gcc/testsuite/g++.dg/diagnostic/inhibit-warn.C -@@ -0,0 +1,32 @@ -+// PR c++/65882 -+// { dg-do compile { target c++11 } } -+// { dg-options "-Wbool-compare" } -+ -+// Check that we don't ICE because of reentering error reporting routines while -+// evaluating template parameters -+ -+template<typename> -+struct type_function { -+ static constexpr bool value = false; -+}; -+ -+template<bool> -+struct dependent_type { -+ typedef int type; -+}; -+ -+template<typename T> -+typename dependent_type<(5 > type_function<T>::value)>::type -+bar(); -+ -+template<typename T> -+typename dependent_type<(5 > type_function<T>::value)>::type -+foo() -+{ -+ return bar<int>(); -+} -+ -+int main() -+{ -+ foo<int>(); -+} diff --git a/kernels/linux-libre-grsec-knock/PKGBUILD b/kernels/linux-libre-grsec-knock/PKGBUILD index ae151f5e6..b9e3d3a2d 100644 --- a/kernels/linux-libre-grsec-knock/PKGBUILD +++ b/kernels/linux-libre-grsec-knock/PKGBUILD @@ -9,9 +9,9 @@ pkgbase=linux-libre-grsec-knock _pkgbasever=4.1-gnu -_pkgver=4.1.5-gnu +_pkgver=4.1.6-gnu _grsecver=3.1 -_timestamp=201508102129 +_timestamp=201508181953 _knockpatchver=4.1_1 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -51,9 +51,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch') sha256sums=('48b2e5ea077d0a0bdcb205e67178e8eb5b2867db3b2364b701dbc801d9755324' 'SKIP' - '2f8b5d3176112f3b1679a77acbdd303e9e45bffde76a1972f7e90d457614afb3' + '335d3e07319ddf393c69e047c27bc5d28ee9e6126282619e3364db56a4331d34' 'SKIP' - 'edf25146df39686581c63b91c80e83dc4568bd50ce4d91ca73cfd00cf9e1528d' + 'a7898f8f6852998f76cdf0dd2a7cb6941c64be868f41745722eec363b6a1b35e' 'SKIP' 'da336d8e5291b7641598eb5d7f44f54dacf6515ed6ffd32735dd6f128458dbdc' 'SKIP' diff --git a/kernels/linux-libre-knock/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch b/kernels/linux-libre-knock/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch new file mode 100644 index 000000000..15da9c081 --- /dev/null +++ b/kernels/linux-libre-knock/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch @@ -0,0 +1,77 @@ +From 98e458c66c85472984a4230f34e7386af9e7b8d6 Mon Sep 17 00:00:00 2001 +From: Jason Self <j@jxself.org> +Date: Wed, 5 Aug 2015 09:16:03 -0700 +Subject: [PATCH 1/1] [PATCH] drm/radeon: Make the driver load without the + firmwares. + +--- + drivers/gpu/drm/radeon/r600.c | 8 ++++---- + drivers/gpu/drm/radeon/r600_cp.c | 5 ++++- + 2 files changed, 8 insertions(+), 5 deletions(-) + +diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c +index 720e599..d6a92ba 100644 +--- a/drivers/gpu/drm/radeon/r600.c ++++ b/drivers/gpu/drm/radeon/r600.c +@@ -2442,7 +2442,7 @@ int r600_init_microcode(struct radeon_device *rdev) + } + + DRM_INFO("Loading %s Microcode\n", chip_name); +- ++#if 0 + snprintf(fw_name, sizeof(fw_name), "/*(DEBLOBBED)*/", chip_name); + err = reject_firmware(&rdev->pfp_fw, fw_name, rdev->dev); + if (err) +@@ -2494,7 +2494,7 @@ int r600_init_microcode(struct radeon_device *rdev) + err = -EINVAL; + } + } +- ++#endif + out: + if (err) { + if (err != -EINVAL) +@@ -3154,7 +3154,7 @@ int r600_init(struct radeon_device *rdev) + r = radeon_bo_init(rdev); + if (r) + return r; +- ++#if 0 + if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) { + r = r600_init_microcode(rdev); + if (r) { +@@ -3162,7 +3162,7 @@ int r600_init(struct radeon_device *rdev) + return r; + } + } +- ++#endif + /* Initialize power management */ + radeon_pm_init(rdev); + +diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c +index af15260..f138df9 100644 +--- a/drivers/gpu/drm/radeon/r600_cp.c ++++ b/drivers/gpu/drm/radeon/r600_cp.c +@@ -2241,7 +2241,7 @@ int r600_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init, + else + r600_vm_init(dev); + } +- ++#if 0 + if (!dev_priv->me_fw || !dev_priv->pfp_fw) { + int err = r600_cp_init_microcode(dev_priv); + if (err) { +@@ -2250,6 +2250,9 @@ int r600_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init, + return err; + } + } ++#endif ++ printk("Skipping firmware loading\n"); ++#endif + if (((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV770)) + r700_cp_load_microcode(dev_priv); + else +-- +1.9.1 + diff --git a/kernels/linux-libre-knock/PKGBUILD b/kernels/linux-libre-knock/PKGBUILD index 7623e54f9..87a71e8b0 100644 --- a/kernels/linux-libre-knock/PKGBUILD +++ b/kernels/linux-libre-knock/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-knock _pkgbasever=4.1-gnu -_pkgver=4.1.4-gnu +_pkgver=4.1.6-gnu _knockpatchver=4.1_1 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -43,10 +43,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li 'config.i686' 'config.x86_64' # standard config files for mkinitcpio ramdisk 'linux.preset' - 'change-default-console-loglevel.patch') + 'change-default-console-loglevel.patch' + '0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch') sha256sums=('48b2e5ea077d0a0bdcb205e67178e8eb5b2867db3b2364b701dbc801d9755324' 'SKIP' - '4929cf8776f454ec34af5e1d89fa0ceda666da17e5d0878f7c9f6db5e0e1af97' + '335d3e07319ddf393c69e047c27bc5d28ee9e6126282619e3364db56a4331d34' 'SKIP' 'da336d8e5291b7641598eb5d7f44f54dacf6515ed6ffd32735dd6f128458dbdc' 'SKIP' @@ -59,7 +60,8 @@ sha256sums=('48b2e5ea077d0a0bdcb205e67178e8eb5b2867db3b2364b701dbc801d9755324' '748dce2e5fb24dfb5b29410c28a0233382cbb22b2dd9b22047fe4c78e58bd418' '6076bfc7c8b794a7591a9cea2b1e58e4a4fd8fbd44be66f70d8b1372abc7f917' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' - '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99') + '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' + '38cf6bdf70dc070ff0b785937d99347bb91f8531ea2bcca50283c8923a184c6d') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva 'C92BAA713B8D53D3CAE63FC9E6974752F9704456' # André Silva @@ -99,6 +101,10 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -p1 -i "${srcdir}/change-default-console-loglevel.patch" + # Make the radeon driver load without the firmwares + # http://www.fsfla.org/pipermail/linux-libre/2015-August/003098.html + patch -Np1 -i ../0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch + cat "${srcdir}/config.${CARCH}" > ./.config # append pkgrel to extraversion diff --git a/kernels/linux-libre-lts-grsec-knock/PKGBUILD b/kernels/linux-libre-lts-grsec-knock/PKGBUILD index 1463329d2..84feba4dd 100644 --- a/kernels/linux-libre-lts-grsec-knock/PKGBUILD +++ b/kernels/linux-libre-lts-grsec-knock/PKGBUILD @@ -9,9 +9,9 @@ pkgbase=linux-libre-lts-grsec-knock _pkgbasever=3.14-gnu -_pkgver=3.14.50-gnu +_pkgver=3.14.51-gnu _grsecver=3.1 -_timestamp=201508102128 +_timestamp=201508181951 _knockpatchver=3.16_1 _replacesarchkernel=('linux-grsec-knock-lts') # '%' gets replaced with _kernelname @@ -54,9 +54,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'SKIP' - '811f8820610d9c8622229151c638f08d62b693242cac6b0c04428b6f5df863a2' + 'b12b75dfeac07e8bfe7c76bc7b4d9012dfbfc25201b7cdf9edf31466ee5a0fac' 'SKIP' - '64ca1482a0eb070df19c279dae3a34f9352e1cf6d7adce043497452891fde1f5' + '8b28ae2f46283274dbd6fd77bba36e6a18be633887125e2077ea269587b0b0b7' 'SKIP' '70cbe962aa01989ffa83490bb0765d6e4c781f6133dc8d768d84bd6716ac0209' 'SKIP' diff --git a/kernels/linux-libre-lts-knock/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch b/kernels/linux-libre-lts-knock/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch new file mode 100644 index 000000000..15da9c081 --- /dev/null +++ b/kernels/linux-libre-lts-knock/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch @@ -0,0 +1,77 @@ +From 98e458c66c85472984a4230f34e7386af9e7b8d6 Mon Sep 17 00:00:00 2001 +From: Jason Self <j@jxself.org> +Date: Wed, 5 Aug 2015 09:16:03 -0700 +Subject: [PATCH 1/1] [PATCH] drm/radeon: Make the driver load without the + firmwares. + +--- + drivers/gpu/drm/radeon/r600.c | 8 ++++---- + drivers/gpu/drm/radeon/r600_cp.c | 5 ++++- + 2 files changed, 8 insertions(+), 5 deletions(-) + +diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c +index 720e599..d6a92ba 100644 +--- a/drivers/gpu/drm/radeon/r600.c ++++ b/drivers/gpu/drm/radeon/r600.c +@@ -2442,7 +2442,7 @@ int r600_init_microcode(struct radeon_device *rdev) + } + + DRM_INFO("Loading %s Microcode\n", chip_name); +- ++#if 0 + snprintf(fw_name, sizeof(fw_name), "/*(DEBLOBBED)*/", chip_name); + err = reject_firmware(&rdev->pfp_fw, fw_name, rdev->dev); + if (err) +@@ -2494,7 +2494,7 @@ int r600_init_microcode(struct radeon_device *rdev) + err = -EINVAL; + } + } +- ++#endif + out: + if (err) { + if (err != -EINVAL) +@@ -3154,7 +3154,7 @@ int r600_init(struct radeon_device *rdev) + r = radeon_bo_init(rdev); + if (r) + return r; +- ++#if 0 + if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) { + r = r600_init_microcode(rdev); + if (r) { +@@ -3162,7 +3162,7 @@ int r600_init(struct radeon_device *rdev) + return r; + } + } +- ++#endif + /* Initialize power management */ + radeon_pm_init(rdev); + +diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c +index af15260..f138df9 100644 +--- a/drivers/gpu/drm/radeon/r600_cp.c ++++ b/drivers/gpu/drm/radeon/r600_cp.c +@@ -2241,7 +2241,7 @@ int r600_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init, + else + r600_vm_init(dev); + } +- ++#if 0 + if (!dev_priv->me_fw || !dev_priv->pfp_fw) { + int err = r600_cp_init_microcode(dev_priv); + if (err) { +@@ -2250,6 +2250,9 @@ int r600_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init, + return err; + } + } ++#endif ++ printk("Skipping firmware loading\n"); ++#endif + if (((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV770)) + r700_cp_load_microcode(dev_priv); + else +-- +1.9.1 + diff --git a/kernels/linux-libre-lts-knock/PKGBUILD b/kernels/linux-libre-lts-knock/PKGBUILD index 7ac76ac32..189f90bee 100644 --- a/kernels/linux-libre-lts-knock/PKGBUILD +++ b/kernels/linux-libre-lts-knock/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-lts-knock _pkgbasever=3.14-gnu -_pkgver=3.14.49-gnu +_pkgver=3.14.51-gnu _knockpatchver=3.16_1 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -46,10 +46,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch' '0003-module-remove-MODULE_GENERIC_TABLE.patch' '0006-genksyms-fix-typeof-handling.patch' - 'gcc5_buildfixes.diff') + 'gcc5_buildfixes.diff' + '0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'SKIP' - '8146f5e0dda01cb95bf8841bc76acea42fd04a2e864cbe2ecfe55092453cc929' + 'b12b75dfeac07e8bfe7c76bc7b4d9012dfbfc25201b7cdf9edf31466ee5a0fac' 'SKIP' '70cbe962aa01989ffa83490bb0765d6e4c781f6133dc8d768d84bd6716ac0209' 'SKIP' @@ -67,7 +68,8 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29' '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d' 'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7' - '9c89039a0f876888fda3be6f574bca5a120e3587d8342747bbc0723b0b4cde7a') + '9c89039a0f876888fda3be6f574bca5a120e3587d8342747bbc0723b0b4cde7a' + '38cf6bdf70dc070ff0b785937d99347bb91f8531ea2bcca50283c8923a184c6d') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva 'C92BAA713B8D53D3CAE63FC9E6974752F9704456' # André Silva @@ -124,6 +126,10 @@ prepare() { # http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=dc53324060f324e8af6867f57bf4891c13c6ef18 patch -p1 -i "${srcdir}/0006-genksyms-fix-typeof-handling.patch" + # Make the radeon driver load without the firmwares + # http://www.fsfla.org/pipermail/linux-libre/2015-August/003098.html + patch -Np1 -i ../0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch + cat "${srcdir}/config.${CARCH}" > ./.config # append pkgrel to extraversion diff --git a/kernels/linux-libre-pae/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch b/kernels/linux-libre-pae/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch new file mode 100644 index 000000000..15da9c081 --- /dev/null +++ b/kernels/linux-libre-pae/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch @@ -0,0 +1,77 @@ +From 98e458c66c85472984a4230f34e7386af9e7b8d6 Mon Sep 17 00:00:00 2001 +From: Jason Self <j@jxself.org> +Date: Wed, 5 Aug 2015 09:16:03 -0700 +Subject: [PATCH 1/1] [PATCH] drm/radeon: Make the driver load without the + firmwares. + +--- + drivers/gpu/drm/radeon/r600.c | 8 ++++---- + drivers/gpu/drm/radeon/r600_cp.c | 5 ++++- + 2 files changed, 8 insertions(+), 5 deletions(-) + +diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c +index 720e599..d6a92ba 100644 +--- a/drivers/gpu/drm/radeon/r600.c ++++ b/drivers/gpu/drm/radeon/r600.c +@@ -2442,7 +2442,7 @@ int r600_init_microcode(struct radeon_device *rdev) + } + + DRM_INFO("Loading %s Microcode\n", chip_name); +- ++#if 0 + snprintf(fw_name, sizeof(fw_name), "/*(DEBLOBBED)*/", chip_name); + err = reject_firmware(&rdev->pfp_fw, fw_name, rdev->dev); + if (err) +@@ -2494,7 +2494,7 @@ int r600_init_microcode(struct radeon_device *rdev) + err = -EINVAL; + } + } +- ++#endif + out: + if (err) { + if (err != -EINVAL) +@@ -3154,7 +3154,7 @@ int r600_init(struct radeon_device *rdev) + r = radeon_bo_init(rdev); + if (r) + return r; +- ++#if 0 + if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) { + r = r600_init_microcode(rdev); + if (r) { +@@ -3162,7 +3162,7 @@ int r600_init(struct radeon_device *rdev) + return r; + } + } +- ++#endif + /* Initialize power management */ + radeon_pm_init(rdev); + +diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c +index af15260..f138df9 100644 +--- a/drivers/gpu/drm/radeon/r600_cp.c ++++ b/drivers/gpu/drm/radeon/r600_cp.c +@@ -2241,7 +2241,7 @@ int r600_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init, + else + r600_vm_init(dev); + } +- ++#if 0 + if (!dev_priv->me_fw || !dev_priv->pfp_fw) { + int err = r600_cp_init_microcode(dev_priv); + if (err) { +@@ -2250,6 +2250,9 @@ int r600_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init, + return err; + } + } ++#endif ++ printk("Skipping firmware loading\n"); ++#endif + if (((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV770)) + r700_cp_load_microcode(dev_priv); + else +-- +1.9.1 + diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 37c83d319..9b9d3cdd7 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-pae _pkgbasever=4.1-gnu -_pkgver=4.1.4-gnu +_pkgver=4.1.6-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -38,10 +38,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li 'config' # standard config files for mkinitcpio ramdisk 'linux.preset' - 'change-default-console-loglevel.patch') + 'change-default-console-loglevel.patch' + '0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch') sha256sums=('48b2e5ea077d0a0bdcb205e67178e8eb5b2867db3b2364b701dbc801d9755324' 'SKIP' - '4929cf8776f454ec34af5e1d89fa0ceda666da17e5d0878f7c9f6db5e0e1af97' + '335d3e07319ddf393c69e047c27bc5d28ee9e6126282619e3364db56a4331d34' 'SKIP' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' 'SKIP' @@ -51,7 +52,8 @@ sha256sums=('48b2e5ea077d0a0bdcb205e67178e8eb5b2867db3b2364b701dbc801d9755324' 'SKIP' '1a9eaa79032093b0849767ff015b06e835bda3076a2dcae7a94e95d82aeaa44b' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' - '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99') + '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' + '38cf6bdf70dc070ff0b785937d99347bb91f8531ea2bcca50283c8923a184c6d') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva '684D54A189305A9CC95446D36B888913DDB59515' # Márcio Silva @@ -82,6 +84,10 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -p1 -i "${srcdir}/change-default-console-loglevel.patch" + # Make the radeon driver load without the firmwares + # http://www.fsfla.org/pipermail/linux-libre/2015-August/003098.html + patch -Np1 -i ../0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch + cat "${srcdir}/config" > ./.config # simpler # append pkgrel to extraversion diff --git a/kernels/linux-libre-rt/0001-Bluetooth-btbcm-allow-btbcm_read_verbose_config-to-f.patch b/kernels/linux-libre-rt/0001-Bluetooth-btbcm-allow-btbcm_read_verbose_config-to-f.patch deleted file mode 100644 index 1d5871606..000000000 --- a/kernels/linux-libre-rt/0001-Bluetooth-btbcm-allow-btbcm_read_verbose_config-to-f.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 7bee8b08c428b63aa4a3765bb907602e36355378 Mon Sep 17 00:00:00 2001 -From: Chris Mason <clm@fb.com> -Date: Tue, 14 Jul 2015 16:25:30 -0400 -Subject: [PATCH] Bluetooth: btbcm: allow btbcm_read_verbose_config to fail on - Apple - -Commit 1c8ba6d013 moved around the setup code for broadcomm chips, -and also added btbcm_read_verbose_config() to read extra information -about the hardware. It's returning errors on some macbooks: - -Bluetooth: hci0: BCM: Read verbose config info failed (-16) - -Which makes us error out of the setup function. Since this -probe isn't critical to operate the chip, this patch just changes -things to carry on when it fails. - -Signed-off-by: Chris Mason <clm@fb.com> -Signed-off-by: Marcel Holtmann <marcel@holtmann.org> -Cc: stable@vger.kernel.org # v4.1 ---- - drivers/bluetooth/btbcm.c | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c -index 1e1a432..9ceb8ac 100644 ---- a/drivers/bluetooth/btbcm.c -+++ b/drivers/bluetooth/btbcm.c -@@ -472,12 +472,11 @@ int btbcm_setup_apple(struct hci_dev *hdev) - - /* Read Verbose Config Version Info */ - skb = btbcm_read_verbose_config(hdev); -- if (IS_ERR(skb)) -- return PTR_ERR(skb); -- -- BT_INFO("%s: BCM: chip id %u build %4.4u", hdev->name, skb->data[1], -- get_unaligned_le16(skb->data + 5)); -- kfree_skb(skb); -+ if (!IS_ERR(skb)) { -+ BT_INFO("%s: BCM: chip id %u build %4.4u", hdev->name, skb->data[1], -+ get_unaligned_le16(skb->data + 5)); -+ kfree_skb(skb); -+ } - - set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks); - --- -2.4.5 - diff --git a/kernels/linux-libre-rt/0001-block-loop-convert-to-per-device-workqueue.patch b/kernels/linux-libre-rt/0001-block-loop-convert-to-per-device-workqueue.patch deleted file mode 100644 index effd4faaf..000000000 --- a/kernels/linux-libre-rt/0001-block-loop-convert-to-per-device-workqueue.patch +++ /dev/null @@ -1,133 +0,0 @@ -From ebff6d5c91195d37e33b7bbfb36c6cc0119aa06f Mon Sep 17 00:00:00 2001 -From: Ming Lei <ming.lei@canonical.com> -Date: Tue, 5 May 2015 19:49:54 +0800 -Subject: [PATCH 1/2] block: loop: convert to per-device workqueue - -Documentation/workqueue.txt: - If there is dependency among multiple work items used - during memory reclaim, they should be queued to separate - wq each with WQ_MEM_RECLAIM. - -Loop devices can be stacked, so we have to convert to per-device -workqueue. One example is Fedora live CD. - -Fixes: b5dd2f6047ca108001328aac0e8588edd15f1778 -Cc: stable@vger.kernel.org (v4.0) -Cc: Justin M. Forbes <jforbes@fedoraproject.org> -Signed-off-by: Ming Lei <ming.lei@canonical.com> -Acked-by: Tejun Heo <tj@kernel.org> -Signed-off-by: Jens Axboe <axboe@fb.com> ---- - drivers/block/loop.c | 30 ++++++++++++++---------------- - drivers/block/loop.h | 1 + - 2 files changed, 15 insertions(+), 16 deletions(-) - -diff --git a/drivers/block/loop.c b/drivers/block/loop.c -index d7173cb..9786aa3 100644 ---- a/drivers/block/loop.c -+++ b/drivers/block/loop.c -@@ -86,8 +86,6 @@ static DEFINE_MUTEX(loop_index_mutex); - static int max_part; - static int part_shift; - --static struct workqueue_struct *loop_wq; -- - static int transfer_xor(struct loop_device *lo, int cmd, - struct page *raw_page, unsigned raw_off, - struct page *loop_page, unsigned loop_off, -@@ -725,6 +723,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode, - size = get_loop_size(lo, file); - if ((loff_t)(sector_t)size != size) - goto out_putf; -+ error = -ENOMEM; -+ lo->wq = alloc_workqueue("kloopd%d", -+ WQ_MEM_RECLAIM | WQ_HIGHPRI | WQ_UNBOUND, 0, -+ lo->lo_number); -+ if (!lo->wq) -+ goto out_putf; - - error = 0; - -@@ -872,6 +876,8 @@ static int loop_clr_fd(struct loop_device *lo) - lo->lo_flags = 0; - if (!part_shift) - lo->lo_disk->flags |= GENHD_FL_NO_PART_SCAN; -+ destroy_workqueue(lo->wq); -+ lo->wq = NULL; - mutex_unlock(&lo->lo_ctl_mutex); - /* - * Need not hold lo_ctl_mutex to fput backing file. -@@ -1425,9 +1431,13 @@ static int loop_queue_rq(struct blk_mq_hw_ctx *hctx, - const struct blk_mq_queue_data *bd) - { - struct loop_cmd *cmd = blk_mq_rq_to_pdu(bd->rq); -+ struct loop_device *lo = cmd->rq->q->queuedata; - - blk_mq_start_request(bd->rq); - -+ if (lo->lo_state != Lo_bound) -+ return -EIO; -+ - if (cmd->rq->cmd_flags & REQ_WRITE) { - struct loop_device *lo = cmd->rq->q->queuedata; - bool need_sched = true; -@@ -1441,9 +1451,9 @@ static int loop_queue_rq(struct blk_mq_hw_ctx *hctx, - spin_unlock_irq(&lo->lo_lock); - - if (need_sched) -- queue_work(loop_wq, &lo->write_work); -+ queue_work(lo->wq, &lo->write_work); - } else { -- queue_work(loop_wq, &cmd->read_work); -+ queue_work(lo->wq, &cmd->read_work); - } - - return BLK_MQ_RQ_QUEUE_OK; -@@ -1455,9 +1465,6 @@ static void loop_handle_cmd(struct loop_cmd *cmd) - struct loop_device *lo = cmd->rq->q->queuedata; - int ret = -EIO; - -- if (lo->lo_state != Lo_bound) -- goto failed; -- - if (write && (lo->lo_flags & LO_FLAGS_READ_ONLY)) - goto failed; - -@@ -1806,13 +1813,6 @@ static int __init loop_init(void) - goto misc_out; - } - -- loop_wq = alloc_workqueue("kloopd", -- WQ_MEM_RECLAIM | WQ_HIGHPRI | WQ_UNBOUND, 0); -- if (!loop_wq) { -- err = -ENOMEM; -- goto misc_out; -- } -- - blk_register_region(MKDEV(LOOP_MAJOR, 0), range, - THIS_MODULE, loop_probe, NULL, NULL); - -@@ -1850,8 +1850,6 @@ static void __exit loop_exit(void) - blk_unregister_region(MKDEV(LOOP_MAJOR, 0), range); - unregister_blkdev(LOOP_MAJOR, "loop"); - -- destroy_workqueue(loop_wq); -- - misc_deregister(&loop_misc); - } - -diff --git a/drivers/block/loop.h b/drivers/block/loop.h -index 301c27f..49564ed 100644 ---- a/drivers/block/loop.h -+++ b/drivers/block/loop.h -@@ -54,6 +54,7 @@ struct loop_device { - gfp_t old_gfp_mask; - - spinlock_t lo_lock; -+ struct workqueue_struct *wq; - struct list_head write_cmd_head; - struct work_struct write_work; - bool write_started; --- -2.4.5 - diff --git a/kernels/linux-libre-rt/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch b/kernels/linux-libre-rt/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch new file mode 100644 index 000000000..15da9c081 --- /dev/null +++ b/kernels/linux-libre-rt/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch @@ -0,0 +1,77 @@ +From 98e458c66c85472984a4230f34e7386af9e7b8d6 Mon Sep 17 00:00:00 2001 +From: Jason Self <j@jxself.org> +Date: Wed, 5 Aug 2015 09:16:03 -0700 +Subject: [PATCH 1/1] [PATCH] drm/radeon: Make the driver load without the + firmwares. + +--- + drivers/gpu/drm/radeon/r600.c | 8 ++++---- + drivers/gpu/drm/radeon/r600_cp.c | 5 ++++- + 2 files changed, 8 insertions(+), 5 deletions(-) + +diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c +index 720e599..d6a92ba 100644 +--- a/drivers/gpu/drm/radeon/r600.c ++++ b/drivers/gpu/drm/radeon/r600.c +@@ -2442,7 +2442,7 @@ int r600_init_microcode(struct radeon_device *rdev) + } + + DRM_INFO("Loading %s Microcode\n", chip_name); +- ++#if 0 + snprintf(fw_name, sizeof(fw_name), "/*(DEBLOBBED)*/", chip_name); + err = reject_firmware(&rdev->pfp_fw, fw_name, rdev->dev); + if (err) +@@ -2494,7 +2494,7 @@ int r600_init_microcode(struct radeon_device *rdev) + err = -EINVAL; + } + } +- ++#endif + out: + if (err) { + if (err != -EINVAL) +@@ -3154,7 +3154,7 @@ int r600_init(struct radeon_device *rdev) + r = radeon_bo_init(rdev); + if (r) + return r; +- ++#if 0 + if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) { + r = r600_init_microcode(rdev); + if (r) { +@@ -3162,7 +3162,7 @@ int r600_init(struct radeon_device *rdev) + return r; + } + } +- ++#endif + /* Initialize power management */ + radeon_pm_init(rdev); + +diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c +index af15260..f138df9 100644 +--- a/drivers/gpu/drm/radeon/r600_cp.c ++++ b/drivers/gpu/drm/radeon/r600_cp.c +@@ -2241,7 +2241,7 @@ int r600_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init, + else + r600_vm_init(dev); + } +- ++#if 0 + if (!dev_priv->me_fw || !dev_priv->pfp_fw) { + int err = r600_cp_init_microcode(dev_priv); + if (err) { +@@ -2250,6 +2250,9 @@ int r600_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init, + return err; + } + } ++#endif ++ printk("Skipping firmware loading\n"); ++#endif + if (((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV770)) + r700_cp_load_microcode(dev_priv); + else +-- +1.9.1 + diff --git a/kernels/linux-libre-rt/0002-block-loop-avoiding-too-many-pending-per-work-I-O.patch b/kernels/linux-libre-rt/0002-block-loop-avoiding-too-many-pending-per-work-I-O.patch deleted file mode 100644 index fcad0c0b9..000000000 --- a/kernels/linux-libre-rt/0002-block-loop-avoiding-too-many-pending-per-work-I-O.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 63eb7031005b6f22fc1dab9f0c29435f1b52a96b Mon Sep 17 00:00:00 2001 -From: Ming Lei <ming.lei@canonical.com> -Date: Tue, 5 May 2015 19:49:55 +0800 -Subject: [PATCH 2/2] block: loop: avoiding too many pending per work I/O - -If there are too many pending per work I/O, too many -high priority work thread can be generated so that -system performance can be effected. - -This patch limits the max_active parameter of workqueue as 16. - -This patch fixes Fedora 22 live booting performance -regression when it is booted from squashfs over dm -based on loop, and looks the following reasons are -related with the problem: - -- not like other filesyststems(such as ext4), squashfs -is a bit special, and I observed that increasing I/O jobs -to access file in squashfs only improve I/O performance a -little, but it can make big difference for ext4 - -- nested loop: both squashfs.img and ext3fs.img are mounted -as loop block, and ext3fs.img is inside the squashfs - -- during booting, lots of tasks may run concurrently - -Fixes: b5dd2f6047ca108001328aac0e8588edd15f1778 -Cc: stable@vger.kernel.org (v4.0) -Cc: Justin M. Forbes <jforbes@fedoraproject.org> -Signed-off-by: Ming Lei <ming.lei@canonical.com> -Acked-by: Tejun Heo <tj@kernel.org> -Signed-off-by: Jens Axboe <axboe@fb.com> ---- - drivers/block/loop.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/block/loop.c b/drivers/block/loop.c -index 9786aa3..cef6fa8 100644 ---- a/drivers/block/loop.c -+++ b/drivers/block/loop.c -@@ -725,7 +725,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode, - goto out_putf; - error = -ENOMEM; - lo->wq = alloc_workqueue("kloopd%d", -- WQ_MEM_RECLAIM | WQ_HIGHPRI | WQ_UNBOUND, 0, -+ WQ_MEM_RECLAIM | WQ_HIGHPRI | WQ_UNBOUND, 16, - lo->lo_number); - if (!lo->wq) - goto out_putf; --- -2.4.5 - diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index 744aaf53e..e3e94ce5c 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -9,9 +9,9 @@ pkgbase=linux-libre-rt _pkgbasever=4.1-gnu -_pkgver=4.1.3-gnu +_pkgver=4.1.5-gnu _rtbasever=4.1 -_rtpatchver=rt3 +_rtpatchver=rt5 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -20,7 +20,7 @@ _replacesoldmodules=() # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*}_${_rtpatchver} pkgver=${_pkgver//-/_}.${_rtpatchver} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') url="https://rt.wiki.kernel.org/" license=('GPL2') @@ -42,16 +42,13 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li 'config.i686' 'config.x86_64' # standard config files for mkinitcpio ramdisk 'linux.preset' - '0001-block-loop-convert-to-per-device-workqueue.patch' - '0002-block-loop-avoiding-too-many-pending-per-work-I-O.patch' - '0001-Bluetooth-btbcm-allow-btbcm_read_verbose_config-to-f.patch' - 'bitmap-enable-booting-for-dm-md-raid1.patch' - 'change-default-console-loglevel.patch') + 'change-default-console-loglevel.patch' + '0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch') sha256sums=('48b2e5ea077d0a0bdcb205e67178e8eb5b2867db3b2364b701dbc801d9755324' 'SKIP' - 'd52669f17a1cd13abba4f47a04e1991be59cfa707926b21f9c5bf031ec10c5d0' + '2f8b5d3176112f3b1679a77acbdd303e9e45bffde76a1972f7e90d457614afb3' 'SKIP' - '42a8d2a54dfd6dc8f351f3b56855b55fcc1aadb8805cc6d07c3b9479aea55c96' + '0cfa47bedd98fb7c542d422c79c52390be622d3e524fed54c976049d0050fec8' 'SKIP' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' 'SKIP' @@ -59,14 +56,11 @@ sha256sums=('48b2e5ea077d0a0bdcb205e67178e8eb5b2867db3b2364b701dbc801d9755324' 'SKIP' '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a' 'SKIP' - '6ed39920f77f08b9e309d16ba815c58081eeb5fed6057778ebe8ba278df83b2c' - '068a1ae5ab0455a5eef0b51f9616082a30943f1cc0cdd307d9d371c78a23153e' + '634f531ddc13b19fd1bdf179631e278b3ab00440777f74a625ef3a59852c4d85' + 'be040e3358f424ab56baaad6d13caeb3e5fdcbb87cb8b6eb09913364b5c019ca' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' - '9e1d3fd95d768a46353593f6678513839cedb98ee66e83d9323233104ec3b23f' - 'bbe3631c737ed8329a1b7a9610cc0a07330c14194da5e9afec7705e7f37eeb81' - '08f69d122021e1d13c31e5987c23021916a819846c47247b3f1cee2ef99d7f82' - '959c4d71b5dc50434eeecf3a8608758f57f111c6e999289c435b13fc8c6be5f0' - '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99') + '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' + '38cf6bdf70dc070ff0b785937d99347bb91f8531ea2bcca50283c8923a184c6d') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva '684D54A189305A9CC95446D36B888913DDB59515' # Márcio Silva @@ -102,29 +96,19 @@ prepare() { # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git - # Fix deadlock with stacked loop devices (FS#45129) - # http://marc.info/?l=linux-kernel&m=143280649731902&w=2 - patch -Np1 -i ../0001-block-loop-convert-to-per-device-workqueue.patch - patch -Np1 -i ../0002-block-loop-avoiding-too-many-pending-per-work-I-O.patch - - # Fix bluetooth chip initialization on some macbooks (FS#45554) - # http://marc.info/?l=linux-bluetooth&m=143690738728402&w=2 - # https://bugzilla.kernel.org/show_bug.cgi?id=100651 - patch -Np1 -i ../0001-Bluetooth-btbcm-allow-btbcm_read_verbose_config-to-f.patch - - # Fix kernel oops when booting with root on RAID1 LVM (FS#45548) - # https://bugzilla.kernel.org/show_bug.cgi?id=100491#c24 - patch -Np1 -i ../bitmap-enable-booting-for-dm-md-raid1.patch - # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -p1 -i "${srcdir}/change-default-console-loglevel.patch" + # Make the radeon driver load without the firmwares + # http://www.fsfla.org/pipermail/linux-libre/2015-August/003098.html + patch -Np1 -i ../0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch + cat "${srcdir}/config.${CARCH}" > ./.config # append pkgrel to extraversion - sed -ri "s|^(EXTRAVERSION =.*\S).*|\1-${_rtpatchver}-${pkgrel}|" Makefile + sed -ri "s|^(EXTRAVERSION =.*\S).*|\1-${pkgrel}|" Makefile # don't run depmod on 'make install'. We'll do this ourselves in packaging sed -i '2iexit 0' scripts/depmod.sh diff --git a/kernels/linux-libre-rt/bitmap-enable-booting-for-dm-md-raid1.patch b/kernels/linux-libre-rt/bitmap-enable-booting-for-dm-md-raid1.patch deleted file mode 100644 index 7b29e82f7..000000000 --- a/kernels/linux-libre-rt/bitmap-enable-booting-for-dm-md-raid1.patch +++ /dev/null @@ -1,83 +0,0 @@ -Subject: [PATCH] Enable loading of bitmaps for dm-md-raid1. - -This is also a temporary hack to systems with junk in the rest -of the bitmap super (instead of zeroes) to boot. This is done by -checking mddev->sync_super (which is exclusively set by dm-raid) -is null. - -These changes also include zeroing of most bitmap pages while -allocating so we are sure that the junk is not coming from memory. - -Signed-off-by: Neil Brown <neilb@suse.de> -Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com> ---- -diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c -index 135a090..dfa5ef3 100644 ---- a/drivers/md/bitmap.c -+++ b/drivers/md/bitmap.c -@@ -494,7 +494,7 @@ static int bitmap_new_disk_sb(struct bitmap *bitmap) - bitmap_super_t *sb; - unsigned long chunksize, daemon_sleep, write_behind; - -- bitmap->storage.sb_page = alloc_page(GFP_KERNEL); -+ bitmap->storage.sb_page = alloc_page(GFP_KERNEL | __GFP_ZERO); - if (bitmap->storage.sb_page == NULL) - return -ENOMEM; - bitmap->storage.sb_page->index = 0; -@@ -541,6 +541,7 @@ static int bitmap_new_disk_sb(struct bitmap *bitmap) - sb->state = cpu_to_le32(bitmap->flags); - bitmap->events_cleared = bitmap->mddev->events; - sb->events_cleared = cpu_to_le64(bitmap->mddev->events); -+ bitmap->mddev->bitmap_info.nodes = 0; - - kunmap_atomic(sb); - -@@ -568,7 +569,7 @@ static int bitmap_read_sb(struct bitmap *bitmap) - goto out_no_sb; - } - /* page 0 is the superblock, read it... */ -- sb_page = alloc_page(GFP_KERNEL); -+ sb_page = alloc_page(GFP_KERNEL | __GFP_ZERO); - if (!sb_page) - return -ENOMEM; - bitmap->storage.sb_page = sb_page; -@@ -611,8 +612,15 @@ re_read: - daemon_sleep = le32_to_cpu(sb->daemon_sleep) * HZ; - write_behind = le32_to_cpu(sb->write_behind); - sectors_reserved = le32_to_cpu(sb->sectors_reserved); -- nodes = le32_to_cpu(sb->nodes); -- strlcpy(bitmap->mddev->bitmap_info.cluster_name, sb->cluster_name, 64); -+ /* XXX: This is an ugly hack to ensure that we don't use clustering -+ in case dm-raid is in use and the nodes written in bitmap_sb -+ is erroneous. -+ */ -+ if (!bitmap->mddev->sync_super) { -+ nodes = le32_to_cpu(sb->nodes); -+ strlcpy(bitmap->mddev->bitmap_info.cluster_name, -+ sb->cluster_name, 64); -+ } - - /* verify that the bitmap-specific fields are valid */ - if (sb->magic != cpu_to_le32(BITMAP_MAGIC)) -@@ -649,7 +657,7 @@ re_read: - goto out; - } - events = le64_to_cpu(sb->events); -- if (!nodes && (events < bitmap->mddev->events)) { -+ if (err == 0 && !nodes && (events < bitmap->mddev->events)) { - printk(KERN_INFO - "%s: bitmap file is out of date (%llu < %llu) " - "-- forcing full recovery\n", -diff --git a/drivers/md/md.c b/drivers/md/md.c -index 4dbed4a..6bd8bc3 100644 ---- a/drivers/md/md.c -+++ b/drivers/md/md.c -@@ -7415,7 +7415,7 @@ int md_setup_cluster(struct mddev *mddev, int nodes) - err = request_module("md-cluster"); - if (err) { - pr_err("md-cluster module not found.\n"); -- return err; -+ return -ENOENT; - } - - spin_lock(&pers_lock); diff --git a/kernels/linux-libre-rt/config.i686 b/kernels/linux-libre-rt/config.i686 index d4cc7eb95..bb714d9e0 100644 --- a/kernels/linux-libre-rt/config.i686 +++ b/kernels/linux-libre-rt/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.1.3-gnu-rt3-2-rt Kernel Configuration +# Linux/x86 4.1.5-gnu-1-rt Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -19,7 +19,8 @@ CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_HWEIGHT=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y -CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_HAS_CPU_RELAX=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y @@ -128,7 +129,6 @@ CONFIG_RCU_STALL_COMMON=y CONFIG_RCU_FANOUT=32 CONFIG_RCU_FANOUT_LEAF=16 # CONFIG_RCU_FANOUT_EXACT is not set -CONFIG_RCU_FAST_NO_HZ=y # CONFIG_TREE_RCU_TRACE is not set # CONFIG_RCU_BOOST is not set CONFIG_RCU_KTHREAD_PRIO=0 @@ -157,7 +157,6 @@ CONFIG_MEMCG_KMEM=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_CFS_BANDWIDTH=y -CONFIG_RT_GROUP_SCHED=y CONFIG_BLK_CGROUP=y # CONFIG_DEBUG_BLK_CGROUP is not set # CONFIG_CHECKPOINT_RESTORE is not set @@ -192,7 +191,7 @@ CONFIG_SGETMASK_SYSCALL=y CONFIG_SYSFS_SYSCALL=y # CONFIG_SYSCTL_SYSCALL is not set CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_ALL is not set +CONFIG_KALLSYMS_ALL=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y @@ -219,14 +218,10 @@ CONFIG_PERF_EVENTS=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_SLUB_DEBUG=y # CONFIG_COMPAT_BRK is not set -# CONFIG_SLAB is not set CONFIG_SLUB=y -CONFIG_SLUB_CPU_PARTIAL=y CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y -CONFIG_OPROFILE=m -# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set CONFIG_HAVE_OPROFILE=y CONFIG_OPROFILE_NMI_TIMER=y CONFIG_KPROBES=y @@ -344,11 +339,7 @@ CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y CONFIG_ASN1=m -CONFIG_UNINLINE_SPIN_UNLOCK=y CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y -CONFIG_MUTEX_SPIN_ON_OWNER=y -CONFIG_RWSEM_SPIN_ON_OWNER=y -CONFIG_LOCK_SPIN_ON_OWNER=y CONFIG_ARCH_USE_QUEUE_RWLOCK=y CONFIG_QUEUE_RWLOCK=y CONFIG_FREEZER=y @@ -494,9 +485,6 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y CONFIG_MEMORY_FAILURE=y CONFIG_HWPOISON_INJECT=m -CONFIG_TRANSPARENT_HUGEPAGE=y -CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y -# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set CONFIG_CLEANCACHE=y CONFIG_FRONTSWAP=y # CONFIG_CMA is not set @@ -527,9 +515,9 @@ CONFIG_EFI_STUB=y CONFIG_SECCOMP=y # CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set -# CONFIG_HZ_300 is not set -CONFIG_HZ_1000=y -CONFIG_HZ=1000 +CONFIG_HZ_300=y +# CONFIG_HZ_1000 is not set +CONFIG_HZ=300 CONFIG_SCHED_HRTICK=y CONFIG_KEXEC=y # CONFIG_CRASH_DUMP is not set @@ -648,7 +636,6 @@ CONFIG_X86_ACPI_CPUFREQ_CPB=y CONFIG_X86_POWERNOW_K6=m CONFIG_X86_POWERNOW_K7=m CONFIG_X86_POWERNOW_K7_ACPI=y -CONFIG_X86_POWERNOW_K8=m CONFIG_X86_AMD_FREQ_SENSITIVITY=m CONFIG_X86_GX_SUSPMOD=m # CONFIG_X86_SPEEDSTEP_CENTRINO is not set @@ -1828,7 +1815,7 @@ CONFIG_AD525X_DPOT_I2C=m # CONFIG_AD525X_DPOT_SPI is not set # CONFIG_DUMMY_IRQ is not set # CONFIG_IBM_ASM is not set -CONFIG_HWLAT_DETECTOR=m +CONFIG_HWLAT_DETECTOR=y CONFIG_PHANTOM=m CONFIG_SGI_IOC4=m CONFIG_TIFM_CORE=m @@ -2184,9 +2171,6 @@ CONFIG_MD_RAID456=m CONFIG_MD_MULTIPATH=m CONFIG_MD_FAULTY=m # CONFIG_MD_CLUSTER is not set -CONFIG_BCACHE=m -# CONFIG_BCACHE_DEBUG is not set -# CONFIG_BCACHE_CLOSURES_DEBUG is not set CONFIG_BLK_DEV_DM_BUILTIN=y CONFIG_BLK_DEV_DM=m # CONFIG_DM_MQ_DEFAULT is not set @@ -5705,7 +5689,6 @@ CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_ONESHOT=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m -CONFIG_LEDS_TRIGGER_CPU=y CONFIG_LEDS_TRIGGER_GPIO=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m @@ -6448,7 +6431,6 @@ CONFIG_KXCJK1013=m # CONFIG_AD7887 is not set # CONFIG_AD7923 is not set # CONFIG_AD799X is not set -# CONFIG_CC10001_ADC is not set # CONFIG_MAX1027 is not set # CONFIG_MAX1363 is not set # CONFIG_MCP320X is not set @@ -7109,7 +7091,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set -# CONFIG_LATENCYTOP is not set +CONFIG_LATENCYTOP=y CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set CONFIG_USER_STACKTRACE_SUPPORT=y @@ -7127,7 +7109,6 @@ CONFIG_TRACE_CLOCK=y CONFIG_RING_BUFFER=y CONFIG_EVENT_TRACING=y CONFIG_CONTEXT_SWITCH_TRACER=y -CONFIG_RING_BUFFER_ALLOW_SWAP=y CONFIG_TRACING=y CONFIG_GENERIC_TRACER=y CONFIG_TRACING_SUPPORT=y diff --git a/kernels/linux-libre-rt/config.x86_64 b/kernels/linux-libre-rt/config.x86_64 index 3fae8609f..8c73d44df 100644 --- a/kernels/linux-libre-rt/config.x86_64 +++ b/kernels/linux-libre-rt/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.1.3-gnu-rt3-2-rt Kernel Configuration +# Linux/x86 4.1.5-gnu-1-rt Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -20,7 +20,8 @@ CONFIG_GENERIC_BUG=y CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y CONFIG_GENERIC_HWEIGHT=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y -CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_HAS_CPU_RELAX=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y @@ -134,7 +135,6 @@ CONFIG_RCU_STALL_COMMON=y CONFIG_RCU_FANOUT=64 CONFIG_RCU_FANOUT_LEAF=16 # CONFIG_RCU_FANOUT_EXACT is not set -CONFIG_RCU_FAST_NO_HZ=y # CONFIG_TREE_RCU_TRACE is not set # CONFIG_RCU_BOOST is not set CONFIG_RCU_KTHREAD_PRIO=0 @@ -167,7 +167,6 @@ CONFIG_MEMCG_KMEM=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_CFS_BANDWIDTH=y -CONFIG_RT_GROUP_SCHED=y CONFIG_BLK_CGROUP=y # CONFIG_DEBUG_BLK_CGROUP is not set # CONFIG_CHECKPOINT_RESTORE is not set @@ -202,7 +201,7 @@ CONFIG_SGETMASK_SYSCALL=y CONFIG_SYSFS_SYSCALL=y # CONFIG_SYSCTL_SYSCALL is not set CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_ALL is not set +CONFIG_KALLSYMS_ALL=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y @@ -229,14 +228,10 @@ CONFIG_PERF_EVENTS=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_SLUB_DEBUG=y # CONFIG_COMPAT_BRK is not set -# CONFIG_SLAB is not set CONFIG_SLUB=y -CONFIG_SLUB_CPU_PARTIAL=y CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y -CONFIG_OPROFILE=m -# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set CONFIG_HAVE_OPROFILE=y CONFIG_OPROFILE_NMI_TIMER=y CONFIG_KPROBES=y @@ -359,11 +354,7 @@ CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y CONFIG_ASN1=m -CONFIG_UNINLINE_SPIN_UNLOCK=y CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y -CONFIG_MUTEX_SPIN_ON_OWNER=y -CONFIG_RWSEM_SPIN_ON_OWNER=y -CONFIG_LOCK_SPIN_ON_OWNER=y CONFIG_ARCH_USE_QUEUE_RWLOCK=y CONFIG_QUEUE_RWLOCK=y CONFIG_FREEZER=y @@ -508,9 +499,6 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y CONFIG_MEMORY_FAILURE=y CONFIG_HWPOISON_INJECT=m -CONFIG_TRANSPARENT_HUGEPAGE=y -CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y -# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set CONFIG_CLEANCACHE=y CONFIG_FRONTSWAP=y # CONFIG_CMA is not set @@ -540,9 +528,9 @@ CONFIG_EFI_MIXED=y CONFIG_SECCOMP=y # CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set -# CONFIG_HZ_300 is not set -CONFIG_HZ_1000=y -CONFIG_HZ=1000 +CONFIG_HZ_300=y +# CONFIG_HZ_1000 is not set +CONFIG_HZ=300 CONFIG_SCHED_HRTICK=y CONFIG_KEXEC=y # CONFIG_CRASH_DUMP is not set @@ -557,6 +545,7 @@ CONFIG_HOTPLUG_CPU=y # CONFIG_COMPAT_VDSO is not set # CONFIG_CMDLINE_BOOL is not set CONFIG_HAVE_LIVEPATCH=y +# CONFIG_LIVEPATCH is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y CONFIG_USE_PERCPU_NUMA_NODE_ID=y @@ -655,7 +644,6 @@ CONFIG_X86_INTEL_PSTATE=y CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ_CPB=y -CONFIG_X86_POWERNOW_K8=m CONFIG_X86_AMD_FREQ_SENSITIVITY=m # CONFIG_X86_SPEEDSTEP_CENTRINO is not set CONFIG_X86_P4_CLOCKMOD=m @@ -1800,7 +1788,7 @@ CONFIG_AD525X_DPOT_I2C=m # CONFIG_AD525X_DPOT_SPI is not set # CONFIG_DUMMY_IRQ is not set # CONFIG_IBM_ASM is not set -CONFIG_HWLAT_DETECTOR=m +CONFIG_HWLAT_DETECTOR=y CONFIG_PHANTOM=m CONFIG_SGI_IOC4=m CONFIG_TIFM_CORE=m @@ -2130,9 +2118,6 @@ CONFIG_MD_RAID456=m CONFIG_MD_MULTIPATH=m CONFIG_MD_FAULTY=m # CONFIG_MD_CLUSTER is not set -CONFIG_BCACHE=m -# CONFIG_BCACHE_DEBUG is not set -# CONFIG_BCACHE_CLOSURES_DEBUG is not set CONFIG_BLK_DEV_DM_BUILTIN=y CONFIG_BLK_DEV_DM=m # CONFIG_DM_MQ_DEFAULT is not set @@ -5482,7 +5467,6 @@ CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_ONESHOT=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m -CONFIG_LEDS_TRIGGER_CPU=y CONFIG_LEDS_TRIGGER_GPIO=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m @@ -6188,7 +6172,6 @@ CONFIG_KXCJK1013=m # CONFIG_AD7887 is not set # CONFIG_AD7923 is not set # CONFIG_AD799X is not set -# CONFIG_CC10001_ADC is not set # CONFIG_MAX1027 is not set # CONFIG_MAX1363 is not set # CONFIG_MCP320X is not set @@ -6842,7 +6825,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set -# CONFIG_LATENCYTOP is not set +CONFIG_LATENCYTOP=y CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set CONFIG_USER_STACKTRACE_SUPPORT=y @@ -6861,7 +6844,6 @@ CONFIG_TRACE_CLOCK=y CONFIG_RING_BUFFER=y CONFIG_EVENT_TRACING=y CONFIG_CONTEXT_SWITCH_TRACER=y -CONFIG_RING_BUFFER_ALLOW_SWAP=y CONFIG_TRACING=y CONFIG_GENERIC_TRACER=y CONFIG_TRACING_SUPPORT=y diff --git a/kernels/linux-libre-xen/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch b/kernels/linux-libre-xen/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch new file mode 100644 index 000000000..15da9c081 --- /dev/null +++ b/kernels/linux-libre-xen/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch @@ -0,0 +1,77 @@ +From 98e458c66c85472984a4230f34e7386af9e7b8d6 Mon Sep 17 00:00:00 2001 +From: Jason Self <j@jxself.org> +Date: Wed, 5 Aug 2015 09:16:03 -0700 +Subject: [PATCH 1/1] [PATCH] drm/radeon: Make the driver load without the + firmwares. + +--- + drivers/gpu/drm/radeon/r600.c | 8 ++++---- + drivers/gpu/drm/radeon/r600_cp.c | 5 ++++- + 2 files changed, 8 insertions(+), 5 deletions(-) + +diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c +index 720e599..d6a92ba 100644 +--- a/drivers/gpu/drm/radeon/r600.c ++++ b/drivers/gpu/drm/radeon/r600.c +@@ -2442,7 +2442,7 @@ int r600_init_microcode(struct radeon_device *rdev) + } + + DRM_INFO("Loading %s Microcode\n", chip_name); +- ++#if 0 + snprintf(fw_name, sizeof(fw_name), "/*(DEBLOBBED)*/", chip_name); + err = reject_firmware(&rdev->pfp_fw, fw_name, rdev->dev); + if (err) +@@ -2494,7 +2494,7 @@ int r600_init_microcode(struct radeon_device *rdev) + err = -EINVAL; + } + } +- ++#endif + out: + if (err) { + if (err != -EINVAL) +@@ -3154,7 +3154,7 @@ int r600_init(struct radeon_device *rdev) + r = radeon_bo_init(rdev); + if (r) + return r; +- ++#if 0 + if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) { + r = r600_init_microcode(rdev); + if (r) { +@@ -3162,7 +3162,7 @@ int r600_init(struct radeon_device *rdev) + return r; + } + } +- ++#endif + /* Initialize power management */ + radeon_pm_init(rdev); + +diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c +index af15260..f138df9 100644 +--- a/drivers/gpu/drm/radeon/r600_cp.c ++++ b/drivers/gpu/drm/radeon/r600_cp.c +@@ -2241,7 +2241,7 @@ int r600_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init, + else + r600_vm_init(dev); + } +- ++#if 0 + if (!dev_priv->me_fw || !dev_priv->pfp_fw) { + int err = r600_cp_init_microcode(dev_priv); + if (err) { +@@ -2250,6 +2250,9 @@ int r600_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init, + return err; + } + } ++#endif ++ printk("Skipping firmware loading\n"); ++#endif + if (((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV770)) + r700_cp_load_microcode(dev_priv); + else +-- +1.9.1 + diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 539f6031f..f3389b435 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-xen _pkgbasever=4.1-gnu -_pkgver=4.1.4-gnu +_pkgver=4.1.6-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -38,10 +38,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li 'config' # standard config files for mkinitcpio ramdisk 'linux.preset' - 'change-default-console-loglevel.patch') + 'change-default-console-loglevel.patch' + '0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch') sha256sums=('48b2e5ea077d0a0bdcb205e67178e8eb5b2867db3b2364b701dbc801d9755324' 'SKIP' - '4929cf8776f454ec34af5e1d89fa0ceda666da17e5d0878f7c9f6db5e0e1af97' + '335d3e07319ddf393c69e047c27bc5d28ee9e6126282619e3364db56a4331d34' 'SKIP' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' 'SKIP' @@ -51,7 +52,8 @@ sha256sums=('48b2e5ea077d0a0bdcb205e67178e8eb5b2867db3b2364b701dbc801d9755324' 'SKIP' '860c234869e472cddb30d583b6ac048cd5be083511a097a2f4db4a31cdaba8c4' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' - '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99') + '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' + '38cf6bdf70dc070ff0b785937d99347bb91f8531ea2bcca50283c8923a184c6d') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva '684D54A189305A9CC95446D36B888913DDB59515' # Márcio Silva @@ -82,6 +84,10 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -p1 -i "${srcdir}/change-default-console-loglevel.patch" + # Make the radeon driver load without the firmwares + # http://www.fsfla.org/pipermail/linux-libre/2015-August/003098.html + patch -Np1 -i ../0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch + cat "${srcdir}/config" > ./.config # simpler # append pkgrel to extraversion diff --git a/libre-multilib/lib32-mesa-libcl/PKGBUILD b/libre-multilib/lib32-mesa-libcl/PKGBUILD index 3946dd7f6..e92d671a0 100644 --- a/libre-multilib/lib32-mesa-libcl/PKGBUILD +++ b/libre-multilib/lib32-mesa-libcl/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=mesa _pkgname=libcl pkgname=lib32-$pkgbase-$_pkgname -pkgver=10.6.4 +pkgver=10.6.5 pkgrel=1 pkgdesc='Mesa 3-D OpenCL library and ICD loader (32-bit)' arch=('x86_64') @@ -19,7 +19,7 @@ conflicts=("lib32-$_pkgname" "lib32-$_pkgname-libre" 'lib32-opencl-nvidia' 'lib3 replaces=("lib32-$_pkgname" "lib32-$_pkgname-libre" 'lib32-opencl-nvidia' 'lib32-opencl-nvidia-304xx') source=(ftp://ftp.freedesktop.org/pub/$pkgbase/$pkgver/$pkgbase-$pkgver.tar.xz{,.sig} 0001-i965-Remove-early-release-of-DRI2-miptree.patch) -sha512sums=('913800ebb73bde04ceed1dfe0c622f36622a89be2a795b63e6b05fbb59a982f4b0d83531b2b1697aeb20bab0aac4b82adf8e7d1985713e525d722b3b7b58f683' +sha512sums=('46be6bd683d286bdf9ab8b4c1b1b32f89c95701b8c48cee49b060f5beaacea4540a69b99b4fde0f80acdd8e725552bef17dbd4251b9e977caeb5fd9d0ba56595' 'SKIP' '86bfab88131440d1e5aefd157f12d8927c1a71af4f29b43c607bd2c37ee87f8164c92dc4309fade3c667f7d5907f99d0aa79b5fee1b8ff0eafe5f6d869bbed99') validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov@gmail.com> diff --git a/libre-multilib/lib32-opencl-mesa/PKGBUILD b/libre-multilib/lib32-opencl-mesa/PKGBUILD index be0acd0fd..57e55eade 100644 --- a/libre-multilib/lib32-opencl-mesa/PKGBUILD +++ b/libre-multilib/lib32-opencl-mesa/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=mesa pkgname=lib32-opencl-$pkgbase -pkgver=10.6.4 +pkgver=10.6.5 pkgrel=1 pkgdesc='OpenCL support for mesa drivers (32-bit)' arch=('x86_64') @@ -16,7 +16,7 @@ optdepends=('opencl-headers: headers necessary for OpenCL development') makedepends=('python2-mako' 'dri2proto' 'dri3proto' 'glproto' 'presentproto' 'python2' 'llvm') source=(ftp://ftp.freedesktop.org/pub/$pkgbase/$pkgver/$pkgbase-$pkgver.tar.xz{,.sig} 0001-i965-Remove-early-release-of-DRI2-miptree.patch) -sha512sums=('913800ebb73bde04ceed1dfe0c622f36622a89be2a795b63e6b05fbb59a982f4b0d83531b2b1697aeb20bab0aac4b82adf8e7d1985713e525d722b3b7b58f683' +sha512sums=('46be6bd683d286bdf9ab8b4c1b1b32f89c95701b8c48cee49b060f5beaacea4540a69b99b4fde0f80acdd8e725552bef17dbd4251b9e977caeb5fd9d0ba56595' 'SKIP' '86bfab88131440d1e5aefd157f12d8927c1a71af4f29b43c607bd2c37ee87f8164c92dc4309fade3c667f7d5907f99d0aa79b5fee1b8ff0eafe5f6d869bbed99') validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov@gmail.com> diff --git a/libre-multilib/pcsx2/PKGBUILD b/libre-multilib/pcsx2/PKGBUILD index fbf48a49f..e39107faa 100644 --- a/libre-multilib/pcsx2/PKGBUILD +++ b/libre-multilib/pcsx2/PKGBUILD @@ -2,10 +2,11 @@ # Maintainer (Arch): Maxime Gauduin <alucryd@gmail.com> # Contributor (Arch): josephgbr <rafael.f.f1@gmail.com> # Contributor (Arch): vEX <vex@niechift.com> +# Maintainer: Márcio Silva <coadde@parabola.nu> pkgname=pcsx2 pkgver=1.3.1 -pkgrel=2.parabola1 +pkgrel=2.parabola2 pkgdesc='A Sony PlayStation 2 emulator, without nonfree nvidia-cg-toolkit support' arch=('i686' 'x86_64') url='http://www.pcsx2.net' @@ -28,8 +29,9 @@ sha256sums=('60ba9f7f85bf4337ca6962f9b437d549f16fc04ea0b6b261d7521e0416c2b8c9') prepare() { cd ${pkgname}-${pkgver} - # remove Cg shader on ZZogl plugin - sed -i '\|zzogl-pg-cg| s|^|#|' plugins/CMakeLists.txt + # remove zzogl and zerogs plugins (depends nonfree nvidia-cg-toolkit) + rm -vr plugins/{zerogs,zzogl-pg} + sed -i '\|zz_res =|,+4 d' linux_various/glsl2h.pl } build() { diff --git a/libre/abiword/PKGBUILD b/libre/abiword/PKGBUILD index 12881cd8a..00e0b7ef0 100644 --- a/libre/abiword/PKGBUILD +++ b/libre/abiword/PKGBUILD @@ -6,9 +6,9 @@ pkgname=abiword pkgver=3.0.1 -pkgrel=2.parabola1 -arch=('i686' 'x86_64' 'mips64el') -pkgdesc='Fully-featured word processor, without nonfree fonts support' +pkgrel=2.parabola2 +arch=('i686' 'x86_64') +pkgdesc='Fully-featured word processor, without Google search engine and nonfree fonts support' license=('GPL') url='http://www.abisource.com' depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils' @@ -70,7 +70,12 @@ build() { --disable-static \ --enable-clipart \ --enable-templates \ - --enable-plugins \ + --enable-plugins="aiksaurus applix babelfish bmp clarisworks collab docbook \ + eml epub freetranslation garble gdict gimp goffice grammar \ + hancom hrtext iscii kword latex loadbindings mathview mht \ + mif mswrite opendocument openwriter openxml opml ots paint \ + passepartout pdb pdf presentation psion s5 sdw t602 urldict \ + wikipedia wmf wml wordperfect wpg xslfo" \ --enable-introspection make } diff --git a/libre/acpi_call/PKGBUILD b/libre/acpi_call/PKGBUILD index d3d2f41dc..38f9050f1 100644 --- a/libre/acpi_call/PKGBUILD +++ b/libre/acpi_call/PKGBUILD @@ -9,7 +9,7 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then _basekernel=4.1 - _archrel=33 + _archrel=34 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 diff --git a/libre/ark/PKGBUILD b/libre/ark/PKGBUILD new file mode 100644 index 000000000..652081ec5 --- /dev/null +++ b/libre/ark/PKGBUILD @@ -0,0 +1,50 @@ +# $Id$ +# Maintainer (Arch): Antonio Rojas <arojas@archlinux.org> +# Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> +# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> +# Maintainer: André Silva <emulatorman@parabola.nu> + +pkgname=ark +pkgver=15.08.0 +pkgrel=1.parabola1 +#pkgdesc='Archiving Tool, with unar support' +pkgdesc='Archiving Tool, without unrar recommendation' +arch=(i686 x86_64) +url='http://kde.org/applications/utilities/ark/' +license=(GPL) +depends=(kpty khtml libarchive hicolor-icon-theme) +makedepends=(extra-cmake-modules kdoctools python) +#optdepends=(p7zip zip unzip unar) +optdepends=(p7zip zip unzip) +conflicts=(kdeutils-ark) +replaces=(kdeutils-ark) +groups=(kde-applications kdeutils) +install=$pkgname.install +source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz") +# 'ark-unar-06.patch') +md5sums=('6ab73a072f05b4ccccbfe64521094f7f') +# 'f38dc71e385e9242899cbe032a983d81') + +prepare() { + mkdir -p build +# cd $pkgname-$pkgver +# # This patch will allow Ark to use The Unarchiver command line utilities (unar/lsar) to operate on RAR files, particularly RARv3. +# patch -Np1 -i ../ark-unar-07.patch +} + +build() { + cd build + cmake ../$pkgname-$pkgver \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DLIB_INSTALL_DIR=lib \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DBUILD_TESTING=OFF + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install +} + diff --git a/libre/kdeutils-ark/ark-unar-06.patch b/libre/ark/ark-unar-06.patch index ab2ef274f..ab2ef274f 100644 --- a/libre/kdeutils-ark/ark-unar-06.patch +++ b/libre/ark/ark-unar-06.patch diff --git a/libre/kdeutils-ark/kdeutils-ark.install b/libre/ark/ark.install index 8a26818d8..74ff488bc 100644 --- a/libre/kdeutils-ark/kdeutils-ark.install +++ b/libre/ark/ark.install @@ -1,12 +1,13 @@ post_install() { - update-desktop-database -q xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q } -post_update() { +post_upgrade() { post_install } post_remove() { post_install } + diff --git a/libre/arora/PKGBUILD b/libre/arora/PKGBUILD index 9144b6e7d..d75963567 100644 --- a/libre/arora/PKGBUILD +++ b/libre/arora/PKGBUILD @@ -6,11 +6,11 @@ pkgname=arora pkgver=0.11.0 -pkgrel=4.parabola1 -pkgdesc='Lightweight cross-platform Web browser, without nonfree flash recommendation and non-privacy search providers' +pkgrel=4.parabola2 +pkgdesc='Lightweight cross-platform Web browser, without nonfree flash recommendation and non-privacy search engines' url="http://code.google.com/p/$pkgname/" license=('GPL') -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') replaces=($pkgname-libre) conflicts=($pkgname-libre) depends=('qtwebkit' 'desktop-file-utils') @@ -33,7 +33,7 @@ install=install prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - # remove non-privacy search providers + # remove non-privacy search engines rm -r src/data/searchengines/* install -m644 $srcdir/searchengines.qrc src/data/searchengines install -m644 "$srcdir/"{duckduckgo-html,seeks-search,wikipedia-en,yacy}.xml src/data/searchengines diff --git a/libre/atril-gtk3/PKGBUILD b/libre/atril-gtk3/PKGBUILD index 4f26f5e17..3b6c8ce8e 100644 --- a/libre/atril-gtk3/PKGBUILD +++ b/libre/atril-gtk3/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 136849 2015-07-14 12:49:40Z flexiondotorg $ +# $Id: PKGBUILD 139031 2015-08-31 19:47:25Z flexiondotorg $ # Maintainer (Arch): Martin Wimpress <code@flexion.org> # Maintainer: André Silva <emulatorman@parabola.nu> _ver=1.10 _pkgbase=atril pkgname=(${_pkgbase}-gtk3) -pkgver=${_ver}.1 +pkgver=${_ver}.2 pkgrel=1.parabola1 pkgdesc="MATE document viewer (GTK3 version [EXPERIMENTAL]), with libarchive support for compressed comic books" url="http://mate-desktop.org" @@ -23,7 +23,7 @@ optdepends=('caja-gtk3: Document Properties extension' groups=('mate-extra-gtk3') conflicts=("${_pkgbase}") source=("http://pub.mate-desktop.org/releases/${_ver}/${_pkgbase}-${pkgver}.tar.xz") -sha1sums=('5560b9d4f7c5ba07390cc0217453b0e9986542e4') +sha1sums=('ffbc018f534729d68fb1a5dbdc92de6c9ddbe0b1') install=${_pkgbase}.install build() { diff --git a/libre/atril/PKGBUILD b/libre/atril/PKGBUILD index d2719d723..3ca560990 100644 --- a/libre/atril/PKGBUILD +++ b/libre/atril/PKGBUILD @@ -4,7 +4,7 @@ _ver=1.10 _pkgbase=atril pkgname=(${_pkgbase}) -pkgver=${_ver}.1 +pkgver=${_ver}.2 pkgrel=1.parabola1 pkgdesc="MATE document viewer (GTK2 version), with libarchive support for compressed comic books" url="http://mate-desktop.org" @@ -23,7 +23,7 @@ groups=('mate-extra') conflicts=("${_pkgbase}-gtk3" "${_pkgbase}-libre") replaces=("${_pkgbase}-libre") source=("http://pub.mate-desktop.org/releases/${_ver}/${_pkgbase}-${pkgver}.tar.xz") -sha1sums=('5560b9d4f7c5ba07390cc0217453b0e9986542e4') +sha1sums=('ffbc018f534729d68fb1a5dbdc92de6c9ddbe0b1') install=${_pkgbase}.install build() { diff --git a/libre/bbswitch/PKGBUILD b/libre/bbswitch/PKGBUILD index f9cd1d900..071fe4f22 100644 --- a/libre/bbswitch/PKGBUILD +++ b/libre/bbswitch/PKGBUILD @@ -9,7 +9,7 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then _basekernel=4.1 - _archrel=35 + _archrel=36 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD index b8f493862..17a3142db 100644 --- a/libre/calibre/PKGBUILD +++ b/libre/calibre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 138067 2015-08-07 18:32:28Z jelle $ +# $Id: PKGBUILD 139022 2015-08-31 18:19:44Z jelle $ # Maintainer (Arch): Jelle van der Waa <jelle@vdwaa.nl> # Maintainer (Arch): Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org> @@ -8,12 +8,12 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=calibre -_pkgname=$pkgname-libre -pkgver=2.34.0 -pkgrel=1.parabola1 +_pkgname=calibre-libre +pkgver=2.36.0 +pkgrel=2.parabola1 pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives" arch=('i686' 'x86_64') -url="http://$pkgname-ebook.com/" +url="http://calibre-ebook.com/" license=('GPL3') depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 'python2-mechanize' 'podofo' 'libwmf' @@ -21,33 +21,35 @@ depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 'python2-pillow' 'shared-mime-info' 'python2-dnspython' 'python2-pyqt5' 'python2-psutil' 'icu=55.1' 'libmtp' 'python2-dbus' 'python2-netifaces' 'python2-cssselect' 'python2-apsw' 'qt5-webkit' - 'qt5-svg' 'python2-chardet' 'python2-html5lib' 'python2-pygments' 'mtdev') -makedepends=('python2-pycountry' 'qt5-x11extras') -optdepends=("ipython2: to use $pkgname-debug" + 'qt5-svg' 'python2-chardet' 'python2-html5lib' 'python2-pygments' 'mtdev' + 'desktop-file-utils' 'gtk-update-icon-cache') +makedepends=('qt5-x11extras' 'xdg-utils') +optdepends=('ipython2: to use calibre-debug' 'udisks: required for mounting certain devices' + 'poppler: required for converting pdf to html' ) replaces=($_pkgname) conflicts=($_pkgname) -install=$pkgname.install +install=calibre.install mksource=("http://download.$pkgname-ebook.com/${pkgver}/$pkgname-${pkgver}.tar.xz") source=("https://repo.parabola.nu/other/${_pkgname}/${_pkgname}-${pkgver}.tar.xz" 'libre.patch') -mkmd5sums=('588f060543f8c3142f94ebbc09416f0d') -md5sums=('644bebc5fd167e238ceda31800f97e01' +mkmd5sums=('f22f3666d6ab70faa52b01552b6f5965') +md5sums=('76f7a0b10a6f8c6f5d62ccd4db168638' '7e07f0c7cf71fdfd5950e5d648b07fd0') mksource(){ - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}" # Remove nonfree unRAR utility files from the source rm -rv src/unrar } prepare(){ - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}" # Remove nonfree rar/cbr support and references - rm -v src/$pkgname/{ebooks/metadata/rar.py,utils/unrar.{cpp,py}} + rm -v src/calibre/{ebooks/metadata/rar.py,utils/unrar.{cpp,py}} rm -v resources/images/mimetypes/{cbr,rar}.png rm -v imgsrc/mimetypes/rar.svg patch -Np1 -i "${srcdir}/libre.patch" @@ -58,52 +60,35 @@ prepare(){ src/html5lib \ src/chardet - sed -i "s/shlex.split(ldflags)/& + ['-fPIC']/" setup/extensions.py - - # Use python2 - sed -i 's:\(env[ ]\+python$\|/usr/bin/python$\):\12:g' $(find . -regex ".*\.py\|.*\.recipe") - # Desktop integration (e.g. enforce arch defaults) sed -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \ - -e "/\(cc('xdg-icon-resource\|self.icon_resources.append\|'128'))\)/d" \ - -e "/render_img/ s/\('calibre-.*\.png'\)/os.path.join(dir, \1)/g" \ - -e "/dir, 'calibre-lrf.png'/i \ -\ dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')\n\ -\ os.mkdir(dir)" \ - -e "/f = open/ s/\('calibre-.*\.desktop'\)/os.path.join(dir, \1)/g" \ - -e "/dir, 'calibre-lrfviewer.desktop'/i \ -\ dir = os.path.join(self.opts.staging_sharedir,'../applications')\n\ -\ os.mkdir(dir)" \ + -e "/cc(\['xdg-desktop-menu', 'forceupdate'\])/d" \ + -e "/cc(\['xdg-mime', 'install', MIME\])/d" \ -e "s/'ctc-posml'/'text' not in mt and 'pdf' not in mt and 'xhtml'/" \ -e "s/^Name=calibre/Name=Calibre/g" \ - -i src/$pkgname/linux.py + -i src/calibre/linux.py } build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}" LANG='en_US.UTF-8' python2 setup.py build - # LANG='en_US.UTF-8' python2 setup.py resources - - # Don't build translations since building them is broken badly - #LANG='en_US.UTF-8' python2 setup.py translations + LANG='en_US.UTF-8' python2 setup.py gui } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Fix the environment module location - sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py + cd "${pkgname}-${pkgver}" + + install -d "${pkgdir}/usr/share/zsh/site-functions" \ + "${pkgdir}"/usr/share/{applications,desktop-directories,icons/hicolor} - install -d "${pkgdir}/usr/lib/python2.7/site-packages" \ - "${pkgdir}/usr/share/zsh/site-functions" + install -Dm644 resources/calibre-mimetypes.xml \ + "${pkgdir}/usr/share/mime/packages/calibre-mimetypes.xml" - LANG='en_US.UTF-8' python2 setup.py install --root="${pkgdir}" --prefix=/usr \ - --staging-bindir="${pkgdir}/usr/bin" \ - --staging-libdir="${pkgdir}/usr/lib" \ - --staging-sharedir="${pkgdir}/usr/share" + XDG_DATA_DIRS="${pkgdir}/usr/share" LANG='en_US.UTF-8' \ + python2 setup.py install --staging-root="${pkgdir}/usr" --prefix=/usr # Compiling bytecode FS#33392 - python2 -m compileall "${pkgdir}/usr/lib/$pkgname/" - python2 -O -m compileall "${pkgdir}/usr/lib/$pkgname/" + python2 -m compileall "${pkgdir}/usr/lib/calibre/" + python2 -O -m compileall "${pkgdir}/usr/lib/calibre/" } diff --git a/libre/calibre/calibre.install b/libre/calibre/calibre.install index 6210bd0ab..34ab919aa 100644 --- a/libre/calibre/calibre.install +++ b/libre/calibre/calibre.install @@ -1,6 +1,7 @@ post_install() { update-desktop-database -q update-mime-database usr/share/mime &> /dev/null + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } post_upgrade() { diff --git a/libre/cups-filters/PKGBUILD b/libre/cups-filters/PKGBUILD index dd2169f94..1496d52b3 100644 --- a/libre/cups-filters/PKGBUILD +++ b/libre/cups-filters/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 241756 2015-07-03 17:22:16Z andyrtr $ +# $Id: PKGBUILD 244873 2015-08-26 16:21:44Z andyrtr $ # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org> pkgname=cups-filters -pkgver=1.0.71 +pkgver=1.0.74 pkgrel=1.parabola1 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation" -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" license=('GPL') depends=('lcms2' 'poppler=0.33.0' 'qpdf') -makedepends=('ghostscript' 'ttf-dejavu') # ttf-dejavu for make check +makedepends=('ghostscript' 'ttf-dejavu' 'python2') # ttf-dejavu for make check optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' 'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly') @@ -19,7 +19,7 @@ source=(http://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.x provides=('foomatic-filters') replaces=('foomatic-filters' "${pkgname}-libre" "${pkgname}-parabola") conflicts=('foomatic-filters' "${pkgname}-libre" "${pkgname}-parabola") -md5sums=('f1e11dfe5fa52eb65aa0bdd3a7ee0117') +md5sums=('14862048b4a9a87abfeeae07531dd020') build() { cd $pkgname-$pkgver diff --git a/libre/django17/PKGBUILD b/libre/django17/PKGBUILD index 8311f84bb..2639a7640 100644 --- a/libre/django17/PKGBUILD +++ b/libre/django17/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=django17 pkgname=('python-django17' 'python2-django17') -pkgver=1.7.7 +pkgver=1.7.9 pkgrel=1 pkgdesc="A high-level Python Web framework that encourages rapid development and clean design" arch=('any') @@ -12,8 +12,9 @@ license=('BSD') url="http://www.djangoproject.com/" makedepends=('python2' 'python2-setuptools' 'python' 'python-setuptools') source=("https://www.djangoproject.com/m/releases/${pkgver:0:3}/Django-$pkgver.tar.gz") -md5sums=('a62d6598966947d150525ad2ab20fb0c') -sha256sums=('4816f892063569ca9a77584fa23cb4995c1b3b954ef875102a8219229cbd2e33') +md5sums=('6ea69f3ebb73755bd2a4c9e3743f17c8') +sha1sums=('473599c2e2810a30bb86fd9c730ef52f23e5f709') +sha256sums=('4f3f9fe4e5d20ff8ed6a90b5d2f2df2d8fc054e478cdcc3db81c6b29bd217860') prepare() { cp -a "$srcdir/Django-$pkgver" "$srcdir/Django-$pkgver-python2" diff --git a/libre/icecat-l10n/Makefile b/libre/icecat-l10n/Makefile deleted file mode 100644 index d1aaf7bff..000000000 --- a/libre/icecat-l10n/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/make -f -# Use this script to update the PKGBUILD's list of langpacks. -# This script depends on: -# - coreutils -# - grep -# - pacman -# - sed -# - wget - -# Variables: -_pkgver=10.0 -pkgver=10.0 -pkgrel=1 - -# Guts: ############################################################## - -default: PHONY all -all: PHONY PKGBUILD - -index.html: Makefile - rm -f $@ - wget http://gnuzilla.gnu.org/download/langpacks/${pkgver}/ -langpacks.txt: index.html Makefile - egrep -o '[^>".]+\.xpi' $< | sort -u | sed 's/\.xpi//' > $@ -PKGBUILD: PKGBUILD.in langpacks.txt Makefile - sed \ - -e 's/@_PKGVER@/$(_pkgver)/' \ - -e 's/@PKGVER@/$(pkgver)/' \ - -e 's/@PKGREL@/$(pkgrel)/' \ - -e "s/@LANGPACKS@/(`xargs echo < langpacks.txt`)/" \ - -e '/md5sums/,$$d' \ - PKGBUILD.in > $@ - makepkg -dg >> $@ - -clean: PHONY - rm -f index.html langpacks.txt *.xpi - -.PHONY: PHONY FORCE diff --git a/libre/icecat-l10n/PKGBUILD b/libre/icecat-l10n/PKGBUILD index 8f9c3d2ef..bc15d0f2e 100644 --- a/libre/icecat-l10n/PKGBUILD +++ b/libre/icecat-l10n/PKGBUILD @@ -6,8 +6,8 @@ _pkgbase=icecat pkgbase=$_pkgbase-l10n -_pkgver=31.8.0 -pkgver=31.8.0_gnu1 +_pkgver=38.2.0 +pkgver=38.2.0_gnu1 pkgrel=1 pkgdesc="Language pack for GNU IceCat." arch=('any') @@ -22,17 +22,22 @@ _languages=( 'an "Aragonese"' 'ar "Arabic"' 'as "Assamese"' + 'ast "Asturian"' + 'az "Azerbaijani"' 'be "Belarusian"' 'bg "Bulgarian"' 'bn-BD "Bengali (Bangladesh)"' + 'bn-IN "Bengali (India)"' 'br "Breton"' 'bs "Bosnian"' + 'ca "Catalan"' 'cs "Czech"' - 'csb "Kashubian"' 'cy "Welsh"' 'da "Danish"' 'de "German"' + 'dsb "Lower Sorbian"' 'el "Greek"' + 'en-GB "English (British)"' # 'en-US "English (US)"' 'en-ZA "English (South African)"' 'eo "Esperanto"' @@ -43,57 +48,79 @@ _languages=( 'et "Estonian"' 'eu "Basque"' 'fa "Persian"' + 'ff "Fulah"' 'fi "Finnish"' 'fr "French"' 'fy-NL "Frisian"' + 'ga-IE "Irish"' 'gd "Gaelic (Scotland)"' 'gl "Galician"' 'gu-IN "Gujarati (India)"' 'he "Hebrew"' + 'hi-IN "Hindi (India)"' 'hr "Croatian"' + 'hsb "Upper Sorbian"' + 'hu "Hungarian"' 'hy-AM "Armenian"' 'id "Indonesian"' + 'is "Icelandic"' 'it "Italian"' + 'ja "Japanese"' 'kk "Kazakh"' 'km "Khmer"' 'kn "Kannada"' - 'ku "Kurdish"' + 'ko "Korean"' 'lij "Ligurian"' 'lt "Lithuanian"' 'lv "Latvian"' 'mai "Maithili"' + 'mk "Macedonian"' 'ml "Malayalam"' 'mr "Marathi"' 'ms "Malay"' 'nb-NO "Norwegian (Bokmål)"' 'nl "Dutch"' + 'nn-NO "Norwegian (Nynorsk)"' + 'or "Oriya"' 'pa-IN "Punjabi (India)"' 'pl "Polish"' 'pt-BR "Portuguese (Brazilian)"' + 'pt-PT "Portuguese (Portugal)"' 'rm "Romansh"' 'ro "Romanian"' 'ru "Russian"' 'si "Sinhala"' + 'sk "Slovak"' 'sl "Slovenian"' 'son "Songhai"' 'sq "Albanian"' + 'sr "Serbian"' + 'sv-SE "Swedish"' 'ta "Tamil"' 'te "Telugu"' + 'th "Thai"' + 'tr "Turkish"' 'uk "Ukrainian"' + 'uz "Uzbek"' + 'vi "Vietnamese"' + 'xh "Xhosa"' + 'zh-CN "Chinese (Simplified)"' 'zh-TW "Chinese (Traditional)"' - 'zu "Zulu"' ) pkgname=() -source=('region.properties') -_url=http://ftp.gnu.org/gnu/gnuzilla/$_pkgver/langpacks +#source=('region.properties') +#_url=http://ftp.gnu.org/gnu/gnuzilla/$_pkgver/langpacks +source=('brand.dtd' 'brand.properties' 'browserconfig.properties' 'region.properties') +_url=http://download.cdn.mozilla.net/pub/firefox/releases/${_pkgver}esr/linux-i686/xpi for _lang in "${_languages[@]}"; do _locale=${_lang%% *} _pkgname=$pkgbase-${_locale,,} pkgname+=($_pkgname) - source+=("$_url/$_pkgbase-$_pkgver.$_locale.langpack.xpi") +# source+=("$_url/$_pkgbase-$_pkgver.$_locale.langpack.xpi") + source+=("$_pkgbase-$_pkgver.$_locale.langpack.xpi::$_url/$_locale.xpi") eval "package_$_pkgname() { _package $_lang }" @@ -109,8 +136,19 @@ _package() { unzip icecat-$_pkgver.$1.langpack.xpi -d $1 rm -v icecat-$_pkgver.$1.langpack.xpi + install -vDm644 $srcdir/brand.dtd $1/browser/chrome/$1/locale/branding/ + install -vDm644 $srcdir/brand.properties $1/browser/chrome/$1/locale/branding/ + install -vDm644 $srcdir/browserconfig.properties $1/browser/chrome/$1/locale/branding/ + mv $1/browser/defaults/preferences/{firefox,icecat}-l10n.js + sed -i '\|firefox-l10n|d' $1/browser/defaults/preferences/icecat-l10n.js install -vDm644 $srcdir/region.properties $1/browser/chrome/$1/locale/browser-region + sed -i 's|Firefox|IceCat| + ' $1/browser/chrome/$1/locale/browser/devtools/sourceeditor.properties \ + $1/browser/chrome/$1/locale/browser/devtools/toolbox.dtd \ + $1/browser/chrome/$1/locale/browser/devtools/webide.dtd \ + $1/browser/chrome/$1/locale/browser/devtools/webide.properties rm -rv $1/{browser/{chrome/.mkdir.done,searchplugins},chrome/{.mkdir.done,$1/locale/$1/global-platform/{mac,win}}} + sed -i -e 's/firefox/icecat/' $1/install.rdf cd $1 zip -r langpack-$1@icecat.mozilla.org.xpi . mv -v langpack-$1@icecat.mozilla.org.xpi $srcdir @@ -119,81 +157,97 @@ _package() { install -vDm644 langpack-$1@icecat.mozilla.org.xpi \ "$pkgdir/usr/lib/icecat/browser/extensions/langpack-$1@icecat.mozilla.org.xpi" - - # Fix a few broken langpacks - # https://bugzilla.mozilla.org/show_bug.cgi?id=832060 - if in_array $1 bg csb; then - pushd "$pkgdir/usr/lib/icecat/browser/extensions" >/dev/null - unzip langpack-$1@icecat.mozilla.org.xpi install.rdf >/dev/null - sed -i '/./,$!d' install.rdf - zip -u langpack-$1@icecat.mozilla.org.xpi install.rdf >/dev/null - rm -v install.rdf - popd >/dev/null - fi } -sha256sums=('816fbc139595c924ed8ab719955d13364beda0eaf631ab679d7aa32462b4278b' - '75ad3b6f73afc0186046b042fdbea35962e0da5d621f308783b7cc4b6bab4797' - '3a142028e90b4d10ce2458753a3a1d22aaf540edc4dc3fec1fa8eb3daf8214c7' - '954346d995584eaed081f758ff310480662ea6baaa3a913867f2a2c3dcb82271' - 'fae24a79b1a76379e651f14825ebf40a91c19712a8d267f5bd474650162877de' - 'aeb33ce69aeeeb8b2d0058899bd074177bedbf765156c4d751185edad306b5a5' - '2b0401a81f61f1fd900536a38c30d9d7f2ee0a6709f58e9281e12e48b8bb20b3' - '6e926d054be858e15c313eb812dbe74c5a75aa3257ca693f255a0ee624bf6a01' - 'e29fe7286beeeadced4bb644b748c638ad32f3f791d223aebaf83d0ac2a4abe2' - '2e7d5ce6e316eaa82506e221e27ba2b785772233011ba1dcc25ff5b693bde9dd' - 'f44e2efa9e8314affd24e29f7f639368fe43e91458be0433dd1121b1dfbc27b1' - '72aea1b22dd86d09db2647a334c0619efb77774a17bed51f862b60a753ac2e65' - '125f09b878ae949ac1db0f6686fc534fc2e52f410aee8538b3497c751ba24ac3' - '52092eee647f47e2ccd7bdaf17fb0fdedce141e4419a45a09601e57a3bc1f4cf' - '027bfa25fbda15af04e5c2965b229ec42d4cb30e203108113aff3895cfcd2d60' - '214d9fbd76ce5e4bf247938761e52219ba6370ef23504467d35ee72ab27118d7' - '554386360ed78f128b8f9e5d781decdc22c43f0b2da2eca51a12017a9575e8c3' - '60f5d85b1b6036654b5e141c019e23073e49d95e117cd3e48a83c35a45e0bea5' - '6ec862fd24b66d0e1adb3afac2304f6fa3bb2d2ccf7ce98ed96908f7125cabd1' - '087d7c85e46825e459569d161646cce867e58accbbfe097cc3296084c29d7a69' - '60b86ff5c57c57aa941347278c7a52307241d50bac72f862f68a7b118b47d524' - '70d67287ac89a539af34e7e88e9fcae80b678e4a919d9dbc772d7711712de313' - 'c405258d7fe875ebf8c9486cc7144863d2bc42f382b91a900e9be0a500f7092d' - '0358cabd6c25674981e0f1f564bbe7491bd8b47834703b1afdc9e52be8bf7c44' - '6f6d83d62c7e9b5135b0dd85e33fb0657a638009281e9932c88f1780dc67a24b' - 'e9e781536b446ac6c801dfb00139d682be3f05f9c14280107fbbdffb4ccd942e' - '1d2fb1b81338ac6fc7a552ff809f587a8c5268c74b1c495e06e65be86045393d' - '8a564feec6669fe79d6cec92bb2f07b3e92ea0d718e58b5e40237e20c117057d' - '2aee274220f409b3210d42d955a9c00811a93513f2e1d9707d82f7a04472024c' - 'bb5d3e3381e0339141f0c0bf57cd18d7b59da905412cc44d730a546ff6388928' - 'bc8d1837532c4b5ca62d251113bffbb166cb3a6a8b9218bf168a9efe2234a760' - '31eb7b0305c50788a2a744d936d5644277d9dcb2c4bd7c4a25bbacf4165f73c3' - 'b0274ad9951e13908b811c09048b48e96f1a0486044b8b6bc7f344d41a9d1112' - 'a6307333f1918be9c1985a25a768d533c2d9417088729d967842141afb83d08b' - 'f4b5a3099f7d507ef70f0537450ba4f0d1f383c9c7a99675606b914387e22c93' - 'e310c7a68283a3160b705bac8c64f59257e3cf552d0755e1ebb2694d551912f8' - '404626f0cf706db523426ea65e7cc2e101d25c859ba31b4faf23a5d191817156' - '0b343af40d361ea6209a4399e6ead0b250126aec42bd3befad0e5dadf4d55ea9' - 'e88473d92936c4b4c86988af32ea8ac2f6132ab1e9335920a6cc11b03bf728c1' - '460fe08777455232e020b699f0da51511e9b62575082cd2ddcf5b934fcd99c2e' - 'bc5ddabeeaaa960f4e9a8a2ce0a33e656bf7a6e158c830e38e2c72260297c6b8' - 'ddd71a5a90525242eaec80ed426a4d2c7c1577cd7db2eb3edac07acb85b0a89c' - '7e9039fa356260ab2e2fbb5ae73f6503cb102f46ccd70c1922cca1ce495b0b94' - '45443c64b216b476d7fb9bd0a03aa4069718e93b093dd6cf0e3090b600704249' - '3da5559ec7f5ffaf7b9e8e1e62f234fc63916a6be35ca8d5efa7857332c2ab8f' - '97c1e100777099c38daae913d87c567554bac1494c588d478ec1fd03d37adde5' - 'd7fbd96680a31480a70fc1fcfb7f84836dad45fa57ede24d2ad93df2e26e9bad' - 'a9fc5ed350a417c38ecda39623502f2901a095377c3f8995a28dfe55ce21ab52' - 'fdf75ce2838af444dc737508e5262fd8575579d5d73b0467408d1e0dfebdbf41' - 'e2f03f67cde25c89d25ca5fa5c565a91f5ebbbe912642adc4edb955b1acc7849' - '1d5797102d9610ec4faf05d6cfb7f05106286f172a44436cdbfcc4c4c7d90759' - '3a7caa3a58af708135c996603fa35a46b3f7d12a397bdda971963b8ee37f14af' - '1319e8db747e517af71c63f7e80b4ee55137c362f38477c30fb9bb3734a1e2c1' - 'aa990edb911c633f09a73e797cff60d2a5bd3b227292cd6acb6b36f80e67721d' - '868a8497cfe0e4a1bee49a9cc02a2854b4f79c956d2aebf08265bd929a479045' - 'e34ea94c89892b41493d3806cf9e689aa302dde4d0a8041041a14fd8137c0904' - 'a152e417463079522db77332b3e54cede90cb737955e1ce3d507e2e6e36f0e6e' - '6b13d79a8b3e1b6b875359aa968bded50c2f6fb68eb6dbfb895900f8071ea732' - '0b8f105e853159e035dfd5eadceb822bdc33db403b57ea1bdc20f9705bf904ca' - 'b417b141277402d55f32bc48b27911d08a381b7c68381dcd9de3ab3e80a10369' - 'a5b0fd320a65b7c58080d92e184c8ce33e3e706001f68045d09ff6051fd51f7f' - '695700e5485182d1dc56287245bf9815dafab8e8024b1c3147319ee8c42530a9' - 'dedc2d4bd1ac97bbd4070024c1a4a061e914fae755fac8069881669cc46095e9' - 'ac7ed07c661e21ddc39095da7b74bab6254031020bc42c30cd1dbca24242139d' - '767fc108f5d963e80bdc551773d54384c6ea02ecda6956fca97f23b65cc2af46') +sha256sums=('c57f9d372f056d79b074976a70d3f8b99ec9379eedd9b7a4ec33608b002b9af9' + 'ce4530dc72a4c01db088b46e7018a29a87fb8b719e6a640c4c97ee0793d8190a' + '9f9a8b54932b3138d15fb050a6b04e574fc018d6acb2b7f23b1a9425513d416f' + 'fc301f3ce1f7d7cd995c7920af18f638e7dd40ade90318567c2bdb922d9cd11a' + '80f2d65db6ba7c1079e36d4540c5364dadf50ee5cc00cdd1f4fe505915b12ef9' + '4d822352bd0dbaa73dd547602e20ccdccb62b3ef9bdeccc03f172511e18b41ed' + 'c58525c2b8bca44c5242e15a3597d3c5af89cbd227a2f37dec0cc64b777eaa2c' + '5e5e573f9cf9bb050ac9e94311887b83684c9933c8ba36021010b093b69c667b' + '690987405cf31ba44a2bc52a040f79e07bdca5e1a68bccb65a94f608dd32a168' + '81ad42dce9d9525aa2d4339e928d5675d4f069b46deffed0c1afa7c29f7b4586' + 'bb1b9b3e7ee14cf447780807ecda9789d696e83a6ceaa83a3f455025462976b0' + 'f025e13585be2126f1f805f431a2aab6f92064970a5d3ecf8e458fb35fcf1b04' + 'd566656889a8922a88bab1a06fcf6e49f1131cc7ebc53aa19ea9b177314a7003' + '1d8a734901cfc8f4a3372ae7586e6615a044757faaa43d0102d687465a7d8646' + '7a6e05c0eab890318718b014402168f30e2593a63cbd639b1dec9bbf88e74b30' + 'e5bc879e345784c9b4d9228a3e8900b4ffa4e643f01546db80cb4d9e11049a34' + '0bf5d0e162a33a5ef6ac3059a5b713d88fff367f7384ad56a594ec07aafce358' + 'd2aaebad9dd838e9cb6aa4d5fcc45cfb2105cd655671455fd5a360ca43302842' + 'd3f1fe4b368d1f30cf93f6dba98af57491f2f23df1754edfc896aa7aef7bab8d' + '7ab25f18ca0e267fcbc30503f47162319a5c1c08e1bc03518bab04c2c8fe59c2' + '23147921fc13063f39818bc2d563d4b07b0a5ab466000d9405fd9b9249e67663' + '6d4cdaa88f41cc5feaae869db51684d85b1b1d6026ba9309c0572261828f8c1b' + 'ff71942cac9c2548caa8f12df7005b5b9f91264f5b7da7360a99a088c4528440' + '24226e706875c0f1c1b18c4f2f55fb83e5963c3e22061a2af436d92e8b66ae29' + '2824d85c15ff1a0ee6bd69228dec418481c9a7c4565beb5b45d0428e0b6f127b' + '7b103f2e7472388b6fea50c602a5950404e9d297a8ede752e04e93fecce4cc1a' + '7c41dc63256b9ae615206cecd5bf008879443791b03269e1d4dfcbb0b6e73fb9' + 'fede8e15d08da232349fd180b17d208d556de12fcb37a98a59362773e67ceca1' + '5957a2f6db01d593b6d82149f1ecd6b129e5322f74a254ac46d07503719e61c9' + '2da47c5401a9e60c84859bd28635cac8bd03d07cfc0d25ffd2fed66819d060bb' + '0d396f5f5ea77920d7273fe4dd3662b08997657c321fb7ae62c9406abd9135e1' + 'fac02f932ee8c93c660daf2b36ca6a8246724dfa5ac040809e6d88eb219b7a03' + '492ac55eceaff28188516c154e738d4189615135e4434cde7d4108c6c92200a2' + '125f97265b11efa49886c6ca9611b6cdedfbaf40ac59fa7ba2f5d86308dbe4e9' + '36e58433af2939b69d461a4d21f8576c2773ab926f95e9742fcfa28c4b8155a9' + 'e56a3252d800bdc5ad2c18badf8a1a6743e7aa4fd29f459a339ef05a26614272' + '959138dcce85fd35da81fc9a1ddc28bfb06435f9a71fa1f2a2cf0b44978cdf70' + '3f86674161098d9446ea0736969c0d030eca100688880921daa8e615a9410e38' + 'bfb2eeb0c787ff5ca2afec939f4da875eb854bc5baafcd61021b2d0a4db4456b' + '8acb2f0a4416f8ef182abcf6450e9169852524c0fbf37dbf15cb5156273eec8c' + '53ecc5c4d83346d327cfea3ed8554b468f9ecb17daba0ee655268a3d1a23d276' + '33799f5f28c4b6fd80f5ecb5b4ac1ff9ebe34461e50c59151d029053f1f73d53' + '98f05fde9c1341b7d32e196660884fa24c266575374aa8fb26859f5fa75b7b46' + '3a9480cd2345f00507ae719c33185acf5e9f66a9c996607dfac0ec95d0d32d89' + '125abeb8f4a881fd68bb8f8bd31d7b89c98d35f3d04e18ade625a74e45723466' + 'a88449a67fdb85b21e031b894fc060e328c42a3ac1a39d13fff8446cc4df00d1' + 'd37fc8e422a2421829665a13c7b39bc18af76afc22639395fe346a3540a360e1' + 'ebdf5d14d7b97eddafe6fedc3b7b58b4823e2ba7e9f019facc65c469a1c0538b' + '861b0ee5cd7130606f8db16d16855a932f62d18ea279aeb425d13043b88afecf' + '17f205a9d775e3a97ea3d7b63ee931f4cf5bb24089978fc979dc4d1b5d057311' + '1da955c3cb53ee2fdbf03454840f2588ec3731b88d5ea31e450c4473eb7c0c8b' + '1b51688caa1e55b2117fe510d31485a3219c3f4446e3475c87699abd460e84b0' + '9a445773926e5abf3df7ed1e4ace90e52c17ffcfc65e76bc81b14ce3f9a47910' + 'fbff5ab8dae477e73725de8f1ee346287aede8c00b6891dbb11d4500b7e6620e' + 'd8756e4efe30cf21178d51ea7186d0bac4980a10fbfb29534d0e3988859d2997' + '19f3413cf7c9e0deaa025d254c8e787f2e2d3dbe0c800841d69f87dd02249b30' + '769ad5652416a94c038f1df689532c35cf00804e7971f7d0bfa7157ebc24e95d' + '692e7fb76eba7b2926300e2ae12dd1215c4010722cd95ece2893556ce1729ff5' + '0e7a1903ee292b3bacf00a876bce9618a869a708820bb04cc4487536b7a09590' + 'c51b1627c24c48721cf799e9438d097d2b815e576042813a15d7631285385499' + 'e4be6327448665795bc83a5de98826bfbc78118d188e7687546b5b5d170a1e3a' + '6aa7b005affd7cdc10d9c42454e841d94ecc94bec273755ef9754e033a3e62be' + '73bb6c2101dfa7876814c68b3b02467608c72e0e8bc3517aa0fec61673069bba' + 'f4f68fd8871ab409f9d3d0540873167e693314278a16508450a359d9cafdfdc3' + '8056a9169fd52a12f8f806f1e2870a2578591df8a2c711786bee7ce84436dbfa' + '5dd497dbddcc664facae77de25b8b3f4e3c87a1747bc44595dd91b716ba82748' + 'a7371d8b484cb686965b3769f0bedf6c8803bbbc05021c8b3e24d99dfe66348d' + '79db2dab58df83d308c614469a7050d3228898fcb2edfbdb9eaf66d37d541719' + 'cbfc04c1b6dd2de9f87bca693b4de8275ab4860cc538c0d7a60fecb58b88c6dd' + 'f7f312ed6907c15004e75cfb95a0e254087932cf8203b1d0419dc1eea055a9c7' + 'd13fcef16af096732c430b699a53b1d0d76eb3829bff5166d876ffcc94e123e7' + '9cd4c26a521f2e0550ea62ddc27ca751a2b3f2fdc6d55af861936abcdd6c1efd' + 'cf88953513fc4b20a5318b3d4e8f771edc7dc3ef3b3b09a8858ad1b9261c0866' + 'd5151574b477c6964461ae75563397ebc8f11dfb9331e2ffeb046a4bd046ea97' + '0289531702f0e2ad68984a9dd939e67dafed98eed7c1a6552d136d759ed74684' + '314d1635548bbfd7f41927cf327c781d03d99b8ed1a2c8775a34ba6cd3b12a85' + 'd40e11bda881fa9703e51065bab7204bc5dad8d4affedd4638cfe96f907ddf07' + '8ba7277af23a615970cc1384d3b54e8d88a3305da9fe03790819e7b1aeb41a15' + '3709b10419d813e3255ef9022e276344ca90788c33858aec111c541b455bb79a' + 'fdc0e581d870726728aad45980c6f10d4141a0b9fa39424e51335c8751063e30' + '6007a48742b675c34bd8a331c201f79a19cb52fe7dd7907cd73e76ff9d0c090c' + '21158bf5a1286bc55dda4e34ef00fecf5490c55da61dfbb8de8a8f15f6c3fb95' + 'ec13ec46f071219815b200ab46f103ebdca82308187562d57ae9ae01a9c234e8' + 'b1ffd8fa3534f51d3ec9294288223898d8c41285c4fa400e096fc7ec1aff8b0b' + '0e15637fcefb0e16c4722c242466d2f67b18eb0fbe79097cc29e5358cf7aa19d' + 'fae94efd727ddd145146d2df759e02e060e8302c666ea6cb2d09558bdff76abe' + 'd9871bbdffe5f9cf5275894c05a7934a21af421c3343844fb5efa78efa06aaa8' + '3c5ff9e17debf3c7d865474262aad09c5e7d98106ecb6395d656caee27c39b61' + '9e7dc043c3aa7890255241bdd0292a01d957fcb77434ed236df07401e3f7a9b2' + 'd41ee639470dce1ff3a103987c16ad5dc32c3b1f468760855d9c840dfbc0a39d' + '6b58c8a6fd5e62933d8ec42758a6fc7dd4794b7f659855331debc876e8b80bec' + 'bb22672b52104fd11c28d5609d2c039dd0b3636445b091523dfb90538cf84e94') diff --git a/libre/icecat-l10n/brand.dtd b/libre/icecat-l10n/brand.dtd new file mode 100644 index 000000000..ff4f95957 --- /dev/null +++ b/libre/icecat-l10n/brand.dtd @@ -0,0 +1,9 @@ +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + +<!ENTITY brandShorterName "IceCat"> +<!ENTITY brandShortName "IceCat"> +<!ENTITY brandFullName "GNU IceCat"> +<!ENTITY vendorShortName "GNU"> +<!ENTITY trademarkInfo.part1 ""> diff --git a/libre/icecat-l10n/brand.properties b/libre/icecat-l10n/brand.properties new file mode 100644 index 000000000..73ef20839 --- /dev/null +++ b/libre/icecat-l10n/brand.properties @@ -0,0 +1,16 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +brandShorterName=IceCat +brandShortName=IceCat +brandFullName=Mozilla IceCat +vendorShortName=Mozilla + +homePageSingleStartMain=IceCat Start, a fast home page with built-in search +homePageImport=Import your home page from %S + +homePageMigrationPageTitle=Home Page Selection +homePageMigrationDescription=Please select the home page you wish to use: + +syncBrandShortName=Sync diff --git a/libre/icecat-l10n/browserconfig.properties b/libre/icecat-l10n/browserconfig.properties new file mode 100644 index 000000000..72ab4bed3 --- /dev/null +++ b/libre/icecat-l10n/browserconfig.properties @@ -0,0 +1,6 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +# Do NOT localize or otherwise change these values +browser.startup.homepage=about:icecat diff --git a/libre/icecat-l10n/region.properties b/libre/icecat-l10n/region.properties index 64a540fac..3333c1b71 100644 --- a/libre/icecat-l10n/region.properties +++ b/libre/icecat-l10n/region.properties @@ -3,12 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Default search engine -browser.search.defaultenginename=DuckDuckGo HTML +browser.search.defaultenginename=searx # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=DuckDuckGo HTML -browser.search.order.2=DuckDuckGo Lite -browser.search.order.3=searx +browser.search.order.1=searx +browser.search.order.2=DuckDuckGo HTML +browser.search.order.3=DuckDuckGo Lite # increment this number when anything gets changed in the list below. This will # cause IceCat to re-read these prefs and inject any new handlers into the diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD index 28740b81d..da8b17ff9 100644 --- a/libre/icecat-noscript/PKGBUILD +++ b/libre/icecat-noscript/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137608 2015-07-30 10:33:50Z spupykin $ +# $Id: PKGBUILD 138725 2015-08-24 13:10:01Z spupykin $ # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=icecat-noscript -pkgver=2.6.9.33 +pkgver=2.6.9.36 pkgrel=1 pkgdesc="Extension for icecat which disables script" arch=('any') @@ -12,7 +12,7 @@ license=('GPL2') depends=() makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('1ff903dddb39aafe62dc3b7194a2a39d') +md5sums=('fc131963fd1339ee173d74a95939de5a') package() { depends=("icecat") diff --git a/libre/icecat-theme-adwaita/PKGBUILD b/libre/icecat-theme-adwaita/PKGBUILD index d349ac4d6..c8b749cc4 100644 --- a/libre/icecat-theme-adwaita/PKGBUILD +++ b/libre/icecat-theme-adwaita/PKGBUILD @@ -5,7 +5,7 @@ # Contributor: André Silva <emulatorman@parabola.nu> pkgname=icecat-theme-adwaita -pkgver=31.1 +pkgver=38.1 pkgrel=1 pkgdesc="Adwaita theme for IceCat (Matches the default Gnome Shell theme)" url="https://addons.mozilla.org/en-US/firefox/addon/adwaita/" @@ -13,12 +13,16 @@ arch=('any') license=('MPL') depends=("icecat") makedepends=('unzip') -source=("gnome-firefox-theme-${pkgver}.xpi"::"https://github.com/gnome-integration-team/firefox-gnome/releases/download/${pkgver}/gnome-firefox-theme-${pkgver}.xpi") -sha256sums=('6fb71b316db500574a837a511b05219273363c5b8ed05b20fc9e031eff3299db') +source=("gnome-firefox-theme-${pkgver}.xpi"::"https://github.com/gnome-integration-team/firefox-gnome/releases/download/${pkgver}/gnome-firefox-theme.xpi") +sha256sums=('af050237a8cddee0f9123f81a9df58b0b97e94f84059cc67225183cb3243a70e') noextract=("gnome-firefox-theme-${pkgver}.xpi") prepare() { unzip -qo "gnome-firefox-theme-${pkgver}.xpi" -d "${pkgname}-${pkgver}" + # Fix for wrong version number + # https://github.com/gnome-integration-team/firefox-gnome/issues/337 + cd "${pkgname}-${pkgver}" + sed -i "s_\(<em:version>\)35.1\(</em:version>\)_\1${pkgver}\2_" "install.rdf" } package() { diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 05e6cc5c3..462ccb6b7 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -13,12 +13,12 @@ _pgo=true pkgname=icecat -_pkgver=31.8.0-gnu1 +_pkgver=38.2.0-gnu1 pkgver=${_pkgver//-/_} -pkgrel=4 +pkgrel=1 pkgdesc="GNU IceCat, the standalone web browser based on Mozilla Firefox." -arch=(i686 x86_64 mips64el) +arch=(i686 x86_64) license=(MPL GPL LGPL) depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hicolor-icon-theme hunspell icu=55.1 libevent libvpx=1.4.0 libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification) makedepends=(diffutils gst-plugins-base-libs imake inetutils libpulse mesa python2 unzip yasm zip) @@ -32,32 +32,28 @@ optdepends=('networkmanager: Location detection via available WiFi networks' 'gst-libav: h.264 video') url="http://www.gnu.org/software/gnuzilla/" install=$pkgname.install -source=(http://ftp.gnu.org/gnu/gnuzilla/${_pkgver%-*}/$pkgname-$_pkgver.tar.bz2{,.sig} +#source=(http://ftp.gnu.org/gnu/gnuzilla/${_pkgver%-*}/$pkgname-$_pkgver.tar.bz2{,.sig} +source=(http://jenkins.trisquel.info/$pkgname/$pkgname-$_pkgver.tar.bz2 mozconfig - mozconfig.pgo libre.patch gnu_headshadow.png $pkgname.desktop $pkgname-install-dir.patch freetype26.patch vendor.js - rhbz-966424.patch $pkgname-fixed-loading-icon.png - fixing_nullptr_31.7.0.patch) -sha256sums=('370087d0adadf8b1c1e6a9920e26488a8902b9dc461d305f258fddb26a129d87' - 'SKIP' - 'c36d18a8ffc99ea4dab8e8564d92bc5c9b1bb2c7680323f48483695522cefd1d' - '92d7ea9feb8d2814d1abaf5cf4012983a2fb9cc56b26a5d7c7c3898aedf06fb4' - '8082a8a5adf21c50fa77650c74adcd6fedbf7bedcdb6b8ae29529ca96adeb05d' + remove-google-play-services-support.patch) +sha256sums=('eef4addf37f6fc885f28eea936cee7258d42f0cb11d79703ec7ec1fe2b80ef8d' + '33a8cf07373c63a0bea70ec2c3983d2cca990752c0f946cb5dbd91f1e2b6410f' + 'e333901df4fc8a881d08c9434e3c302885ed4a989316114e13af828417510410' '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' '52df9ffeb52166ed4abd9a132ee4a9017b9c4980f0725ba383610ccfb06d4745' '5bdab2de5520fb4d3dbc453d9f73d20e0e077bf652bc780fc17184ba6c718a47' 'b9c440406644fde5097da8717f0b5e5e973d11ec4dd6d4a0570ca7094d96dc85' '977aa49b940f1da049cefa2878a63ac6669a78e63e9d55bb11db7b8f8fb64c33' - 'd25c6e95d20ec622a51346897d986fdd97074023d6a02bee0533773a195f8233' '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213' - 'd57d0e4d5bc66323388e8f3c9999ed443abfd304a28a1696cc6f4518ed0d0f2a') -validpgpkeys=('A57369A8BABC2542B5A0368C3C76EED7D7E04784') # Ruben Rodriguez + '9e651b0f7e7d9d663e8b24077d52bad15f011871747743aff60d6e2d7a45ae5b') +#validpgpkeys=('A57369A8BABC2542B5A0368C3C76EED7D7E04784') # Ruben Rodriguez prepare() { export GNU_BUILD="gnuzilla-release" @@ -75,22 +71,9 @@ prepare() { # https://bugzilla.mozilla.org/show_bug.cgi?id=1143411 patch -Np1 -i "$srcdir/freetype26.patch" - # https://bugs.archlinux.org/task/41689 - patch -Np1 -i "$srcdir/rhbz-966424.patch" - - # Patch for GCC 5.1 - patch -Np1 -i "$srcdir/fixing_nullptr_31.7.0.patch" - # Patch and remove anything that's left patch -Np1 -i "$srcdir/libre.patch" - sed -i '\|return| s|Flash|SWF Player|g; - ' browser/base/content/pageinfo/permissions.js \ - browser/base/content/browser-plugins.js - sed -i '\|["]displayName["][:] ["]Flash["]| s|Flash|SWF Player| - \|["]displayName["][:] ["]Shockwave["]| s|Shockwave|DCR Player| - \|["]displayName["][:] ["]QuickTime["]| s|QuickTime|MOV Player| - \|installLinux| s|true|false| - ' browser/base/content/browser-plugins.js + patch -Np1 -i "$srcdir/remove-google-play-services-support.patch" rm -v browser/base/content/abouthome/snippet*.png || true sed -i '\|abouthome/snippet|d ' browser/base/jar.mn @@ -111,44 +94,6 @@ prepare() { # Load our build config, disable SafeSearch cp "$srcdir/mozconfig" .mozconfig - if $_pgo; then - cat "$srcdir/mozconfig.pgo" >> .mozconfig - fi - - # From js on abslibre-mips64el.git - if [ "$CARCH" = "mips64el" ]; then - msg "Force disabling JIT." - sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \ - js/src/assembler/wtf/Platform.h - sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.{in,ref} - - echo "ac_add_options --disable-methodjit" >> .mozconfig - echo "ac_add_options --disable-tracejit" >> .mozconfig - fi - - # This is a bug, we should fix it - if [ "$CARCH" = "mips64el" ]; then - # Fix MIPS N32 support. - sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \ - js/src/assembler/wtf/Platform.h - # Disable JIT. - sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \ - js/src/assembler/wtf/Platform.h - sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.in - echo 'ac_add_options --disable-methodjit' >> .mozconfig - echo 'ac_add_options --disable-tracejit' >> .mozconfig - echo 'ac_add_options --disable-jemalloc' >> .mozconfig - fi - - # Fixing for libvpx >= 1.4.0 - sed -i 's|IMG_FMT_I420|VPX_IMG_FMT_I420|; - s|PLANE_U|VPX_PLANE_U|; - s|PLANE_V|VPX_PLANE_V|; - s|PLANE_Y|VPX_PLANE_Y|; - s|VPX_VPX_PLANE_|VPX_PLANE_|; - ' content/media/encoder/VP8TrackEncoder.cpp \ - media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc - mkdir "$srcdir/path" # WebRTC build tries to execute "python" and expects Python 2 @@ -158,15 +103,10 @@ prepare() { # https://bugs.archlinux.org/task/34644 sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure - # Fix tab loading icon (flickers with libpng 1.6) + # Fix tab loading icon (doesn't work with libpng 1.6) # https://bugzilla.mozilla.org/show_bug.cgi?id=841734 - # TODO: Remove this; IceCat 36 might use CSS animations for the loading icon - # https://bugzilla.mozilla.org/show_bug.cgi?id=759252 cp "$srcdir/$pkgname-fixed-loading-icon.png" \ browser/themes/linux/tabbrowser/loading.png - - # Remove non-existent file on Makefile.in - sed -i '\|build/pgo/blueprint/valid.png|d' build/Makefile.in } build() { @@ -175,7 +115,6 @@ build() { cd "$srcdir/$GNU_BUILD" export PATH="$srcdir/path:$PATH" - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname" export PYTHON="/usr/bin/python2" if $_pgo; then diff --git a/libre/icecat/fixing_nullptr_31.7.0.patch b/libre/icecat/fixing_nullptr_31.7.0.patch deleted file mode 100644 index ecfca4138..000000000 --- a/libre/icecat/fixing_nullptr_31.7.0.patch +++ /dev/null @@ -1,174 +0,0 @@ ---- a/js/src/builtin/TypedObject.cpp 2015-06-03 22:48:47.000000000 +0200 -+++ b/js/src/builtin/TypedObject.cpp 2015-06-08 16:45:30.918154529 +0200 -@@ -710,12 +710,12 @@ - contents.append(")"); - RootedAtom stringRepr(cx, contents.finishAtom()); - if (!stringRepr) -- return nullptr; -+ return false; - - // Extract ArrayType.prototype - RootedObject arrayTypePrototype(cx, GetPrototype(cx, arrayTypeGlobal)); - if (!arrayTypePrototype) -- return nullptr; -+ return false; - - // Create the instance of ArrayType - Rooted<UnsizedArrayTypeDescr*> obj(cx); -@@ -728,7 +728,7 @@ - if (!JSObject::defineProperty(cx, obj, cx->names().length, - UndefinedHandleValue, nullptr, nullptr, - JSPROP_READONLY | JSPROP_PERMANENT)) -- return nullptr; -+ return false; - - args.rval().setObject(*obj); - return true; -@@ -762,7 +762,7 @@ - if (!size.isValid()) { - JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, - JSMSG_TYPEDOBJECT_TOO_BIG); -- return nullptr; -+ return false; - } - - // Construct a canonical string `new ArrayType(<elementType>).dimension(N)`: -@@ -775,7 +775,7 @@ - contents.append(")"); - RootedAtom stringRepr(cx, contents.finishAtom()); - if (!stringRepr) -- return nullptr; -+ return false; - - // Create the sized type object. - Rooted<SizedArrayTypeDescr*> obj(cx); -@@ -793,7 +793,7 @@ - if (!JSObject::defineProperty(cx, obj, cx->names().length, - lengthVal, nullptr, nullptr, - JSPROP_READONLY | JSPROP_PERMANENT)) -- return nullptr; -+ return false; - - // Add `unsized` property, which is a link from the sized - // array to the unsized array. -@@ -801,7 +801,7 @@ - if (!JSObject::defineProperty(cx, obj, cx->names().unsized, - unsizedTypeDescrValue, nullptr, nullptr, - JSPROP_READONLY | JSPROP_PERMANENT)) -- return nullptr; -+ return false; - - args.rval().setObject(*obj); - return true; -@@ -1253,7 +1253,7 @@ - Rooted<TypedProto*> proto(cx); - proto = NewObjectWithProto<TypedProto>(cx, objProto, nullptr, TenuredObject); - if (!proto) -- return nullptr; -+ return false; - proto->initTypeDescrSlot(*descr); - descr->initReservedSlot(JS_DESCR_SLOT_TYPROTO, ObjectValue(*proto)); - -@@ -1358,14 +1358,14 @@ - #define BINARYDATA_SCALAR_DEFINE(constant_, type_, name_) \ - if (!DefineSimpleTypeDescr<ScalarTypeDescr>(cx, global, module, constant_, \ - cx->names().name_)) \ -- return nullptr; -+ return false; - JS_FOR_EACH_SCALAR_TYPE_REPR(BINARYDATA_SCALAR_DEFINE) - #undef BINARYDATA_SCALAR_DEFINE - - #define BINARYDATA_REFERENCE_DEFINE(constant_, type_, name_) \ - if (!DefineSimpleTypeDescr<ReferenceTypeDescr>(cx, global, module, constant_, \ - cx->names().name_)) \ -- return nullptr; -+ return false; - JS_FOR_EACH_REFERENCE_TYPE_REPR(BINARYDATA_REFERENCE_DEFINE) - #undef BINARYDATA_REFERENCE_DEFINE - -@@ -1375,14 +1375,14 @@ - arrayType = DefineMetaTypeDescr<ArrayMetaTypeDescr>( - cx, global, module, TypedObjectModuleObject::ArrayTypePrototype); - if (!arrayType) -- return nullptr; -+ return false; - - RootedValue arrayTypeValue(cx, ObjectValue(*arrayType)); - if (!JSObject::defineProperty(cx, module, cx->names().ArrayType, - arrayTypeValue, - nullptr, nullptr, - JSPROP_READONLY | JSPROP_PERMANENT)) -- return nullptr; -+ return false; - - // StructType. - -@@ -1390,14 +1390,14 @@ - structType = DefineMetaTypeDescr<StructMetaTypeDescr>( - cx, global, module, TypedObjectModuleObject::StructTypePrototype); - if (!structType) -- return nullptr; -+ return false; - - RootedValue structTypeValue(cx, ObjectValue(*structType)); - if (!JSObject::defineProperty(cx, module, cx->names().StructType, - structTypeValue, - nullptr, nullptr, - JSPROP_READONLY | JSPROP_PERMANENT)) -- return nullptr; -+ return false; - - // Everything is setup, install module on the global object: - RootedValue moduleValue(cx, ObjectValue(*module)); -@@ -1407,7 +1407,7 @@ - nullptr, nullptr, - 0)) - { -- return nullptr; -+ return false; - } - - return module; -@@ -2466,7 +2466,7 @@ - if (length < 0) { - JS_ReportErrorNumber(cx, js_GetErrorMessage, - nullptr, JSMSG_TYPEDOBJECT_BAD_ARGS); -- return nullptr; -+ return false; - } - Rooted<TypedObject*> obj(cx, createZeroed(cx, callee, length)); - if (!obj) - ---- a/js/src/frontend/BytecodeCompiler.cpp 2015-06-03 22:48:48.000000000 +0200 -+++ b/js/src/frontend/BytecodeCompiler.cpp 2015-06-08 01:15:08.080302638 +0200 -@@ -544,7 +544,7 @@ - - RootedScriptSource sourceObject(cx, CreateScriptSourceObject(cx, options)); - if (!sourceObject) -- return nullptr; -+ return false; - ScriptSource* ss = sourceObject->source(); - - SourceCompressionTask sct(cx); ---- a/js/xpconnect/wrappers/XrayWrapper.cpp 2015-06-03 22:48:45.000000000 +0200 -+++ b/js/xpconnect/wrappers/XrayWrapper.cpp 2015-06-08 01:15:35.672193557 +0200 -@@ -351,7 +351,7 @@ - { - JSAutoCompartment ac(cx, target); - if (!JS_GetClassPrototype(cx, key, protop)) -- return nullptr; -+ return false; - } - return JS_WrapObject(cx, protop); - } ---- a/netwerk/ipc/NeckoParent.cpp 2015-06-03 22:46:41.000000000 +0200 -+++ b/netwerk/ipc/NeckoParent.cpp 2015-06-08 01:16:10.200055747 +0200 -@@ -359,7 +359,7 @@ - RtspChannelParent* p = static_cast<RtspChannelParent*>(aActor); - return p->Init(aConnectArgs); - #else -- return nullptr; -+ return false; - #endif - } - diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch index 16f77f72e..ee88c6d56 100644 --- a/libre/icecat/libre.patch +++ b/libre/icecat/libre.patch @@ -1,21 +1,34 @@ diff -Nur a/browser/app/profile/icecat.js b/browser/app/profile/icecat.js ---- a/browser/app/profile/icecat.js 2014-10-09 12:56:31.000000000 -0200 -+++ b/browser/app/profile/icecat.js 2014-10-21 14:05:40.131766712 -0200 -@@ -281,11 +281,6 @@ - pref("browser.slowStartup.timeThreshold", 50000); +--- a/browser/app/profile/icecat.js 2015-08-23 17:05:03.000000000 -0300 ++++ b/browser/app/profile/icecat.js 2015-08-25 04:49:18.450526750 -0300 +@@ -279,11 +279,6 @@ + pref("browser.slowStartup.timeThreshold", 40000); pref("browser.slowStartup.maxSamples", 5); -// This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into -// this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream -// repackager of this code using an alternate snippet url, please keep your users safe --pref("browser.aboutHomeSnippets.updateUrl", "https://snippets.mozilla.com/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/"); +-pref("browser.aboutHomeSnippets.updateUrl", "https://snippets.cdn.mozilla.net/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/"); - pref("browser.enable_automatic_image_resizing", true); + pref("browser.casting.enabled", false); pref("browser.chrome.site_icons", true); - pref("browser.chrome.favicons", true); +@@ -2080,12 +2075,6 @@ + pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%"); + pref("pfs.filehint.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%"); + +-// I'm feeling Ducky. +-pref("keyword.URL", "https://duckduckgo.com/html?t=gnu&q=!+"); +-pref("browser.search.defaultenginename", "DuckDuckGo"); +-pref("browser.search.order.extra.duckduckgo", "DuckDuckGo"); +-pref("browser.search.showOneOffButtons", false); +- + // https://directory.fsf.org/wiki/Disable_DHE + pref("security.ssl3.dhe_rsa_aes_128_sha", false); + pref("security.ssl3.dhe_rsa_aes_256_sha", false); diff -Nur a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css ---- a/browser/base/content/abouthome/aboutHome.css 2014-10-09 12:53:31.000000000 -0200 -+++ b/browser/base/content/abouthome/aboutHome.css 2014-10-21 14:11:09.936570764 -0200 +--- a/browser/base/content/abouthome/aboutHome.css 2015-07-13 19:10:24.000000000 -0300 ++++ b/browser/base/content/abouthome/aboutHome.css 2015-08-18 02:37:30.095295232 -0300 @@ -49,11 +49,6 @@ background-repeat: no-repeat; } @@ -34,7 +47,7 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/ height: 28px; - width: 70px; - min-width: 70px; -+ width: 47px; ++ width: 28px; } #searchText { @@ -158,9 +171,9 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/ } diff -Nur a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js ---- a/browser/base/content/abouthome/aboutHome.js 2014-10-09 12:53:31.000000000 -0200 -+++ b/browser/base/content/abouthome/aboutHome.js 2014-10-21 14:21:10.012011384 -0200 -@@ -3,149 +3,44 @@ +--- a/browser/base/content/abouthome/aboutHome.js 2015-07-13 19:10:24.000000000 -0300 ++++ b/browser/base/content/abouthome/aboutHome.js 2015-08-18 02:40:01.024730697 -0300 +@@ -3,149 +3,54 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ const SEARCH_ENGINES = { @@ -290,41 +303,51 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/a - "k4w0jAcTAyllnBoh9Kxw/tEdS8cuT0WyH4vX1PYD5qMBzQDE2eFDxz09zsscWuwVHX6a8YwaFAiM" + - "NAkHr4vdUdf82rQN6JwnSl4N4vAxeKdxP2A+mjXuKTvcXcY9TdOnyxPk4zKZ/vbRAqe75C3QfZZY" + - "0P/y6/7299z+H4QrdGsoib8JAAAAAElFTkSuQmCC" -+ "DuckDuckGo HTML": { -+ image: "data:image/png;base64," + -+ "iVBORw0KGgoAAAANSUhEUgAAAC8AAAAcCAYAAADxyeavAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI" + -+ "WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH3AwBERgxGkWttAAABtVJREFUWMPtmGtwVdUVx397n3Pu" + -+ "K8m9uXlASCHQIBqeEooEDAymUEAKEaGlUoeOtbYdnSmdYjud6fjBdhytLS0zdRzbWkAGsCBtSktr" + -+ "RRQFY4gWaQZQUJFwCUhISHLzuo9zzj67Hy4Cd+RD6XDBD90z59uZdX5rrf96nC24xkd7jtlb/7VS" + -+ "da6jQEYKQiA8nUwlzcm39oWfXnvuWn5LXCtDyk6V9N6x4FGvu2ceydQw7amA8PsNAO04rvD7E8KQ" + -+ "HxlTqncWbnnu0c8MfM+C+mfVh8fv144jfXPuwJoxA5QLUoJS4Gm0cnF27cY52IKsGOFas2ofDP/q" + -+ "yT/cMPieurmjvb7BfdhOuTl1CtbM27FfehnnjTdB6+yXLQv/nfMwqqqwd7+COtWGHDKkMfit+xYH" + -+ "V349fl3hu2fPne6dOv26UXWL36qdjtO4H/ffLWBZYBgIkW1aaw1KIQwTY9IEzPFjcfY1opXXWdS8" + -+ "t0wI4V03+PPjqm1z0kTLml5D4hdrIBRC5ueh471opUDKTzlw0QlABAIEVq4gtXELsqT4fNH+vaVX" + -+ "yyD/F/Cu22a2GUOHWOb4sQw+9jhCCNwVy8k/2Exh6zEiL2zBP6cOhMg4cnm0hEAIgU6lSG36I8EH" + -+ "v4Pu6y/pqZu/PueR75k5Z40biz2ct3oVid+tg1QK7XlQ+XkYNZLQN+4lWDcbPA/7zztIbdmK09SM" + -+ "yAt9OgtKIaNRAl9dSnLbdl18+J2wEGIgJ/D9q38UTv1pR8z/pTmFWinsV19DSIl2XOTSeoqeWpsl" + -+ "j09kM/DIT0lt3IQwzSvKyJo0AW3bYPnejv69oSYnskm/uHsWEPEvXYK98x9gGBmAihFEn3yMWDxN" + -+ "v62ywPvTinP3fRsqKtBXip4QqLPtyLIyvFNt07TWMifwwm8u9dXOEKmGv4A/gAA0IKtvpVsZ9KYV" + -+ "QTO7UC1DUHZTOaG7F2d6/hWO19GJMfxzeL29xO9e/uOcwOu0PducUo29Zy/CMi/qTuWFKMz3Ma4k" + -+ "wJneNN5lPT5gSp7Z20bnvEXgumg0WpP14HlopTKySiTrcwM/mChGCoTnwWXRdfv60I7L0XMJxjze" + -+ "RMLObtnn+9OoqjGgTUhIZL7CrEohIypjRgjUqVPIMaPxunvK/lse86pkEwrlXRBqdtrbTqNTKaqG" + -+ "5nP8J7cT8sks3f980U1AF/0L41izbMzKNKJAkdxcTLohkmmpPXFkaSnuB8fNnMBj2y5CWGid5YBx" + -+ "tp1ET5xIOExFNPDJeonu24n38SqEHQMg72EDr89AfeQj9fxQnJYQWBrQiEAAkkkIBr3cwLtuHMMM" + -+ "ak8jjMuKsqOTwY4OIiMrLkksdQgduwvdaZHYPgwZcfE6LJzDQVSrD2FqxAVO7WmM4cOxm5qRxUWD" + -+ "uek20Wird+YMxpjKi5NTC4FQCrvlUNb4xyiBYCXCL7D35ZPcWEz6n2GwBf76OP5FvWhHZEpea0RJ" + -+ "MbqrC5Rqygm81xPfYL/+BoEV90A6fWnKmSbqrX+hL/RtAOEbTnrPQ6RfihD+dRuR52IUvnCCyLMx" + -+ "Aov6UCf8F78u8vLQA4MgJb6vLN2WE9kYI0c0qw8+tIXf5zMqKlAdHQgpQUqCh48woBQFFwYXgE4G" + -+ "SawvRmwqQg51EHkeXp+B126B1AhDAwI5rAwViyFLSwbyf/C93TmJfFHjniOypORo4olfEvjuA5d2" + -+ "dinxn4zRf64jOzITxyJ8mYKk3cQ94cc7b4KpEUYmb9p28N85D/e9Y1g1U1fmdKs0J0/+snYc7R46" + -+ "jDV9Gtp1M51HStz9zbTbJzkaf4/OdC/p2qkMhH0cmhhm/iOjcE0QaITI1IZ2HPzLl+G+exRhmrGC" + -+ "36zdcVUsVwsfeX7Dma6pMx+wX35lXWjVQ2DbOM1vIywLeeAg79c6bDj+NzpUlFHBCAM/HI0oD/KO" + -+ "GKS11MfYM2mUASiFf9kSdFc3duObnlU9+R5a3sr9Pl98oHG9CATWDf7sCXwLF+BbOB8MA1/LYVwv" + -+ "YzKW+Ji23pO0lucjTYnlaoS+tEn6Fi4A18VuasJXM21lYcPW5uv6D3t+0m3biceX+ZbUC1GQj9vV" + -+ "w7HVc9iXfpfKwhqmRW+hPFRG1zNP07Dr9yxr9RMYPwFj/FjUsfexG/e71heqv1nYsHXzDbk96K6u" + -+ "uctLJDeLcEG+cfMYjPvvxf/FuViX70QDg6gdO7Hbz2K/tg8ViyFCoVZZXl4f/ev2Izf83qZryvQ1" + -+ "Opn6vo7HTQBjdCWyrAxcB9V2Gu9sO0ipZTTab42rWhHetvnFz8yl08VM1NYtIZlcrNPpm73+AQtD" + -+ "ahkOJ3HVAWtW7a7wb596lf8f+A8mm/+hmETyjwAAAABJRU5ErkJggg==" ++ "searx": { ++ image: "data:image/png;base64,\ ++iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAQAAAAAYLlVAAAACXBIWXMAAB8/AAAf\ ++PwHBe4GKAAAAB3RJTUUH3gELEhkV5/5DowAAAAJiS0dEAP+Hj8y/AAAHnUlEQVRo\ ++3u2Za4xdVRXHf2ef173z6kxnOjPMzE2pbVOJlKYipYE0Ko0EKfiKBpuABY1CTCDY\ ++RL9ASGiCfiDEUKOBGAFRgeCLQE1aP2jTCCnFgoq1pUNaCy0thdoW+ph7z9nn74ez\ ++77l3ppS5MzWDH1g7557csx/rv9de67/XPgc+lA/lQ6nLTS216vT6vSFvkB6CFlov\ ++al39eRx7/wbel8xTwf7grfBYdDw8Fh4JDvnPe2tpf99OjzO7VQCfRiw/i+oV5qEw\ ++i1VWuzrV5UqH2lRSqGCLuY7oLKPu5v5WAXwf8ch7PJ9lXo5smzrVrdnq0xwNaEAD\ ++6lefetWjLrUplj/Gte/Rdx7i8GSKjbtfBlxH94TKO8Nj8YUlUyIvZcqU3FUunpUo\ ++xdHT/u/pnzD2BqDMnEmW1t0PMQC8zEVFTWS2hktDQkICfHx8DAYPg7CAJcOSYklJ\ ++SEjesYt0qOj/FZ4EqizhlVYAJM6r7+QeAALzYrQ4ogGgygJWciG9RKS8wyv8hW2E\ ++UFdPjVrVrtSzAMxmHx1AyjJeasUHasiVLwAlM1pSl+ZoSOdrgS7Sau3QmfK21mqp\ ++FmieRtSvHrUrkDcXmMVbbrSEi1tzwkMFALHGPJGrH9Y8zdcV2qmzy2F9R/M1XxUN\ ++qEdtCt705vJqMVaNxa0B2NwA4ClSp/o0rHlaqNs1uazXRzVfFfWrWyUZNU3mFHNb\ ++i4KtjUc+Efnqw/X8sAX0t3J/0ScibK5KeKs1AJsaXhkSEBARsoq7WqSRK7mVjMg5\ ++bBNL7+LU+/f03b3Kt4gBAiIiYmJiflNUTy6X8Cr/dnbPsPXHt7GzNQsc5IXm+QeI\ ++B4lJsU0lG1eaa1ISbkOub1AHfpTftcqEsCb/6zsjLmYJVUc0deX2DDh19RbLQlaB\ ++6+8ArJ/ccg0A+3kAjIMgVsKE+VssEVW28U8ivAk1KSdZ6/jSx+QM96OpAIC7OZnT\ ++rcFyFSnpuPmLd1nLEJ9jJcP8etxCpFgS2ljk+hs8uJ4jkwNo9rITZiS4JCIiYIhv\ ++U3UOhbuf4BqepewCdCOHuZqqg5a5+9/YiyUlw/4ru6UV5zXj/i3wMHh4fIxqYYEU\ ++SwY8wMEmvD6/YnOTFfKWFfJlBK/TeFMG4FWM258GqTZ5QIbF5+kJXSM2uZCrA03p\ ++QXh4GOhqLXzHZ3blXL1H5OadW0R4wGuUJnR+nYwUuUUQahrOC7xpADglBIgTWFK3\ ++9+cAUjpIJ3Ruw2KdBwiLOAnOZ5SIKS+B9uZMBq9hScbFQZVLG+14jF34LCVpWgBL\ ++ypt4zm05ztQBsD2fDewo1jYlJSHlNDcU2YvlOEfp5JpxLVIS9ruIEU250RQs8IfM\ ++DfAuuwoL1G2whHsxJAjDDXyNR6GpRQ5iXxGW2ptpyj6g57PMGosl5k+sdpTi42Ew\ ++ZCxjI7/k77RxBZ/nFMm4vUEcZH8RltramgUmuGqwOf5kiTIxQ/wAHx/PXcaFV06y\ ++GdbZqlEi7mCUGmOMcZrkfPZN3QfINlgsCZY32AIu3UyoFVeVMcaoFjWN8iJ7yOoO\ +++Y/W1J9hAdqDE2ViYkpE3MUAfsHtuQ0akaCCATIyDHfzGlXGqHKa9OPZS60BmJhx\ ++JNS8lXWFe1leUEwjC6j/po6C8/IwL5ORYKmR7rTryKZnASgFu+NKnhFFVLidoLCB\ ++V9hA0AQMNrKRmgvF05hr39nQaiZlzngyZm+vFev+Ous5TEr1jDLm7jXG+DnPUCPF\ ++InxCXb5bQWrkTc8CgLkvXBsTuRKwmkWETfOv+wBY3uAR3iWlRkKGhw+kp5ZetmkH\ ++mZdNEwC++XO4Ii4SbY9BFnMps5zreYAh4a9s5wCJO5zVyBARJTxqta6bR39xnG47\ ++PQCA2RKtCF2iHRDgkTHEXGZTIuEoB9iLh+cYMAdgETElYgxVZn1z96NjtmynCQDf\ ++/DS4KT+c+oTF2dhrCsI8FtLieGox+C6EfRLMg2/cciToTafmhHWx2deTm2v/qUf2\ ++aU4z5kio6tguv/J/tT9aICNljFNUsYRkNw8+9UyHfGumY4EcXxs/878aNL0d8PBc\ ++ztBIzNM92Wc1yo08lA/pE1EiJsCSjB5ejMV6YtpygX9fsCdSWW3qUKc61akOtaus\ ++WOEJ/wlvVdFyFSfz422gsno0qIqG1b//MxdAZs71Nd6wd4f/nH8yqIW1sBbU/FHz\ ++E+/SM1otzHcpT75K6taAKhpWr5YtV3juEOobeFt+ijyLDLK7DiFWlwY0ohH11+Z9\ ++A9L/EYTJZVsOwShWp+ZoRBX1q/I9xfJb48dzFZ+H8kg1itShPg2rogH1P6ng4AxB\ ++gHV1CKHa1athVTSowd/e0y0zUxCurr/yCdSuXg2povPUN7qu9+1wpiBc1QjLNvVo\ ++SBUNqe/A8iXyj84QhH6O1GOirG4NakTD6jt55QUKNEMxMcQL+VL4KmmWY4Y+LfmU\ ++IjtDEEK21yFEDWY4/nifIvkzxQzrG2GZM8OIhl6pdimeuS8y9zbCMmeGEV1+ozpn\ ++jBz5Ll/Gbdj59m45egkzpx+ACzmQx0SoNnUfX7M0nTXTn8YifuzCMv3ER1RS6YP4\ ++PncxD/Oc+aK81Jfv8cGIh0AflPb/K/kvIVmE2W8jhuAAAAAASUVORK5CYII=" } }; @@ -345,7 +368,7 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/a // This global tracks if the page has been set up before, to prevent double inits let gInitialized = false; let gObserver = new MutationObserver(function (mutations) { -@@ -153,7 +48,6 @@ +@@ -153,7 +58,6 @@ if (mutation.attributeName == "searchEngineName") { setupSearchEngine(); if (!gInitialized) { @@ -353,7 +376,7 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/a gInitialized = true; } return; -@@ -178,118 +72,6 @@ +@@ -178,118 +82,6 @@ window.removeEventListener("resize", fitToWidth); }); @@ -472,7 +495,7 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/a function onSearchSubmit(aEvent) { let searchTerms = document.getElementById("searchText").value; -@@ -339,159 +121,6 @@ +@@ -339,159 +131,6 @@ } @@ -633,8 +656,21 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/a if (window.scrollMaxX) { document.body.setAttribute("narrow", "true"); diff -Nur a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/abouthome/aboutHome.xhtml ---- a/browser/base/content/abouthome/aboutHome.xhtml 2014-10-09 12:53:31.000000000 -0200 -+++ b/browser/base/content/abouthome/aboutHome.xhtml 2014-10-21 14:23:10.525956357 -0200 +--- a/browser/base/content/abouthome/aboutHome.xhtml 2015-07-13 19:10:24.000000000 -0300 ++++ b/browser/base/content/abouthome/aboutHome.xhtml 2015-08-18 02:41:35.756857459 -0300 +@@ -90,10 +90,10 @@ + <img src="chrome://branding/content/about-logo.png"/> + + <div id="searchContainer"> +- <form name="searchForm" id="searchForm" action="https://duckduckgo.com/html/"> ++ <form name="searchForm" id="searchForm" action="https://searx.laquadrature.net/"> + <input type="text" name="q" value="" id="searchText" maxlength="256" + autofocus="autofocus"/> +- <input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label; DuckDuckGO"/> ++ <input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label; searx"/> + </form> + </div> + @@ -101,6 +101,7 @@ <div class="spacer"/> @@ -655,8 +691,8 @@ diff -Nur a/browser/base/jar.mn b/browser/base/jar.mn content/browser/abouthome/snippet2@2x.png (content/abouthome/snippet2@2x.png) content/browser/abouthome/downloads@2x.png (content/abouthome/downloads@2x.png) diff -Nur a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd ---- a/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-01-27 16:19:19.000000000 -0200 -+++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-01-29 12:19:21.741429014 -0200 +--- a/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-08-23 17:05:01.000000000 -0300 ++++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-08-25 04:47:50.321608830 -0300 @@ -13,17 +13,6 @@ <!ENTITY abouthome.searchEngineButton.label "Search"> @@ -674,16 +710,16 @@ diff -Nur a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales - <!ENTITY abouthome.bookmarksButton.label "Bookmarks"> <!ENTITY abouthome.historyButton.label "History"> - <!ENTITY abouthome.settingsButton.label "Settings"> + <!-- LOCALIZATION NOTE (abouthome.preferencesButtonWin.label): The label for the diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties ---- a/browser/locales/en-US/chrome/browser-region/region.properties 2015-01-27 16:20:32.000000000 -0200 -+++ b/browser/locales/en-US/chrome/browser-region/region.properties 2015-01-29 12:21:13.202346944 -0200 +--- a/browser/locales/en-US/chrome/browser-region/region.properties 2015-07-13 19:14:26.000000000 -0300 ++++ b/browser/locales/en-US/chrome/browser-region/region.properties 2015-08-18 02:43:13.382178053 -0300 @@ -3,17 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Default search engine -browser.search.defaultenginename=Google -+browser.search.defaultenginename=DuckDuckGo HTML ++browser.search.defaultenginename=searx # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=Google @@ -694,9 +730,9 @@ diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/brow -# selection UI -browser.contentHandlers.types.0.title=My Yahoo! -browser.contentHandlers.types.0.uri=https://add.my.yahoo.com/rss?url=%s -+browser.search.order.1=DuckDuckGo HTML -+browser.search.order.2=DuckDuckGo Lite -+browser.search.order.3=searx ++browser.search.order.1=searx ++browser.search.order.2=DuckDuckGo HTML ++browser.search.order.3=DuckDuckGo Lite # increment this number when anything gets changed in the list below. This will # cause IceCat to re-read these prefs and inject any new handlers into the @@ -753,8 +789,8 @@ diff -Nur a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/ </DL><p> </DL><p> diff -Nur a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm ---- a/browser/modules/AboutHome.jsm 2014-10-09 12:53:30.000000000 -0200 -+++ b/browser/modules/AboutHome.jsm 2014-10-21 14:54:12.086062616 -0200 +--- a/browser/modules/AboutHome.jsm 2015-08-23 17:04:41.000000000 -0300 ++++ b/browser/modules/AboutHome.jsm 2015-08-25 04:52:43.993422621 -0300 @@ -8,7 +8,7 @@ let Ci = Components.interfaces; let Cu = Components.utils; @@ -764,9 +800,9 @@ diff -Nur a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); Components.utils.import("resource://gre/modules/Services.jsm"); -@@ -18,66 +18,6 @@ - XPCOMUtils.defineLazyModuleGetter(this, "fxAccounts", - "resource://gre/modules/FxAccounts.jsm"); +@@ -20,68 +20,6 @@ + XPCOMUtils.defineLazyModuleGetter(this, "Promise", + "resource://gre/modules/Promise.jsm"); -// Url to fetch snippets, in the urlFormatter service format. -const SNIPPETS_URL_PREF = "browser.aboutHomeSnippets.updateUrl"; @@ -775,7 +811,9 @@ diff -Nur a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm -const STARTPAGE_VERSION = 4; - -this.AboutHomeUtils = { -- get snippetsVersion() STARTPAGE_VERSION, +- get snippetsVersion() { +- return STARTPAGE_VERSION; +- }, - - /* - * showKnowYourRights - Determines if the user should be shown the @@ -831,14 +869,14 @@ diff -Nur a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm /** * This code provides services to the about:home page. Whenever * about:home needs to do something chrome-privileged, it sends a -@@ -202,18 +142,9 @@ - ss.promiseInitialized.then(function() { +@@ -246,18 +184,9 @@ + }).then(function(engineName) { let data = { showRestoreLastSession: ss.canRestoreLastSession, - snippetsURL: AboutHomeUtils.snippetsURL, - showKnowYourRights: AboutHomeUtils.showKnowYourRights, - snippetsVersion: AboutHomeUtils.snippetsVersion, - defaultEngineName: Services.search.defaultEngine.name + defaultEngineName: engineName }; - if (AboutHomeUtils.showKnowYourRights) { @@ -847,6 +885,6 @@ diff -Nur a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm - Services.prefs.setBoolPref("browser.rights." + currentVersion + ".shown", true); - } - - if (target) { + if (target && target.messageManager) { target.messageManager.sendAsyncMessage("AboutHome:Update", data); } else { diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig index 4f8fc3aea..d85989194 100644 --- a/libre/icecat/mozconfig +++ b/libre/icecat/mozconfig @@ -14,7 +14,7 @@ ac_add_options --with-system-zlib ac_add_options --with-system-bz2 ac_add_options --with-system-png ac_add_options --with-system-libevent -#ac_add_options --with-system-libvpx +ac_add_options --with-system-libvpx ac_add_options --with-system-icu ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite @@ -34,3 +34,5 @@ ac_add_options --disable-debug-symbols # Parabola features ac_add_options --disable-safe-browsing +ac_add_options --disable-url-classifier +ac_add_options --disable-eme diff --git a/libre/icecat/mozconfig.pgo b/libre/icecat/mozconfig.pgo deleted file mode 100644 index 71ba205a4..000000000 --- a/libre/icecat/mozconfig.pgo +++ /dev/null @@ -1,3 +0,0 @@ - -# PGO -mk_add_options PROFILE_GEN_SCRIPT='EXTRA_TEST_ARGS=10 $(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run' diff --git a/libre/icecat/remove-google-play-services-support.patch b/libre/icecat/remove-google-play-services-support.patch new file mode 100644 index 000000000..f184b15ad --- /dev/null +++ b/libre/icecat/remove-google-play-services-support.patch @@ -0,0 +1,64 @@ +diff -Nur a/configure b/configure +--- a/configure 2015-08-23 17:05:16.000000000 -0300 ++++ b/configure 2015-08-25 17:13:48.155780403 -0300 +@@ -18883,46 +18883,6 @@ + + + +-if test -n "$MOZ_NATIVE_DEVICES" ; then +- +- +- echo $ac_n "checking for google play services""... $ac_c" 1>&6 +-echo "configure:18891: checking for google play services" >&5 +- GOOGLE_PLAY_SERVICES_LIB="${ANDROID_SDK_ROOT}/extras/google/google_play_services/libproject/google-play-services_lib/libs/google-play-services.jar" +- GOOGLE_PLAY_SERVICES_RES="${ANDROID_SDK_ROOT}/extras/google/google_play_services/libproject/google-play-services_lib/res" +- +- +- if ! test -e $GOOGLE_PLAY_SERVICES_LIB ; then +- { echo "configure: error: You must download Google Play Services to build with native video casting support enabled. Run the Android SDK tool and install Google Play Services under Extras. See http://developer.android.com/google/play-services/setup.html for more info. (looked for $GOOGLE_PLAY_SERVICES_LIB) " 1>&2; echo "configure: error: You must download Google Play Services to build with native video casting support enabled. Run the Android SDK tool and install Google Play Services under Extras. See http://developer.android.com/google/play-services/setup.html for more info. (looked for $GOOGLE_PLAY_SERVICES_LIB) " 1>&5; exit 1; } +- fi +- echo "$ac_t""$GOOGLE_PLAY_SERVICES_LIB" 1>&6 +- +- ANDROID_APPCOMPAT_LIB="$ANDROID_COMPAT_DIR_BASE/v7/appcompat/libs/android-support-v7-appcompat.jar" +- ANDROID_APPCOMPAT_RES="$ANDROID_COMPAT_DIR_BASE/v7/appcompat/res" +- echo $ac_n "checking for v7 appcompat library""... $ac_c" 1>&6 +-echo "configure:18904: checking for v7 appcompat library" >&5 +- if ! test -e $ANDROID_APPCOMPAT_LIB ; then +- { echo "configure: error: You must download the v7 app compat Android support library when targeting Android with native video casting support enabled. Run the Android SDK tool and install Android Support Library under Extras. See https://developer.android.com/tools/extras/support-library.html for more info. (looked for $ANDROID_APPCOMPAT_LIB)" 1>&2; echo "configure: error: You must download the v7 app compat Android support library when targeting Android with native video casting support enabled. Run the Android SDK tool and install Android Support Library under Extras. See https://developer.android.com/tools/extras/support-library.html for more info. (looked for $ANDROID_APPCOMPAT_LIB)" 1>&5; exit 1; } +- fi +- echo "$ac_t""$ANDROID_APPCOMPAT_LIB" 1>&6 +- +- +- +- ANDROID_MEDIAROUTER_LIB="$ANDROID_COMPAT_DIR_BASE/v7/mediarouter/libs/android-support-v7-mediarouter.jar" +- ANDROID_MEDIAROUTER_RES="$ANDROID_COMPAT_DIR_BASE/v7/mediarouter/res" +- echo $ac_n "checking for v7 mediarouter library""... $ac_c" 1>&6 +-echo "configure:18915: checking for v7 mediarouter library" >&5 +- if ! test -e $ANDROID_MEDIAROUTER_LIB ; then +- { echo "configure: error: You must download the v7 media router Android support library when targeting Android with native video casting support enabled. Run the Android SDK tool and install Android Support Library under Extras. See https://developer.android.com/tools/extras/support-library.html for more info. (looked for $ANDROID_MEDIAROUTER_LIB)" 1>&2; echo "configure: error: You must download the v7 media router Android support library when targeting Android with native video casting support enabled. Run the Android SDK tool and install Android Support Library under Extras. See https://developer.android.com/tools/extras/support-library.html for more info. (looked for $ANDROID_MEDIAROUTER_LIB)" 1>&5; exit 1; } +- fi +- echo "$ac_t""$ANDROID_MEDIAROUTER_LIB" 1>&6 +- +- +-fi +- +- +- +- + if test "$MOZ_ENABLE_GTK" -o "$MOZ_ENABLE_QT" + then + succeeded=no +@@ -29180,13 +29140,6 @@ + (''' MOZ_OFFICIAL_BRANDING ''', r''' $MOZ_OFFICIAL_BRANDING ''') + (''' MOZ_BRANDING_DIRECTORY ''', r''' $MOZ_BRANDING_DIRECTORY ''') + (''' MOZ_DISTRIBUTION_ID ''', r''' $MOZ_DISTRIBUTION_ID ''') +- (''' MOZ_NATIVE_DEVICES ''', r''' $MOZ_NATIVE_DEVICES ''') +- (''' GOOGLE_PLAY_SERVICES_LIB ''', r''' $GOOGLE_PLAY_SERVICES_LIB ''') +- (''' GOOGLE_PLAY_SERVICES_RES ''', r''' $GOOGLE_PLAY_SERVICES_RES ''') +- (''' ANDROID_APPCOMPAT_LIB ''', r''' $ANDROID_APPCOMPAT_LIB ''') +- (''' ANDROID_APPCOMPAT_RES ''', r''' $ANDROID_APPCOMPAT_RES ''') +- (''' ANDROID_MEDIAROUTER_LIB ''', r''' $ANDROID_MEDIAROUTER_LIB ''') +- (''' ANDROID_MEDIAROUTER_RES ''', r''' $ANDROID_MEDIAROUTER_RES ''') + (''' _PANGOCHK_CFLAGS ''', list(r''' $_PANGOCHK_CFLAGS '''.split())) + (''' _PANGOCHK_LIBS ''', list(r''' $_PANGOCHK_LIBS '''.split())) + (''' MOZ_PANGO_CFLAGS ''', list(r''' $MOZ_PANGO_CFLAGS '''.split())) diff --git a/libre/icecat/rhbz-966424.patch b/libre/icecat/rhbz-966424.patch deleted file mode 100644 index 9a1c9e2b4..000000000 --- a/libre/icecat/rhbz-966424.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nur mozilla-release.orig/toolkit/modules/CertUtils.jsm mozilla-release/toolkit/modules/CertUtils.jsm ---- mozilla-release.orig/toolkit/modules/CertUtils.jsm 2014-10-11 07:06:48.000000000 -0200 -+++ mozilla-release/toolkit/modules/CertUtils.jsm 2014-10-16 03:44:30.226448002 -0200 -@@ -174,7 +174,9 @@ - } - - function isBuiltinToken(tokenName) { -- return tokenName == "Builtin Object Token"; -+ return tokenName == "Builtin Object Token" || -+ tokenName == "Default Trust" || -+ tokenName == "System Trust"; - } - - /** diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD index 476ea454e..3d57c4e32 100644 --- a/libre/icedove-l10n/PKGBUILD +++ b/libre/icedove-l10n/PKGBUILD @@ -4,9 +4,9 @@ epoch=1 _pkgbase=icedove pkgbase=$_pkgbase-l10n -_pkgver=31.7.0 -pkgver=31.7.0.deb1 -pkgrel=1 +_pkgver=38.1.0 +pkgver=38.1.0.deb1 +pkgrel=3 pkgdesc="Language pack for Debian ${_pkgbase^}." arch=('any') url="http://packages.debian.org/sid/icedove" @@ -23,8 +23,10 @@ _languages=( 'br "Breton"' 'ca "Catalan"' 'cs "Czech"' + 'cy "Welsh"' 'da "Danish"' 'de "German"' + 'dsb "Lower Sorbian"' 'el "Greek"' 'en-GB "English (British)"' 'en-US "English (US)"' @@ -40,6 +42,7 @@ _languages=( 'gl "Galician"' 'he "Hebrew"' 'hr "Croatian"' + 'hsb "Upper Sorbian"' 'hu "Hungarian"' 'hy-AM "Armenian"' 'id "Indonesian"' @@ -73,7 +76,7 @@ _languages=( ) pkgname=() -source=('brand.dtd' 'brand.properties') +source=('brand.dtd' 'brand.properties' 'region.properties') _url=https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$_pkgver/linux-i686/xpi for _lang in "${_languages[@]}"; do @@ -100,6 +103,7 @@ _package() { rm -v icedove-l10n-$_pkgver-$1.xpi install -vDm644 $srcdir/brand.dtd $1/chrome/$1/locale/$1/branding install -vDm644 $srcdir/brand.properties $1/chrome/$1/locale/$1/branding + install -vDm644 $srcdir/region.properties $1/chrome/$1/locale/$1/messenger-region rm -rv $1/chrome/{.mkdir.done,$1/locale/$1/global-platform/{mac,win}} sed -i -e 's/thunderbird/icedove/' $1/install.rdf cd $1 @@ -114,58 +118,62 @@ _package() { sha256sums=('49b419449431d8d64e20427a2e7105e3ac1ffc41e677a5f9a8eb276f5b82df4a' 'acc2cf95661be7cb8928fca89e08d0681685409ff2428e4e3d25baf1af427b38' - 'fac353e1067852ccac7bc23a958c54fdebd2aad30ad9551a07deb23811046d79' - '4e39fb7792c7fe787bb9d9f3a03ac57da15e9b353a51f1602afcffc3e0e0ffa8' - '8be5b81c0a747d89ff9f586d726706718711a01ffd70ecbed9fe00352fb795dd' - '7ab3641502204c37108430f5be2f78a161b1aa5a63561c8edcf0186a7f509df6' - '51cf109e8416775e656a1431630f3f4a6b0bde3e44744449283d0666284698bf' - '97bbaea547340a56f528d8675b04a596369fb9b63245e20acd76d74211f7a668' - '49d3df068e9edcf17ed99754bd45c7d00c50f4bacd7a5484ab86018197258523' - 'd491ebf429f56ad21632bc476f9364857ee838a330ff1b966cae2e8ec5a944e8' - 'c95a6ce7d22eca56f365f05805393a1b52a5427af02a447f9dba1cd1559dd7c7' - '0debd56af6d8872d525e62ae8fd609620c3a66a425817dec83d701346fd766ba' - '9b3ca0a7df6b8bc91274b2b757dfb909beb04815cf51b377b22755114776b536' - 'd8d4dc74889792dc9b434f11a8934d5363dafb07aada75068809f1d3ceba7d66' - 'c4e5def480042a55d8532129f3bd5226004b98f5dd3991eeb429a35152f4391e' - 'e0bf50d99447934d0f9865329469559308ab54c32d2d64321a9742b3aa4be063' - '162a5c3879bb4d826b8cfea0dd68cf13f29d417bac79cc2482dd78d76cc0a8f7' - '9f5846d2147eeb8a834a282abc80ef1cd58389faaf4a0dfedfc4e91cd28faaf5' - 'bba78265515862435a7aa19345460c0bdd192be207550f6a9ac0cdb7de535ac8' - 'bdf3d4bf05bc66951c9d861af635c791fd3513f578fe32a9ccc150aa81ba6304' - '5700997d79942d74db684fddb255ee1e5a1b10b0c7c0df875b917dbba91f9607' - 'ed3f3e4bbba12218a0025747257cdaefceb4f37ce65fbf8e3ec1746cacf62d62' - '788127820d6404540b698794a9008990f77005056ec1f15da05785087729c178' - 'f688f29b6e4032d6f6fd9b3e7ae20d2f94f7ae34e977bcb1ea1e9b4393ac9f4d' - '52ba67336de4d8d19ac1d29d22df362af9e8b43a2cb800a0303b51e0b6d4c4fb' - '39519209cf6c19208e8c677439b3cad194d9d14f7ff3814c189890d6285b7af7' - '7abab0668491b42dff80e8b656407b9489f8a133a58f0ca42f8c83a1973efd77' - 'ec4d3c63698bc825fee4a2dedde66a7796fef0efee8df307d8f233f382ba784a' - 'f22b7f8a56d6b92448d4b1cf471fdad56cef13e8668a472e833a8efc8400b53f' - '40c62742c10f08f1b93e68b026b48b849dcf323f99987720be19c0bc0f4fbb7f' - '1007cd1f3f72deecdbfbb3ec54837955f53235de4b39405158eec9dd74750246' - '6de47224c4342a1fc1c81d8ec0bab90cdacb4b4e54709e9590c2bd341fbfbae7' - '4e3f6637cccafab04d665bb66b2d808797384c3b322a4375efcb9a3be480fe7f' - '6c962ee2ce9051223897ace9fa6d7c60ffb7e95b103a52bad0f17803efcfeaf2' - '9dbde5ddc20a9512320490318f5f6278d5626357f3b17401482a439a4f6be654' - '51a38f39dfc18d945a0985a23d0b7770f8fe3cebf8a28f22fd92bb288345a9b0' - '784ba5505afef70f492a85651c632da974c01bf1c5a945ff132df40b077304d7' - 'cfd312de7632a96facd36acdc00a04bc571101d655c5c8f70300d3f982b58366' - 'e444889660a60b44a3e5e6fc94972e2b8a2b97e0fa8959b41bcacacfc8be931d' - '3ef71ff4f72e28f15ea76764be9179cefdbf92a2270e87dad557cbf6d6c44f36' - '298f9a4a205a77e471f96e38d12dbba00b6fb9ddf89b496e8b5eb106d1f33c97' - 'e01d684612fd224536e9cb21f44ace5cab81bf8fd15e8e5265847df1b2407a59' - '0d2606836428595232daf0aedbafea4935e641658712fd99e34668e686c0d2e7' - '7de4b8e3ffcf3ac7ced5aeae0ca84d1e9c8603646e54473665505e1f1ac66925' - '38b372432b02c42703e3f425946cee6a42918d574f7bff7df5f9997ddb076f64' - '3441d57aeedf15c5a29800e8f544b8571d41e5ed5a381d8bb2087cda97074970' - 'dcd56d713daa7b6fb03d64219797e159eab8bef2e7eb9bd7999c0b285a24d153' - '7e7fb8287b9255aa8988bf63677e0bed8ae30c0da5ac7d83ba1300ba2bca41d3' - 'b9270889a4905233e450be25d61e4a1359a057bc6c021d5aba23a941cde56123' - '0ef471cf54c052214d5169189a72efc0e8d65801e482aeff413ffc7c822c1651' - '803529203aded6bf1194a6d5d575f5e16f8a4a249a68878650c5469e92512923' - '3529d8a55ea5458edf24059d55178b6c4935aa82b604bc1c46e4b4bffb88234b' - 'e83e64f528b12b1550efb28ba4dea51e7912ab2af470c1382d78e01d9dc3a3ff' - '12c2001834af439d1a0f95ed3f416788672d41c5b02481d26e54f66e721c83a6' - '7a20d9842117105f4ac641d602977cf20d4149564593adba0f3415976fd7b52d' - 'f582fac503f385ceb59761134ed24170ded9f65861106ff77219040b169e6a37' - '3b60993a3c85f61ef57b02334d3a71d864e9e6609ec29f398c1f60094cad43a3') + 'e6edcc7c478d73ca5a17e4889acd302d55201ec5c29de545d3f44165201923db' + '8bc4384ede05efcb02e67a8888651a81f22cbaea3bbf6072e156d707e2a9ad49' + '2a8b35fb65014cc2789e38a396a9c153b8726f5cc5c50ec042e29d9c7972b4fb' + '0bd3e4dcc65e44d62127fb1832803f75a0bad4cd179135375460327363e81864' + '806a7f2d151db0f5334b2791dbd708b3f631b2ec214b2f6edfa7aa95abe0b59a' + '5f16873ea47e84fb01a263f7ab59a90188ad6c5b57ab13b90c925b4a8d0bf06a' + 'c976d2fdb520e178df568a5824f4416b043f9ebbe436ddbfb81ef5b5f972d6e9' + '82a2eef48fefe335f1f8d53d21861a45f7b73b4ad8b65c912f9820bf69273309' + 'a1e0b882b599705e1150a66139fee97dc009be2a8e64e6a7c2b1158373bfd3ca' + '877cbe5d9dba3f90c2754788baaa137fb45bf9e2d071a50df69e970f341a6365' + 'fad0fc825311a1b546eb117c8cc838f542485ff87cb71c5a656c449366a71526' + 'bc900b8f0f2db4c0e5527780db826789d61bf5b265ccf62033909fbb4f21e12e' + '06ebda860118ac5833c6d8884a4e94bab7265622a48978c0e1b472055f784314' + 'd6df1e34d17723f2b52aecea1fab9af964bd936816f51e5dc0f335bbf59a9a6c' + '07e443159860c85c82f01dbc57e0c83904fa7788dd69fb234970ef0484afdc81' + 'ef68841d061f743ab199e087ab45c12a2f1c4b481d2017f535bcadab2e8902ad' + 'c5b0d927e51ef06414cc14a64ab84d0d4e3b86f2833dd0bc1211a056507d425d' + '79bb32e02108f6f8971c6504adc39ff45a202cb91b6e7daca286a3b0aaa6e1b0' + '9fe401fa441232dd29fee49d26fcb65af34ccffc2666bf2fb09546a947d91e9d' + '0d54de9beec9e2f232a016d93d0b626bf8be86a1966ad6fb02c8d1cfe531a3f0' + 'cc7bf6325bf7d4c914cb7958687c776db8e2444cd969ac16e91d6a67be0ab729' + '56dbffbc5e1286f71eeb33961e209a6c6a9dd3916c4b3432733baf8f10c10e77' + '00ec21c0bab139981ab81902051d7c59a5fa3a6ae7865e9613ebd95c0fe1bf87' + '76384620c71115c8ebb3afcc4b30de9de45d1230e44983b4bd3d1473bb9c144e' + '1da8565cafbb009abb0b0424fc15e0dc2bcf2c3048e14f7e1cf5e62bb5618835' + 'ff3d29d1a050b74e64e0a4450b65edb247a5eb36a1b8df6b57dc3851b1658fd3' + 'aab3240dca233f9e6ec9077be40a3d0033d75ccbd196a9ccce2726261c9d4c41' + 'f368ccd53d7d405c07149b351f56d391142b40e8774d9d7fa623ff3318428b6a' + 'f47a8a2ff662acef03541ead6caf3e900706ce348b7577cd656222e9dcc2c47a' + 'c8393cb2f5c8aab62fec71e53f19791e7ce4d3acc37814a4796e7b390a4e1fcf' + '56454db77528fd2bc02abd4f4ecde69adbe278cbe807842e3e92d709d5df526c' + '913db42b7530f55a8f3836d4dd493cf45df86509c77cfc64aca28c4bf60c6321' + '0a0194046282ea36e3c48238f08bfa9ffff07531d473b9a800628b6fb22b4970' + '2b7659c9a0c57e608d05f64bff90b3f6e631ce089ed1135465e89a133482fca7' + 'c790816d9a735d0ff3e3d82516b6c10076a94c6e278fdea05f04d52615984257' + '42a147ac06a0cd7995a78f014259464db2e51391aec4ea16a548e0d5f156d951' + 'bbdb182ae21c8b8da1175b5a936e8563250838e538004a45b7847d27a0b192ad' + 'e4b10c9cfd80c6f9b683880e454cc3dcd2e9eb01acdc0090e73b6c6b6b71a7d3' + '032f473e1fce313d8d9cdcc49cdaf390711c266069c45df4dbee2e9c81e19b0d' + '361710679e3229b98aa5785b1cf36afa493e5ded84353a69574e4cbe7f5bbe29' + '53afb6a6ff09df13b97ffc88f95a527d860e751fd79e873a78be2e7bd977a15e' + 'd9c770408d6b8cc52df4113ccfeb339fc7e34ca45a62df49ee5f24e70a5e3503' + '8160379e9ff6319939e7a9e2d37c0a7f66f436796f16c0c3ef8a70f1a2e17ea0' + 'd6354d745df58c48d15792c35aa8f4874d11bff0980df6b567de58f659357efe' + 'fbc4bb3603cd5927c98e82ca83e830bd0c0807cc63ee0215f60e1cea66cc4400' + '2e768e1a2e9ae04bafea1948c19b2b6e83f436f3a2841a94550f95bde7b30b42' + '85ab5454186b1a35c1268a8854b2407f1a260857a092de2cdc1c0fb84e278104' + '8df4c4ca6dbb901f419b69b37da8b0762483e080513b6cebe0d4424444f6ce25' + '8b34d932a49e56cc47b9dae57f7a515b40bcc1ae4efa50f1dd275855abb30659' + '7d2bbe2b04052165bde61b4e24f2c928460f914a57c8bec36d3496de67d5dd66' + '0e41b9ab3ec7853e3c8d19ad6380598ccc4d04884426f64be577a045f876cdd6' + 'c2d6d4a751580f2107aaeec7f23584ca7a8803cd15289fbf863d124a1801ffee' + '59cfe9b9ee411b92e288d0050ba3baddd5bc7bb779ed4fbff7681ae252053133' + '891b12e9f7722c570189c0c47a814e96ac3ef9e16b2d50625a4766085649d16f' + '5b42a203b0a6938a9967ce982fb800bd4db8ef0d2def1b9966e1352e843729fc' + 'e32214709147900c4336af83dce5445614b72d4059dad67b6f703a0853ec2ad1' + '6d9b056f1d13e7dd95b79780c65e202c5c428f87e206370a5264644579a41626' + '9d00bbc2f01c6974877923f9d770e16112b5e859788a728a7244052361f1ea7b' + '65dd33db3a18a4f8eeb54b953650a3a592a8821765e44888849f15531bcf88ca') diff --git a/libre/icedove-l10n/region.properties b/libre/icedove-l10n/region.properties new file mode 100644 index 000000000..9bc71fa63 --- /dev/null +++ b/libre/icedove-l10n/region.properties @@ -0,0 +1,27 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +# Default search engine +browser.search.defaultenginename=searx + +# Search engine order (order displayed in the search bar dropdown)s +browser.search.order.1=searx +browser.search.order.2=DuckDuckGo HTML +browser.search.order.3=DuckDuckGo Lite + +# To make mapit buttons to disappear in the addressbook, specify empty string. For example: +# mail.addr_book.mapit_url.format= +# The format for "mail.addr_book.mapit_url.format" is: +# @A1 == address, part 1 +# @A2 == address, part 2 +# @CI == city +# @ST == state +# @ZI == zip code +# @CO == country +mail.addr_book.mapit_url.format= +mailnews.messageid_browser.url= + +# Recognize non-standard versions of "Re:" in subjects from localized versions of MS Outlook et al. +# Specify a comma-separated list without spaces. For example: mailnews.localizedRe=AW,SV +mailnews.localizedRe= diff --git a/libre/icedove/PKGBUILD b/libre/icedove/PKGBUILD index d86927420..792fcdd4a 100644 --- a/libre/icedove/PKGBUILD +++ b/libre/icedove/PKGBUILD @@ -3,7 +3,7 @@ # We're getting this from Debian Sid _debname=icedove -_debver=31.7.0 +_debver=38.1.0 _debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -11,13 +11,16 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } pkgname=${_debname} epoch=1 pkgver=${_debver}.${_debrel} -pkgrel=1 +pkgrel=2 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird." -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') license=('MPL' 'GPL' 'LGPL') url="http://packages.debian.org/sid/${pkgname}" -depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libvpx=1.4.0' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') -makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'libpulse' 'autoconf2.13' 'quilt' 'jquery-ui') +depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types' + 'dbus-glib' 'alsa-lib' 'desktop-file-utils' 'hicolor-icon-theme' + 'libvpx' 'icu' 'libevent' 'nss' 'hunspell' 'sqlite' 'mozilla-searchplugins') +makedepends=('unzip' 'zip' 'python2' 'wireless_tools' 'yasm' 'mesa' 'libpulse' + 'pkg-config' 'autoconf2.13' 'quilt' 'jquery-ui') optdepends=('libcanberra: for sound support') replaces=('thunderbird' "${pkgname}-libre") conflicts=('thunderbird' "${pkgname}-libre") @@ -27,55 +30,49 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz" "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.xz" mozconfig ${pkgname}.desktop - ${pkgname}-install-dir.patch + changing-the-default-search-engine.patch vendor.js) -options=(!emptydirs) -sha256sums=('00ce17575690400e22e7ce21dc5b3b4f71092b7708ee9aad74448d1401da8794' - '04c30b4e72819b764bc463d36c39f55741d3e47ae994ba89fd14e63fe32c6561' - '09a0041f7f12498d933284b3d3a44e19002515accaff767d145a8f404b79e86a' +options=(!emptydirs !makeflags) +sha256sums=('b59c74f67d2f9684d9cf0db62b5c60d3ef155807e17a91ebf0899dd55670f6a0' + '29de44253624814ae3ce3e0a6a786ba229c62e78d8c97e36257f730d38d542f7' + 'e3d0f5f78fede687dfc38a2787c2c8f33c8213be286abeb9176e3dcebabb0b74' '0b0d25067c64c6b829c84e5259ffca978e3971f85acc8483f47bdbed5b0b5b6a' - '24599eab8862476744fe1619a9a53a5b8cdcab30b3fc5767512f31d3529bd05d' - 'b44f0eb82dce8a02aa71f0eab4b0d820e5383f613becc62cc995aac8638b54ec') + '9765d9bbcae82d0006766741c813840db46c56ee16f79d39b8d7d96d716ee2d7' + '798d5bff1e6025e9a803b67f629afac740f16e537b714ee7c7e829b2345fb6a2') prepare() { - export DEBIAN_BUILD="comm-esr31" + export DEBIAN_BUILD=comm-esr${pkgver%%.*} export QUILT_PATCHES=debian/patches export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' export QUILT_DIFF_ARGS='--no-timestamps' - mv debian "${srcdir}/${DEBIAN_BUILD}" - cd "${srcdir}/${DEBIAN_BUILD}" + mv debian ${srcdir}/${DEBIAN_BUILD} + cd ${srcdir}/${DEBIAN_BUILD} - mv debian/${pkgname}-branding "${srcdir}/${DEBIAN_BUILD}/mail/branding/${pkgname}" + # Prepare branding for the Icedove packages + mkdir -v mail/branding/${pkgname} - cp -a debian/app-icons/${pkgname}big.svg debian/app-icons/${pkgname}_icon.svg - for i in 16x16 22x22 24x24 32x32 48x48 256x256; do - install -Dm644 "debian/app-icons/${pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${pkgname}/mailicon${i/x*/}.png" + # Copy needed icons + cp -va debian/${pkgname}-branding/* mail/branding/${pkgname} + for i in 16 22 24 32 48 256; do + install -vDm 644 debian/app-icons/${pkgname}${i}.png mail/branding/${pkgname}/mailicon${i}.png done - for i in 48x48 64x64; do - install -Dm644 "debian/app-icons/${pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${pkgname}/content/icon${i/x*/}.png" + for i in 48 64; do + install -vDm 644 debian/app-icons/${pkgname}${i}.png mail/branding/${pkgname}/content/icon${i}.png done + cp -va debian/preview.png mail/themes/linux/mail/preview.png - # We are doing it from sed commands - rm -v debian/patches/fixes/vp8_impl.cc-backporting-naming-for-constants.patch || true + # Useless since we are doing it ourselves + rm -v debian/patches/debian-hacks/changing-the-default-search-engine.patch || true quilt push -av - # Fix paths on makefile - sed -i 's|topsrcdir = [.][.]/[.][.]/[.][.]/|topsrcdir = @top_srcdir@|; - s|include $(topsrcdir)/config/autoconf.mk|include $(DEPTH)/config/autoconf.mk|; - s|include $(DEPTH)/config/rules.mk|include $(topsrcdir)/config/rules.mk|; - ' mail/branding/icedove/Makefile.in - - sed -i 's|topsrcdir = [.][.]/[.][.]/[.][.]/[.][.]|topsrcdir = @top_srcdir@|; - s|include $(topsrcdir)/config/autoconf.mk|include $(DEPTH)/config/autoconf.mk|; - s|include $(DEPTH)/config/rules.mk|include $(topsrcdir)/config/rules.mk|; - ' mail/branding/icedove/locales/Makefile.in - - # Fix package-manifest.in - sed -i '\|; Phishing Protection| s|$|\n#ifdef MOZ_SAFE_BROWSING|; - \|@BINPATH@/components/url-classifier[.]xpt| s|$|\n#endif| + # Remove url-classifier from package-manifest.in to build and disable Phishing Protection + sed -i '\|Phishing Protection|d + \|UrlClassifier|d + \|URLClassifier|d + \|url-classifier|d ' mail/installer/package-manifest.in # Fix branding @@ -88,62 +85,59 @@ prepare() { \|extensions[.]webservice[.]discoverURL| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g; ' mail/app/profile/all-thunderbird.js - cp "${srcdir}/mozconfig" .mozconfig + cp -v ${srcdir}/mozconfig .mozconfig - # configure script misdetects the preprocessor without an optimization level + # Configure script misdetects the preprocessor without an optimization level # https://bugs.archlinux.org/task/34644 sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure - # Install to /usr/lib/$pkgname - patch -Np1 -i "$srcdir/${pkgname}-install-dir.patch" - - # Add symlinks to use jquery files built for us - ln -s /usr/share/javascript/jquery/jquery.min.js mail/jquery - ln -s /usr/share/javascript/jquery-ui/jquery-ui.min.js mail/jquery - - # Fixing for libvpx >= 1.4.0 - sed -i 's|IMG_FMT_I420|VPX_IMG_FMT_I420|; - s|PLANE_U|VPX_PLANE_U|; - s|PLANE_V|VPX_PLANE_V|; - s|PLANE_Y|VPX_PLANE_Y|; - s|VPX_VPX_PLANE_|VPX_PLANE_|; - ' mozilla/content/media/encoder/VP8TrackEncoder.cpp \ - mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc + # Change the default search engine using our system-provided searchplugins + patch -Np1 -i ${srcdir}/changing-the-default-search-engine.patch + + # Add symlinks to use jquery files built by us + ln -vs /usr/share/javascript/jquery/jquery.min.js mail/jquery + ln -vs /usr/share/javascript/jquery-ui/jquery-ui.min.js mail/jquery } build() { - export DEBIAN_BUILD="comm-esr31" + export DEBIAN_BUILD=comm-esr${pkgver%%.*} - cd "${srcdir}/${DEBIAN_BUILD}" + cd ${srcdir}/${DEBIAN_BUILD} - export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/lib/${pkgname}" - export PYTHON="/usr/bin/python2" + export PYTHON=/usr/bin/python2 - make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" + make -f client.mk build } package() { - export DEBIAN_BUILD="comm-esr31" + export DEBIAN_BUILD=comm-esr${pkgver%%.*} + + cd ${srcdir}/${DEBIAN_BUILD} - cd "${srcdir}/${DEBIAN_BUILD}" + make -f client.mk DESTDIR=${pkgdir} install - make -j1 -f client.mk DESTDIR="${pkgdir}" install + install -vDm 644 ${srcdir}/vendor.js ${pkgdir}/usr/lib/${pkgname}/defaults/preferences/vendor.js - install -Dm644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${pkgname}/defaults/preferences/vendor.js" + # Install Icedove menu icon + install -vDm 644 debian/${pkgname}.xpm ${pkgdir}/usr/share/pixmaps/${pkgname}.xpm - for i in 16x16 22x22 24x24 32x32 48x48 64x64 128x128 256x256; do - install -Dm644 "debian/app-icons/${pkgname}${i/x*/}.png" "${pkgdir}/usr/share/icons/hicolor/$i/apps/${pkgname}.png" + # Install Icedove icons + for i in 16 22 24 32 48 64 128 256; do + install -vDm 644 debian/app-icons/${pkgname}${i}.png ${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/${pkgname}.png done - install -Dm644 "debian/app-icons/${pkgname}_icon.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg" - - install -Dm644 "${srcdir}/${pkgname}.desktop" \ - "${pkgdir}/usr/share/applications/${pkgname}.desktop" - - rm -rf "${pkgdir}"/usr/lib/${pkgname}/{dictionaries,hyphenation,searchplugins} - ln -sf /usr/share/hunspell "${pkgdir}/usr/lib/${pkgname}/dictionaries" - ln -sf /usr/share/hyphen "${pkgdir}/usr/lib/${pkgname}/hyphenation" - ln -sf /usr/lib/mozilla/searchplugins "${pkgdir}/usr/lib/${pkgname}/searchplugins" - - # We don't want the development stuff - rm -r "${pkgdir}"/usr/{include,lib/${pkgname}-devel,share/idl} + install -vDm 644 debian/app-icons/${pkgname}big.svg ${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg + + # Install Icedove desktop + install -vDm 644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop + + # Use system-provided dictionaries + rm -vrf ${pkgdir}/usr/lib/${pkgname}/{dictionaries,hyphenation,searchplugins} + ln -vsf /usr/share/hunspell ${pkgdir}/usr/lib/${pkgname}/dictionaries + ln -vsf /usr/share/hyphen ${pkgdir}/usr/lib/${pkgname}/hyphenation + + # Use system-provided searchplugins + ln -vsf /usr/lib/mozilla/searchplugins ${pkgdir}/usr/lib/${pkgname}/searchplugins + + # Remove development stuff + rm -vr ${pkgdir}/usr/{include,lib/${pkgname}-devel,share/idl} } diff --git a/libre/icedove/changing-the-default-search-engine.patch b/libre/icedove/changing-the-default-search-engine.patch new file mode 100644 index 000000000..845e4f2fa --- /dev/null +++ b/libre/icedove/changing-the-default-search-engine.patch @@ -0,0 +1,31 @@ +diff -Nur comm-esr38.orig/mail/locales/en-US/chrome/messenger-region/region.properties comm-esr38/mail/locales/en-US/chrome/messenger-region/region.properties +--- comm-esr38.orig/mail/locales/en-US/chrome/messenger-region/region.properties 2015-07-07 14:34:06.000000000 -0300 ++++ comm-esr38/mail/locales/en-US/chrome/messenger-region/region.properties 2015-08-16 13:30:55.466053010 -0300 +@@ -3,12 +3,12 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + # Default search engine +-browser.search.defaultenginename=Bing ++browser.search.defaultenginename=searx + + # Search engine order (order displayed in the search bar dropdown)s +-browser.search.order.1=Bing +-browser.search.order.2=Yahoo +-browser.search.order.3= ++browser.search.order.1=searx ++browser.search.order.2=DuckDuckGo HTML ++browser.search.order.3=DuckDuckGo Lite + + # To make mapit buttons to disappear in the addressbook, specify empty string. For example: + # mail.addr_book.mapit_url.format= +@@ -19,8 +19,8 @@ + # @ST == state + # @ZI == zip code + # @CO == country +-mail.addr_book.mapit_url.format=http://maps.google.com/maps?q=@A1%20@A2%20@CI%20@ST%20@ZI%20@CO +-mailnews.messageid_browser.url=http://groups.google.com/search?as_umsgid=%mid ++mail.addr_book.mapit_url.format= ++mailnews.messageid_browser.url= + + # Recognize non-standard versions of "Re:" in subjects from localized versions of MS Outlook et al. + # Specify a comma-separated list without spaces. For example: mailnews.localizedRe=AW,SV diff --git a/libre/icedove/icedove-install-dir.patch b/libre/icedove/icedove-install-dir.patch deleted file mode 100644 index 0c7ffaa4a..000000000 --- a/libre/icedove/icedove-install-dir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -upr comm-esr31.orig/mozilla/config/baseconfig.mk comm-esr31/mozilla/config/baseconfig.mk ---- comm-esr31.orig/mozilla/config/baseconfig.mk 2014-07-22 09:44:22.000000000 +0300 -+++ comm-esr31/mozilla/config/baseconfig.mk 2014-07-22 09:46:45.000000000 +0300 -@@ -4,7 +4,7 @@ - # whether a normal build is happening or whether the check is running. - includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) - sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) - ifndef TOP_DIST - TOP_DIST = dist diff --git a/libre/icedove/mozconfig b/libre/icedove/mozconfig index 3987c2c5a..20cb08590 100644 --- a/libre/icedove/mozconfig +++ b/libre/icedove/mozconfig @@ -3,10 +3,11 @@ ac_add_options --enable-application=mail ac_add_options --prefix=/usr ac_add_options --libdir=/usr/lib +ac_add_options --enable-pie # Icedove -ac_add_options --disable-official-branding ac_add_options --with-branding=mail/branding/icedove +#ac_add_options --enable-calendar # System libraries ac_add_options --with-system-nspr @@ -17,12 +18,12 @@ ac_add_options --with-system-bz2 ac_add_options --with-system-png ac_add_options --with-system-libevent ac_add_options --with-system-libvpx +ac_add_options --with-system-icu ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite ac_add_options --enable-system-ffi ac_add_options --enable-system-cairo ac_add_options --enable-system-pixman -ac_add_options --with-pthreads # Features ac_add_options --enable-startup-notification @@ -44,4 +45,6 @@ export MOZILLA_OFFICIAL=1 mk_add_options MOZILLA_OFFICIAL=1 # Parabola features +ac_add_options --disable-official-branding ac_add_options --disable-safe-browsing +ac_add_options --disable-url-classifier diff --git a/libre/icedove/vendor.js b/libre/icedove/vendor.js index 05cce3d61..4d58bfc4a 100644 --- a/libre/icedove/vendor.js +++ b/libre/icedove/vendor.js @@ -18,3 +18,6 @@ pref("social.directories", ""); // Disable the GeoLocation API for content pref("geo.enabled", false); + +// Pointing the "Help -> What's new" menu entry to mozilla.debian.net +pref("mailnews.start_page.override_url", "http://wiki.debian.org/Icedove/WhatsNew38"); diff --git a/libre/iceweasel-l10n/Makefile b/libre/iceweasel-l10n/Makefile deleted file mode 100644 index d596111f3..000000000 --- a/libre/iceweasel-l10n/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -#!/usr/bin/make -f -# Use this script to update the PKGBUILD's list of langpacks. -# This script depends on: -# - coreutils -# - pacman -# - sed - -# Variables: -# This is to get it from Debian Sid -debname=iceweasel-l10n -debver=9.0+debian -debrel=1 -debrepo=http://ftp.debian.org/debian/pool/main/ - -pkgver=9.0 -pkgrel=2.1 - -# Guts: ############################################################## - -default: PHONY all -all: PHONY - $(MAKE) clean - $(MAKE) PKGBUILD -.PRECIOUS: PKGBUILD - -PKGBUILD.list: Makefile - sed \ - -e 's/@DEBNAME@/$(debname)/' \ - -e 's/@DEBVER@/$(debver)/' \ - -e 's/@DEBREL@/$(debrel)/' \ - -e 's%@DEBREPO@%$(debrepo)%' \ - -e 's/@PKGVER@/$(pkgver)/' \ - -e 's/@PKGREL@/$(pkgrel)/' \ - -e "s/@LANGPACKS@/(phony)/" \ - -e '/CUT HERE/,$$d' \ - PKGBUILD.in > $@ - echo 'package() { exit 0; }' >> $@ - makepkg -gp $@ >> $@ -langpacks.txt: PKGBUILD.list Makefile - makepkg -dp $< - ls src/*/upstream | sed 's/\.xpi//' > $@ -PKGBUILD: PKGBUILD.in langpacks.txt Makefile - sed \ - -e 's/@DEBNAME@/$(debname)/' \ - -e 's/@DEBVER@/$(debver)/' \ - -e 's/@DEBREL@/$(debrel)/' \ - -e 's%@DEBREPO@%$(debrepo)%' \ - -e 's/@PKGVER@/$(pkgver)/' \ - -e 's/@PKGREL@/$(pkgrel)/' \ - -e "s/@LANGPACKS@/(`xargs echo < langpacks.txt`)/" \ - -e '/CUT HERE/d' \ - -e '/md5sums/,$$d' \ - PKGBUILD.in > $@ - makepkg -dg >> $@ - -clean: PHONY - rm -f PKGBUILD.list langpacks.txt - -.PHONY: PHONY FORCE diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index b75a01710..97ddcad1b 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: fauno <fauno@kiwwwi.com.ar> # Contributor: Figue <ffigue@gmail.com> -_debver=39.0.3 +_debver=40.0.3 _debrel=deb1 epoch=1 _pkgbase=iceweasel @@ -16,7 +16,7 @@ arch=('any') url="http://packages.debian.org/experimental/$_pkgbase" license=('MPL' 'GPL') depends=("$_pkgbase=$epoch:$pkgver") -makedepends=('unzip' 'zip') +makedepends=('unzip' 'zip' 'mozilla-searchplugins') _languages=( 'ach "Acholi"' @@ -137,7 +137,7 @@ _package() { bsdtar xf data.tar.xz mv -v usr/lib/iceweasel/browser/extensions/langpack-$1@iceweasel.mozilla.org.xpi . - rm -rv {control.tar.gz,data.tar.xz,debian-binary,etc,usr} + rm -rv {control.tar.gz,data.tar.xz,debian-binary,usr} rm -v $pkgbase-${1,,}_$_debver-${_debrel#deb}_all.deb unzip langpack-$1@iceweasel.mozilla.org.xpi -d $1 @@ -149,6 +149,9 @@ _package() { $1/browser/chrome/$1/locale/browser/devtools/webide.dtd \ $1/browser/chrome/$1/locale/browser/devtools/webide.properties rm -rv $1/chrome/$1/locale/$1/global-platform/{mac,win} + rm -rv $1/browser/chrome/$1/locale/browser/searchplugins + cp -av /usr/lib/mozilla/searchplugins $1/browser/chrome/$1/locale/browser + cd $1 zip -r langpack-$1@iceweasel.mozilla.org.xpi . mv -v langpack-$1@iceweasel.mozilla.org.xpi $srcdir @@ -159,92 +162,92 @@ _package() { "$pkgdir/usr/lib/iceweasel/browser/extensions/langpack-$1@iceweasel.mozilla.org.xpi" } -sha256sums=('6ab481740fdd48790329217a1bbe1fc7d2438bbdc1f767e21ba3d66084f4afcf' - '917ae11fc1f976e2ad1bd52ec55a724ea3bbfc3a0096890e458ecc51b9a1ebf6' - 'f6269f3bae576c01dec62f53b58ae736852137bd445471440fc85e26334824dc' - '4e5137ea0186cd714ab46115d1ce7294757d2176aa1b5ac8d66331b60bf381e4' - '22625c772d18e0fa3893c2aaf122a51704354458164eb3fd9d71dff9336f9a03' - '984934d480506f53f88af1c72f03eade75845d212bb5a582e354f83fe1ab4df5' - '77cf7eae203bcafd808a412df24374f9f8117cb7352b1d3ee13fea7ad417b149' - '1c2fd8f725102bf2276a2a66d11fc9ac2b49862fdabda7cbb4f68ffe15cd011b' - 'c653aae7dd0dd0d3a5be1825a6c3b66e88e6ab241820b1b5e3f6ef52b2c1d9fd' - '6a7dba4a352e18609ac72facce28ccfc15e435929c74892e0ca2130308af5a53' - '39de03cf67a7dbc0d43055e01e4032b3595fbb141ddcad9f7c29538f5eb8bf78' - 'd46478ca119f7e69276af994ab3c3db6a4bf8799fd2cba49b30b25cf53daa47f' - '6704afb48f3cfa00dd8010694c4cb095bb3f1352ec2aeba70b02f813ecdbaccb' - '770c5f7ee71b886c7f8974c400ebbae855446f983e3de3168aafc9143b4fb946' - '0eccda364422005ce40945086a598b47ed6196571eec34f5d8765259e3cbe3bf' - '6afc1b029f2721e9465faf64a062ccf2b61765e2edb1a922f4e883f8a7904ff0' - '42d311bf8f7a600e2def5647bc2ab1b7fdf4135e51818d416e0c359592687c17' - '6b77f1556f4c258eebd99a8f4486147aba37dd7673264758e9bed1f530d6b514' - 'bf29673686d3b6d2fe98681fa6d1a04175e0d68dd8f4837a71a5c93c6ea4d306' - '534e57b1d996a0630c05fa09d283945d1eafdca290cc8adfcc8730d9459e2ce1' - '1ed3d9dbc1aebf1aa3489efc34d570aa90bb218a8b25c896a157f7986d7e52bb' - '63a7a1ad83e5e4b47dcb6b757de746454bcca2b8385e856615f6f3f762cb0307' - '28310a77f3b4c691a7a580b39381db53ad09dc8be27e23a55171533745847058' - '7b3caea5f37e48744bd8b58565253907c1d45a2c90d7f5c9e240f65645291059' - 'e39c4e0512dfbf7f1a1b637dc7b3704dd3e6ed9b697ea114d638a12e4d2932cc' - '9472bda0060414476818fd6daab4fc57520f4414551f0183a736799ee0d31f92' - '46570e4fa2f5bbdc7ec6f97abf8f33ea7cb62f1ddc10e07840eed990d263e15e' - '268f884a507d03e94dd64be106d9521305f505c955ef69327eb6b18bc8acedf6' - '55d2cfb2ddbbd234cc2dcd0cad7c2c76bb38fe3ed42c6a23978a0564b74a49d0' - '1a835e853ce5e554ad88c5d3f05c98f58a87a2d3fcbbaa45465a2bcd9b16c1e9' - 'f372d78d160b24e12acdf4fd9cbd9cc1945cda9eeac51c58b94bb06b1c3fc8b1' - 'cc539a9a58b631ea3398aa212258504b1af3f57d43e3d251f1300a1f09d03a17' - '330762cf58ebb05a461ad640efe46a001b3abf1e371292719e405b16c970bf2b' - 'dbf3f28dfcc171a3bcf3f9fb563fbc898a3c226e7640f7ed5e00250d28373175' - '081a9e81f129de4e0d7ee93a1f1b5d5963cd3c327b41854771981627213acf25' - '7389700490bd83583347a0b4b96f8e983ba52ed604e34a307ce4171c0057c863' - '104b0d05ba00867490de48a52d28469cfd8ce9553404f4d1020d2e1befdaf49b' - '15e1985d9749a51e2a049e07b97674cc24694d27cfea8d26892fa9da81e1859e' - '6754a3bb1fa63c26221f32e01642768bc7bac3839f403cd4d717217182e3cc02' - 'adb38b26438da9d5d44c711d7210f6c442961d638fb84aa7c0c322f17d12139d' - '256d3ddefd879bfcedf9ff9b9d1ad2c852b99668366e6c9b0ce2520b48f261f3' - '5ebdd8b1bf5d4395dbcf53140d222f75e72845fce03a93e721247774cbc81a35' - '3543de4231ec0c2cc01923a0d94a41a1d987c1369a8e643ff3cdfe6251f66112' - '010b26b08aec37450d6a23043d2c352f81c9c45752742e28bfff420019ceb1a4' - '8b81953e58d2e076837d2913a61ba2bb718e1e4f6316d5fc879ba00ff5f46826' - '88ec31106d057b52580f3704893522bdd853df1a32e5dbe0d5340eee0491bf7d' - '7015fcd4568055905d74da5f3395f2b39a3388baef56341788eca4ec326110d5' - '8abb60d6ff6843f3ab609f26be2ad0b367f42a74ef116e73938c9a81421a4296' - '357d68d77d8535b3405d72236266c5c43ea4b798570fb390ff524949a67bda6d' - 'e83b7eb93cc897f3217e8815b34720130673bdadf4ed69215886aeb2e5696798' - '867f9559b697fb2447ca37e71e42f3ec9d9e861f1498b8f5bf8faec4812df2f7' - '48f1ac145483531881fdd95f3a4d39e6ae207d301fe3f4031a7be9a73a6dd1de' - '995532c4b7d81b21d3aee7deaf0024159aa8b417dd270b41e4f4a049449a61a2' - 'e99ab26f8435a77f4d30b8fb7736e865edebdec62a5ac910d5f049f6d3a2dcc6' - 'b0bf847bc8f9209b45c5896eabcc035bdb31b850d63be7f123df2c8f05444944' - '35b47ee3d72dfb337345cf1e84a3e1c9f16e492382c7c6cd41888304cb62b860' - '1cb14db19ce8a658df81f27ca3bcc427278cee9f8f04d9253122834153d58308' - 'fe7ba654111f853dc91651f9f8115e6afb35ca295bf1f8b6a38e3a84f9212cc8' - '90a312470c813e53a1a524a9687154ab62f1bb86e7a6fe0779dc6dda354011b7' - 'aecb8c247337e89a612b6f907ee79cda1cdc44710cf6f92e09b70d62b13304ec' - 'c1757f9c682d172810972674c9e00eae62d593d5202ee27feb42b6919283b473' - '005a5d870dfbdc922249bd2bb2d14934d417da254eac6118f3bffbd377098320' - '4ad01009ab22875174beec63de336081ec444a8c3ce0a5f2a7aba30701bf6641' - '98184bc2b03eee568e0c7eb82fbace5ac4198521f3006eb2675755fb67466fbc' - '9e835042eecf2ca3ce03b8f793882ae77f0838a986a3fc765f6311592365da96' - '3e1ad243dcbd1b2befdecb86fd062f75f11f62e813871d99310ab8d7e2dbaa12' - 'e4bba44c28733a487d47c3357b36dcec99ee4e3422cb933803f15cef6baaac51' - '796df43da460f20efc1654b28ec973de9a4d49c2f7c6c15d6118ca5135dd5e09' - 'b2d84e5273bdfac3e6bcddf2a80f0fbba76ab8f49c37d38104299e9890810f54' - '64d707020c56229a952fb3f51a676b65823de50564d519fb2c22f4562209153e' - 'bb3e8f5170286a6e0d4aa0c5d17e9773722791cfbea36ab6ed27daf217529bf6' - '2c1d19b6d0614250ab6b26197ec5f79df6cc01799cdd4c7316147598743e13a4' - 'a499c718cb9b0bd50895d1d5f84ae0e15edb901ad43409dfce52659eb309394c' - '5e886797c436e4e67e8d115b8e81cb7ef10bb672ab116b2b064c62f152eea9e8' - 'e7ded41881560e5ad466994ebc34e3c8f305849b2bde30fd2e6847649c696365' - 'b2c718a0ca865b482be0f1735f1cd5530ec3b448cb1869cbb45e3c14fccc45d9' - '9549570d5947a483dbfba24a043ea631a8ecdc1c1a84b7d0532b98718f7bdbb3' - 'c2e5ee57215c78b9214d7c13e47da72f8d9f82bd550ad2d714f127b96f36228c' - '6d178e5c5caccfbddfece737a53576a7bfd122da7ccb4183117c5395510aca73' - 'f5342875f4eeecc66b50cc05d8c689b879124984be9e03560ef45c7493b4722f' - 'd1f8732e1bece6597b3c2e988989d3faa8f0510c1ab3f9d97d64e8ae4d3f351b' - 'ff0500c343ab6617dd3d88e5a42ca1c332c432fac6b84776587f45f1e4cef1ae' - 'e37e0ec815638d63b6c0797969221db15ca52ab29e91a17e6fd363e5f92d1f20' - '680e3f90421abb1397101038585d0fc5cd82e5aec76b405d3021ec13d173d9a3' - '9af87f17a3b16a43d512d23656689e2c6ff8ee5518ed7a1196819a79ad716c1c' - '9b2ab341b3b9a5f31bdcdf6b2e8a661477b1dcf15cd830f8b7cf2288c23f4295' - '41aac09b324b3cf8239d60832cde22930e0271de7129f49d13702467dc6bf285' - 'af30f99754851f689b232472e28c3c620f81dc4522f2c0c0eee67e56f10d2dda' - '21c9063da957f43fb1570ab8a47818a732fa82fa924f7150a7362c5b641adab4') +sha256sums=('81d1f98843f29a81c10a9a96655505c72ee34acee45225dcd307ae9a123e63d9' + '86b47b16b829c20b98c55c86920f840e24ed7285fd12721e215d32284e0a37a0' + 'd6b588e9d0052aaa301c13d0f36424c7ed451078327432a6ca6f7ab1fe722c47' + '443e6895401b421d2198ed56eb6d1da656ca0f23fb4b37146944b34963bc5ff8' + '6ddcac571a55ced9275b58acae1a32e6575b64127c1221099c59fb83a2f2dcc6' + '350edd0664f8d169851c6f44962f5b48f779015098ec0473cbdc9e0012fcd88b' + '8e03ea10fae11112e51d9d7f05ba96305330a52b15857157c3344ccf9aab9626' + '8fc266421931939a03dc502a5ddc833240efee7077855e099c853a301d9f44d2' + '2d112a487986eba88c9702c4a760d630dec268d8f743ab728dbbdbaa97504983' + '68b9525ef3f69ee08c16b5c508d9badbfc22e6a42d025e037ba0472d1524a10e' + '466ae762ad899598f29368cd47efb01f461036dcf163a0598cab758530c70605' + 'fa813184f2953a5262be1bfcb4b507556de2a3c3ad27264a012397c41105a3ca' + '82f916f52fa37bbfef4d72c78a4b22e2a6f0fc0e534281250352b7b2d2f1964d' + '47e93986d1c1ba0e7ce84489f89ee1f3238faba9c3f5d3bd751372d021140197' + 'e1a9ae8114ea3eea4f5fd88fe311334cacd7041352f819e734d3b1bba41070b9' + 'e30f0180b578884c52288b97d85de8bbc9b167c14520dc010a0aba90b354955b' + '3da406f9a61f07182ce333b5f4e918c37c96e9631ea9eed0a358488c56bb8fce' + 'd633709e95775a051e9e400e04b97d1e95b5fe43ba4376c06ff6c40eb4149709' + '9954fab2a0ff5fbedfb4e9d0c01a9cd5551cf5b442310be67fd1617bf28fc60c' + '08dd910b3ca98baaf1bd2a8a5aae266244662477ca62725552c2d2e34a3b8b3c' + 'a24255006962e4119804191d45324d2bd92c3dc76c4b9a3b8c1bdaba2d869403' + '9d25c813f63ad35ec37341a4296d40759f04f42e4713327b081a2c74687c62ed' + 'c9c8de0212840831d616482c4cb10ca0c8bb7e9bdb22ca6e4bfc503c7f54c4c0' + 'c374ddf82403ccbe7255c450b74cd3beb4f27389e41c49df71df45d3451bd683' + 'c6287bb90609a5dd8ada1276c588e9c167812bdc35b2a33c41993a1fca26a63f' + '0a653d6b8ccea3d300084a1e9e381d012dd5bfab23e3dc18b0f58c31b8106e8b' + 'b325cea20c0de649029dbae5b86881bf94eff31107cb1a8d03b755e5712e91a8' + 'aea869be9d259982b666c0f8eac229b210429ee416f83de018a61c46300b0ecb' + '92ef61880643f35368ace2858b506ed4ccce9a353259ddf67cae9eef1a96586b' + '978ff6e3073c733d824e189bf6b0d607fe2b6c90acaf0439625f3af03bff103d' + '78d0d43ef9c50a1abf64e76406163611abcf81b76e625b0db2dfbfe1ecae6f7c' + '693205a11f6e889692b29e2f2e2daca934910289e4a3bac5478cf329c223834d' + '074d3d2e2650e5a1530502b4347c6a1559f8c8fd1b4ec81091b4464dff1115ed' + '98410ccd6e117704e12ca662c3f726379e618f8f891f7de6f32b33c0f33c233c' + 'a641c447c80175a312fa6a97f20603119232837e09e5e30cfab408ef05371587' + '71508ecafe9fd1c2a5e293eda2735e366f80c6f117cfc76ce84caa51e864729b' + 'b6ffc5e8f06f7d732b47463dd23f6a82fce73baefbd61ef268c2003a42dde26d' + '7f78d1f9abb554cac2b849c322279cde29ff317869ee1d64e7c53b2dcf35f20a' + '856484815c1919037fcba7281d122c5064f6c723629b108e7b271cce95452b8e' + 'bebbf39945828681158c920a3a67205919c93d39947761cab97a3cd8f95806f4' + '95948df90a11d45492f78127a12f7c85441ee6be99331f8697acf44f90c8eddb' + '54c5fe05d8f0222f3849fbd9349a0287475f7f5cfadde53bda268a8be4e2e73c' + '47b8023434a6386dc9553991ea3c47ee30aeef96d1510c30fa4b636518fb45f9' + 'd049504e419bfc5ad9d5a3a157f6c930a0a15c346c666a60412111b9623eb290' + '4857976f2a17fc1b785e99aa0f4c6b599a8495db2d5d8c3fe2e8bf8e1c695f12' + 'ec9619e8757495ce77500d9cfa0888d527b2ed9d7417a2302ee7487da7c8a484' + 'fd3d223fda20f22ebea5426caf29fc2358b170bb50b5f2e32eb88d9619eafd53' + '98e7e6741a7d791156f7eb9edd4e25acd54142d658928f4434ff0447a0b1fe08' + '7e11cd3b6c14c59f9a475a93a28d65cb5cae10b26fe936f81ed9069f7b903153' + '9e26dd8d34146ced2ed73e1abe629468de213c410a8efe5feb160056451feb05' + 'a8f0d23577569b5550aacdce1120a13bd7365e932343cc13a0409bc7d5fac2f0' + 'ad9d32ac29ece7c874316eb7712ef50e2e455e3d63ddacf439762a2aa0aef29d' + '7b493a0f8cbc9da57caef1363f5e518dad3966b157dfc0e1d6d457df0107d08f' + '095e9a301738d29e82ec14774f6197db9653a264ca17d00109eaac0a2bfaf7d0' + '236a1ae41013db11e58235d639860c44a2c274d61ce135390cf844e2dac285e2' + '3a0c47498128a84af7fa03f07a219e2f1986ed49afa9b0e9cc92805e97cb1ba1' + 'b6d578b014c9a283790007af286627c3ae414079c5d75cf015f5b973299904b3' + '431690723f492677e265d0663f49d60db789763189600a803b7921bec2ee9740' + '122ca76121d03f55d0be579261d29d4f53728b0bf5f50d30d50f96e6ad9038b2' + 'f60431ac3d478cfa5bd950d6dc0151598f6ef00d645eb7db3a2c90996629dc1b' + '122209392c40c9850bb1be008ad5788be26a654e26bea319f62a8bf78fccd7e0' + '907e3c213b40b0f1e4c734a2cad82d6866b89dc57f5bc5a5141baa937bffa084' + 'e66071671084c16ff7d3cd6bf5ca126b64ab9e1488db27bfed32de35d7dc88d9' + '79e0f363c9f26a59a6a56777ae8e04baa413ca37a61de6f56ce5683e4e1d37dd' + 'a27aa417ff7054c61bb83c84f5208bc510b13caea5507f38b4915a763defa88a' + '060612b92d791e246a37d86c240daf36f4cf8e46506eb71701339c127e193cfc' + '7a6da2d0b7db4c18e30037c395c3d0086ab81ae70bf228a1f439b86d87e6f77d' + '988efbd35f6e31f1870dc7630bd993ff24092074f85119e54f375cc79407c251' + '49fd82563ebbbaed7b57031ca16558660e32ca9eb452cf1f51374dc49cc945cf' + '8c1496efbdf6a65a45e999a617e404dca1553e8c22251b1ea7c0ef2e88cb0790' + '2cfed7210f1f8a20781d78b79d6574eb3fa07c2987dd60a60179881c7f3bda3b' + '8749a70412102617394d38f052531f5ad6b6f6f3955955d54c772bb18eedc13c' + 'f86b302b861f23a545be94c5419828942e9704813961f8920363de9e49082de8' + 'ad451ab2d1b8e70f3c36f507bd17737527c55e89300d1b0fb5bc1f8383277dce' + '0f63e7f77a1d9fe18c127bde579f118acd1ee6d181ecaa5cfac9068589ec6c86' + 'b5cae9e12ff2927f141f2e9fcff999b48d174df0487883300c7f7e739cf744da' + '9c1373adcd05c518147009ba7c39c0fc89f150aa1824b66e995d134aa79f971a' + '24bd221634e1e5b97e08557c6c77423792741db655d4bf9b3fc251a96801e598' + 'c330fa0c305d1f07f9a5887628c71e5dd5b8e603253eafc3a2f19f9b3ca41073' + '084dfa2356cdaf50bbbdec3132d7bea43003439cfe5b3a1afaadc7cc4604609f' + '3134e9f9d3d9d38457da0dcf8ad2fb25a4ad23867d3ed432ecc54193b8f47f2f' + '24b2e2f9c5ed64df69bdc4b397f286bd3213146d5d8e4fd534305439be414264' + '1bfdfb22a278001da030037b1da0820cdfa4c60f22b73d426f3ddf06ed8b5d2f' + 'f3439c09edd6c9528913a51dfe5bad6e8c2d1bdb7ac8c94f4959a788f030e34b' + '39feea871a31cee240b500c4a129d6a465cc60992cbb696a2107a093166cf520' + 'aeb5fa756166cd699cff21571a37214b63004e18845ff21df506f5c6799195c8' + '1fe91255bdb93fede031a70c981ef25898082eb15f98adcbbf04e8898ea91473' + '60c017d50b421ffc2901e667afda08d8e2fabb2792782696a9dbf7fc1ecf8fc6' + '618957dc579c831f5fac0c0bce5252d9494f9e42405819208cbcd57e159c515e') diff --git a/libre/iceweasel-l10n/region.properties b/libre/iceweasel-l10n/region.properties index ab27e9a0f..ce2c5ed4d 100644 --- a/libre/iceweasel-l10n/region.properties +++ b/libre/iceweasel-l10n/region.properties @@ -3,12 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Default search engine -browser.search.defaultenginename=DuckDuckGo HTML +browser.search.defaultenginename=searx # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=DuckDuckGo HTML -browser.search.order.2=DuckDuckGo Lite -browser.search.order.3=searx +browser.search.order.1=searx +browser.search.order.2=DuckDuckGo HTML +browser.search.order.3=DuckDuckGo Lite # increment this number when anything gets changed in the list below. This will # cause Firefox to re-read these prefs and inject any new handlers into the diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD index 607ffed76..09bd25f19 100644 --- a/libre/iceweasel-noscript/PKGBUILD +++ b/libre/iceweasel-noscript/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137608 2015-07-30 10:33:50Z spupykin $ +# $Id: PKGBUILD 138725 2015-08-24 13:10:01Z spupykin $ # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=iceweasel-noscript -pkgver=2.6.9.33 +pkgver=2.6.9.36 pkgrel=1 pkgdesc="Extension for iceweasel which disables script" arch=('any') @@ -13,7 +13,7 @@ depends=() makedepends=('unzip') replaces=('firefox-noscript') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('1ff903dddb39aafe62dc3b7194a2a39d') +md5sums=('fc131963fd1339ee173d74a95939de5a') package() { depends=("iceweasel") diff --git a/libre/iceweasel-theme-adwaita/PKGBUILD b/libre/iceweasel-theme-adwaita/PKGBUILD index a6c8de182..2e5940568 100644 --- a/libre/iceweasel-theme-adwaita/PKGBUILD +++ b/libre/iceweasel-theme-adwaita/PKGBUILD @@ -1,12 +1,13 @@ +# $Id: PKGBUILD 138643 2015-08-22 19:27:15Z muflone $ # Maintainer (Arch): Muflone http://www.muflone.com/contacts/english/ # Contributor (Arch): Diego Principe <cdprincipe@at@gmail@dot@com> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> +# Maintainer: André Silva <emulatorman@parabola.nu> # Contributor: Daniel Milewski <niitotantei@riseup.net> -# Contributor: André Silva <emulatorman@parabola.nu> pkgname=iceweasel-theme-adwaita -pkgver=38.1 -pkgrel=1.2 +pkgver=40.1 +pkgrel=1 pkgdesc="Adwaita theme for Iceweasel (Matches the default Gnome Shell theme)" url="https://addons.mozilla.org/en-US/firefox/addon/adwaita/" arch=('any') @@ -15,15 +16,11 @@ depends=("iceweasel") makedepends=('unzip') replaces=('firefox-theme-adwaita') source=("gnome-firefox-theme-${pkgver}.xpi"::"https://github.com/gnome-integration-team/firefox-gnome/releases/download/${pkgver}/gnome-firefox-theme.xpi") -sha256sums=('af050237a8cddee0f9123f81a9df58b0b97e94f84059cc67225183cb3243a70e') +sha256sums=('a87f3eb2687e912e47080caee34a4eb72970eb64e6b9583d504c73e9e6d56137') noextract=("gnome-firefox-theme-${pkgver}.xpi") prepare() { unzip -qo "gnome-firefox-theme-${pkgver}.xpi" -d "${pkgname}-${pkgver}" - # Fix for wrong version number - # https://github.com/gnome-integration-team/firefox-gnome/issues/337 - cd "${pkgname}-${pkgver}" - sed -i "s_\(<em:version>\)35.1\(</em:version>\)_\1${pkgver}\2_" "install.rdf" } package() { diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 13995fd95..8d19d4ae6 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -16,7 +16,7 @@ _pgo=true # We're getting this from Debian Experimental _debname=iceweasel -_debver=39.0.3 +_debver=40.0.3 _debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -27,10 +27,10 @@ pkgver=$_debver.$_debrel pkgrel=1 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." -arch=(i686 x86_64 mips64el) +arch=(i686 x86_64) license=(MPL GPL LGPL) -depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hicolor-icon-theme hunspell icu=55.1 libevent libvpx=1.4.0 libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification) -makedepends=(autoconf2.13 diffutils gst-plugins-base-libs imagemagick imake inetutils libidl2 libpulse librsvg libxslt mesa pkg-config python2 quilt unzip yasm zip) +depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hicolor-icon-theme hunspell icu=55.1 libevent libvpx=1.4.0 libxt mime-types mozilla-common nss sqlite startup-notification) +makedepends=(autoconf2.13 diffutils gst-plugins-base-libs imagemagick imake inetutils libidl2 libpulse librsvg libxslt mesa mozilla-searchplugins pkg-config python2 quilt unzip yasm zip) options=(!emptydirs !makeflags debug) if $_pgo; then makedepends+=(xorg-server-xvfb) @@ -53,15 +53,15 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" $pkgname-install-dir.patch vendor.js $pkgname-fixed-loading-icon.png) -sha256sums=('9675d5ba68ac2b27bca5dbd360439369496a50f0c4d85392762b84e4aa06ee58' - '77f7558e7d71c43b501e57e28cd2a5662d0ce295a2d5aef28c13305c0c722f47' - '521ad8ac7b84a9e00721087073ccb312a066bf92d4a6ef385c9d7597977e1ca4' - '4d5eb8d65a599ed9a46eda02ee96f62b8bde698d6fb29ab2a62dda9f1f30358f' +sha256sums=('2a2ded339bf491c4072fdcdc79cdc906733deffb8bcfa1d4fd9243e7f4ff9ee9' + 'ffab34628fdf8cdf5bf9167d2be2e244aaf3fa2802b7cf5165e18ced498cffab' + '8e0b2aa899f9c71dfabf61e8e3427bda9a6ef76330bda4428d1badddcfc331a5' + '1811eec7a02411295affc6ee66e3e4b9fd636b0bfbd313ce2a132beb124612d8' '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' '56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6' '2257dc69886bd0b72c48675a27c3a88b9cf6b598252c9e9f1c99763180684fc3' '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d' - '153057101644dc764f9cc502ce1c47c66bd89e3eff09db7e9c86d591d0d6f39d' + '0171656480113c6fabfdf5b14effe4ac67fda667682eb692badac81562afa696' '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213') prepare() { @@ -112,31 +112,6 @@ prepare() { # Load our build config, disable SafeSearch cp "$srcdir/mozconfig" .mozconfig - # From js on abslibre-mips64el.git - if [ "$CARCH" = "mips64el" ]; then - msg "Force disabling JIT." - sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \ - js/src/assembler/wtf/Platform.h - sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.{in,ref} - - echo "ac_add_options --disable-methodjit" >> .mozconfig - echo "ac_add_options --disable-tracejit" >> .mozconfig - fi - - # This is a bug, we should fix it - if [ "$CARCH" = "mips64el" ]; then - # Fix MIPS N32 support. - sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \ - js/src/assembler/wtf/Platform.h - # Disable JIT. - sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \ - js/src/assembler/wtf/Platform.h - sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.in - echo 'ac_add_options --disable-methodjit' >> .mozconfig - echo 'ac_add_options --disable-tracejit' >> .mozconfig - echo 'ac_add_options --disable-jemalloc' >> .mozconfig - fi - mkdir "$srcdir/path" # WebRTC build tries to execute "python" and expects Python 2 @@ -150,6 +125,10 @@ prepare() { # https://bugzilla.mozilla.org/show_bug.cgi?id=841734 cp "$srcdir/$pkgname-fixed-loading-icon.png" \ browser/themes/linux/tabbrowser/loading.png + + # Load our searchplugins + rm -rv browser/locales/en-US/searchplugins + cp -av /usr/lib/mozilla/searchplugins browser/locales/en-US } build() { @@ -197,10 +176,6 @@ package() { ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgname/dictionaries" ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgname/hyphenation" - rm -rf "$pkgdir/usr/lib/$pkgname/browser/"{searchplugins,plugins} - ln -sf /usr/lib/mozilla/plugins "$pkgdir/usr/lib/$pkgname/browser/plugins" - ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgname/browser/searchplugins" - # Workaround for now: #https://bugzilla.mozilla.org/show_bug.cgi?id=658850 ln -sf $pkgname "$pkgdir/usr/lib/$pkgname/$pkgname-bin" diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch index 89b5d9421..e465b3e41 100644 --- a/libre/iceweasel/libre.patch +++ b/libre/iceweasel/libre.patch @@ -1,7 +1,7 @@ diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js ---- mozilla-release.orig/browser/app/profile/firefox.js 2015-07-05 23:02:37.831899460 -0300 -+++ mozilla-release/browser/app/profile/firefox.js 2015-07-05 23:08:31.637567304 -0300 -@@ -284,11 +284,6 @@ +--- mozilla-release.orig/browser/app/profile/firefox.js 2015-08-14 02:22:36.676626042 -0300 ++++ mozilla-release/browser/app/profile/firefox.js 2015-08-14 02:23:52.119613185 -0300 +@@ -283,11 +283,6 @@ pref("browser.slowStartup.timeThreshold", 40000); pref("browser.slowStartup.maxSamples", 5); @@ -14,8 +14,8 @@ diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br pref("browser.casting.enabled", false); pref("browser.chrome.site_icons", true); diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozilla-release/browser/base/content/abouthome/aboutHome.css ---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css 2015-01-09 02:38:12.000000000 -0200 -+++ mozilla-release/browser/base/content/abouthome/aboutHome.css 2015-06-26 18:10:33.415681146 -0300 +--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css 2015-08-07 12:54:06.000000000 -0300 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.css 2015-08-14 02:46:44.222645356 -0300 @@ -49,11 +49,6 @@ background-repeat: no-repeat; } @@ -34,7 +34,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi height: 28px; - width: 70px; - min-width: 70px; -+ width: 47px; ++ width: 28px; } #searchIcon { @@ -179,9 +179,9 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi } diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js ---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2015-05-08 13:55:12.000000000 -0300 -+++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2015-05-15 06:52:57.450189850 -0300 -@@ -5,155 +5,44 @@ +--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2015-08-07 12:54:06.000000000 -0300 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2015-08-14 02:30:21.304032046 -0300 +@@ -5,155 +5,54 @@ "use strict"; const SEARCH_ENGINES = { @@ -190,7 +190,8 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil - // it will be scaled down as necessary on lower-dpi displays. - // This needs to be defined in a single line to keep the JS parser from creating many - // intermediate strings in memory. See bug 986672. -- image: "data:image/png;base64,\ ++ "searx": { + image: "data:image/png;base64,\ -iVBORw0KGgoAAAANSUhEUgAAAIwAAAA4CAYAAAAvmxBdAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ\ -bWFnZVJlYWR5ccllPAAAGrFJREFUeNrtfHt4VdW172+utZOASLJ5+BaIFrUeXkFsa0Fl++gDnznV\ -VlvFxt7aqvUUarXtse3Bau35ak/rZ9XT26NtfOvV6wFET+FYCQEKWqsQIT5RCAgSXnlnrzXneNw/\ @@ -313,41 +314,49 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil -k4w0jAcTAyllnBoh9Kxw/tEdS8cuT0WyH4vX1PYD5qMBzQDE2eFDxz09zsscWuwVHX6a8YwaFAiM\ -NAkHr4vdUdf82rQN6JwnSl4N4vAxeKdxP2A+mjXuKTvcXcY9TdOnyxPk4zKZ/vbRAqe75C3QfZZY\ -0P/y6/7299z+H4QrdGsoib8JAAAAAElFTkSuQmCC" -+ "DuckDuckGo HTML": { -+ image: "data:image/png;base64," + -+ "iVBORw0KGgoAAAANSUhEUgAAAC8AAAAcCAYAAADxyeavAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI" + -+ "WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH3AwBERgxGkWttAAABtVJREFUWMPtmGtwVdUVx397n3Pu" + -+ "K8m9uXlASCHQIBqeEooEDAymUEAKEaGlUoeOtbYdnSmdYjud6fjBdhytLS0zdRzbWkAGsCBtSktr" + -+ "RRQFY4gWaQZQUJFwCUhISHLzuo9zzj67Hy4Cd+RD6XDBD90z59uZdX5rrf96nC24xkd7jtlb/7VS" + -+ "da6jQEYKQiA8nUwlzcm39oWfXnvuWn5LXCtDyk6V9N6x4FGvu2ceydQw7amA8PsNAO04rvD7E8KQ" + -+ "HxlTqncWbnnu0c8MfM+C+mfVh8fv144jfXPuwJoxA5QLUoJS4Gm0cnF27cY52IKsGOFas2ofDP/q" + -+ "yT/cMPieurmjvb7BfdhOuTl1CtbM27FfehnnjTdB6+yXLQv/nfMwqqqwd7+COtWGHDKkMfit+xYH" + -+ "V349fl3hu2fPne6dOv26UXWL36qdjtO4H/ffLWBZYBgIkW1aaw1KIQwTY9IEzPFjcfY1opXXWdS8" + -+ "t0wI4V03+PPjqm1z0kTLml5D4hdrIBRC5ueh471opUDKTzlw0QlABAIEVq4gtXELsqT4fNH+vaVX" + -+ "yyD/F/Cu22a2GUOHWOb4sQw+9jhCCNwVy8k/2Exh6zEiL2zBP6cOhMg4cnm0hEAIgU6lSG36I8EH" + -+ "v4Pu6y/pqZu/PueR75k5Z40biz2ct3oVid+tg1QK7XlQ+XkYNZLQN+4lWDcbPA/7zztIbdmK09SM" + -+ "yAt9OgtKIaNRAl9dSnLbdl18+J2wEGIgJ/D9q38UTv1pR8z/pTmFWinsV19DSIl2XOTSeoqeWpsl" + -+ "j09kM/DIT0lt3IQwzSvKyJo0AW3bYPnejv69oSYnskm/uHsWEPEvXYK98x9gGBmAihFEn3yMWDxN" + -+ "v62ywPvTinP3fRsqKtBXip4QqLPtyLIyvFNt07TWMifwwm8u9dXOEKmGv4A/gAA0IKtvpVsZ9KYV" + -+ "QTO7UC1DUHZTOaG7F2d6/hWO19GJMfxzeL29xO9e/uOcwOu0PducUo29Zy/CMi/qTuWFKMz3Ma4k" + -+ "wJneNN5lPT5gSp7Z20bnvEXgumg0WpP14HlopTKySiTrcwM/mChGCoTnwWXRdfv60I7L0XMJxjze" + -+ "RMLObtnn+9OoqjGgTUhIZL7CrEohIypjRgjUqVPIMaPxunvK/lse86pkEwrlXRBqdtrbTqNTKaqG" + -+ "5nP8J7cT8sks3f980U1AF/0L41izbMzKNKJAkdxcTLohkmmpPXFkaSnuB8fNnMBj2y5CWGid5YBx" + -+ "tp1ET5xIOExFNPDJeonu24n38SqEHQMg72EDr89AfeQj9fxQnJYQWBrQiEAAkkkIBr3cwLtuHMMM" + -+ "ak8jjMuKsqOTwY4OIiMrLkksdQgduwvdaZHYPgwZcfE6LJzDQVSrD2FqxAVO7WmM4cOxm5qRxUWD" + -+ "uek20Wird+YMxpjKi5NTC4FQCrvlUNb4xyiBYCXCL7D35ZPcWEz6n2GwBf76OP5FvWhHZEpea0RJ" + -+ "MbqrC5Rqygm81xPfYL/+BoEV90A6fWnKmSbqrX+hL/RtAOEbTnrPQ6RfihD+dRuR52IUvnCCyLMx" + -+ "Aov6UCf8F78u8vLQA4MgJb6vLN2WE9kYI0c0qw8+tIXf5zMqKlAdHQgpQUqCh48woBQFFwYXgE4G" + -+ "SawvRmwqQg51EHkeXp+B126B1AhDAwI5rAwViyFLSwbyf/C93TmJfFHjniOypORo4olfEvjuA5d2" + -+ "dinxn4zRf64jOzITxyJ8mYKk3cQ94cc7b4KpEUYmb9p28N85D/e9Y1g1U1fmdKs0J0/+snYc7R46" + -+ "jDV9Gtp1M51HStz9zbTbJzkaf4/OdC/p2qkMhH0cmhhm/iOjcE0QaITI1IZ2HPzLl+G+exRhmrGC" + -+ "36zdcVUsVwsfeX7Dma6pMx+wX35lXWjVQ2DbOM1vIywLeeAg79c6bDj+NzpUlFHBCAM/HI0oD/KO" + -+ "GKS11MfYM2mUASiFf9kSdFc3duObnlU9+R5a3sr9Pl98oHG9CATWDf7sCXwLF+BbOB8MA1/LYVwv" + -+ "YzKW+Ji23pO0lucjTYnlaoS+tEn6Fi4A18VuasJXM21lYcPW5uv6D3t+0m3biceX+ZbUC1GQj9vV" + -+ "w7HVc9iXfpfKwhqmRW+hPFRG1zNP07Dr9yxr9RMYPwFj/FjUsfexG/e71heqv1nYsHXzDbk96K6u" + -+ "uctLJDeLcEG+cfMYjPvvxf/FuViX70QDg6gdO7Hbz2K/tg8ViyFCoVZZXl4f/ev2Izf83qZryvQ1" + -+ "Opn6vo7HTQBjdCWyrAxcB9V2Gu9sO0ipZTTab42rWhHetvnFz8yl08VM1NYtIZlcrNPpm73+AQtD" + -+ "ahkOJ3HVAWtW7a7wb596lf8f+A8mm/+hmETyjwAAAABJRU5ErkJggg==" ++iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAQAAAAAYLlVAAAACXBIWXMAAB8/AAAf\ ++PwHBe4GKAAAAB3RJTUUH3gELEhkV5/5DowAAAAJiS0dEAP+Hj8y/AAAHnUlEQVRo\ ++3u2Za4xdVRXHf2ef173z6kxnOjPMzE2pbVOJlKYipYE0Ko0EKfiKBpuABY1CTCDY\ ++RL9ASGiCfiDEUKOBGAFRgeCLQE1aP2jTCCnFgoq1pUNaCy0thdoW+ph7z9nn74ez\ ++77l3ppS5MzWDH1g7557csx/rv9de67/XPgc+lA/lQ6nLTS216vT6vSFvkB6CFlov\ ++al39eRx7/wbel8xTwf7grfBYdDw8Fh4JDvnPe2tpf99OjzO7VQCfRiw/i+oV5qEw\ ++i1VWuzrV5UqH2lRSqGCLuY7oLKPu5v5WAXwf8ch7PJ9lXo5smzrVrdnq0xwNaEAD\ ++6lefetWjLrUplj/Gte/Rdx7i8GSKjbtfBlxH94TKO8Nj8YUlUyIvZcqU3FUunpUo\ ++xdHT/u/pnzD2BqDMnEmW1t0PMQC8zEVFTWS2hktDQkICfHx8DAYPg7CAJcOSYklJ\ ++SEjesYt0qOj/FZ4EqizhlVYAJM6r7+QeAALzYrQ4ogGgygJWciG9RKS8wyv8hW2E\ ++UFdPjVrVrtSzAMxmHx1AyjJeasUHasiVLwAlM1pSl+ZoSOdrgS7Sau3QmfK21mqp\ ++FmieRtSvHrUrkDcXmMVbbrSEi1tzwkMFALHGPJGrH9Y8zdcV2qmzy2F9R/M1XxUN\ ++qEdtCt705vJqMVaNxa0B2NwA4ClSp/o0rHlaqNs1uazXRzVfFfWrWyUZNU3mFHNb\ ++i4KtjUc+Efnqw/X8sAX0t3J/0ScibK5KeKs1AJsaXhkSEBARsoq7WqSRK7mVjMg5\ ++bBNL7+LU+/f03b3Kt4gBAiIiYmJiflNUTy6X8Cr/dnbPsPXHt7GzNQsc5IXm+QeI\ ++B4lJsU0lG1eaa1ISbkOub1AHfpTftcqEsCb/6zsjLmYJVUc0deX2DDh19RbLQlaB\ ++6+8ArJ/ccg0A+3kAjIMgVsKE+VssEVW28U8ivAk1KSdZ6/jSx+QM96OpAIC7OZnT\ ++rcFyFSnpuPmLd1nLEJ9jJcP8etxCpFgS2ljk+hs8uJ4jkwNo9rITZiS4JCIiYIhv\ ++U3UOhbuf4BqepewCdCOHuZqqg5a5+9/YiyUlw/4ru6UV5zXj/i3wMHh4fIxqYYEU\ ++SwY8wMEmvD6/YnOTFfKWFfJlBK/TeFMG4FWM258GqTZ5QIbF5+kJXSM2uZCrA03p\ ++QXh4GOhqLXzHZ3blXL1H5OadW0R4wGuUJnR+nYwUuUUQahrOC7xpADglBIgTWFK3\ ++9+cAUjpIJ3Ruw2KdBwiLOAnOZ5SIKS+B9uZMBq9hScbFQZVLG+14jF34LCVpWgBL\ ++ypt4zm05ztQBsD2fDewo1jYlJSHlNDcU2YvlOEfp5JpxLVIS9ruIEU250RQs8IfM\ ++DfAuuwoL1G2whHsxJAjDDXyNR6GpRQ5iXxGW2ptpyj6g57PMGosl5k+sdpTi42Ew\ ++ZCxjI7/k77RxBZ/nFMm4vUEcZH8RltramgUmuGqwOf5kiTIxQ/wAHx/PXcaFV06y\ ++GdbZqlEi7mCUGmOMcZrkfPZN3QfINlgsCZY32AIu3UyoFVeVMcaoFjWN8iJ7yOoO\ +++Y/W1J9hAdqDE2ViYkpE3MUAfsHtuQ0akaCCATIyDHfzGlXGqHKa9OPZS60BmJhx\ ++JNS8lXWFe1leUEwjC6j/po6C8/IwL5ORYKmR7rTryKZnASgFu+NKnhFFVLidoLCB\ ++V9hA0AQMNrKRmgvF05hr39nQaiZlzngyZm+vFev+Ous5TEr1jDLm7jXG+DnPUCPF\ ++InxCXb5bQWrkTc8CgLkvXBsTuRKwmkWETfOv+wBY3uAR3iWlRkKGhw+kp5ZetmkH\ ++mZdNEwC++XO4Ii4SbY9BFnMps5zreYAh4a9s5wCJO5zVyBARJTxqta6bR39xnG47\ ++PQCA2RKtCF2iHRDgkTHEXGZTIuEoB9iLh+cYMAdgETElYgxVZn1z96NjtmynCQDf\ ++/DS4KT+c+oTF2dhrCsI8FtLieGox+C6EfRLMg2/cciToTafmhHWx2deTm2v/qUf2\ ++aU4z5kio6tguv/J/tT9aICNljFNUsYRkNw8+9UyHfGumY4EcXxs/878aNL0d8PBc\ ++ztBIzNM92Wc1yo08lA/pE1EiJsCSjB5ejMV6YtpygX9fsCdSWW3qUKc61akOtaus\ ++WOEJ/wlvVdFyFSfz422gsno0qIqG1b//MxdAZs71Nd6wd4f/nH8yqIW1sBbU/FHz\ ++E+/SM1otzHcpT75K6taAKhpWr5YtV3juEOobeFt+ijyLDLK7DiFWlwY0ohH11+Z9\ ++A9L/EYTJZVsOwShWp+ZoRBX1q/I9xfJb48dzFZ+H8kg1itShPg2rogH1P6ng4AxB\ ++gHV1CKHa1athVTSowd/e0y0zUxCurr/yCdSuXg2povPUN7qu9+1wpiBc1QjLNvVo\ ++SBUNqe/A8iXyj84QhH6O1GOirG4NakTD6jt55QUKNEMxMcQL+VL4KmmWY4Y+LfmU\ ++IjtDEEK21yFEDWY4/nifIvkzxQzrG2GZM8OIhl6pdimeuS8y9zbCMmeGEV1+ozpn\ ++jBz5Ll/Gbdj59m45egkzpx+ACzmQx0SoNnUfX7M0nTXTn8YifuzCMv3ER1RS6YP4\ ++PncxD/Oc+aK81Jfv8cGIh0AflPb/K/kvIVmE2W8jhuAAAAAASUVORK5CYII=" } }; @@ -372,7 +381,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil // This global tracks if the page has been set up before, to prevent double inits let gInitialized = false; let gObserver = new MutationObserver(function (mutations) { -@@ -161,7 +50,6 @@ +@@ -161,7 +60,6 @@ if (mutation.attributeName == "searchEngineName") { setupSearchEngine(); if (!gInitialized) { @@ -380,7 +389,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil gInitialized = true; } return; -@@ -186,118 +74,6 @@ +@@ -186,118 +84,6 @@ window.removeEventListener("resize", fitToWidth); }); @@ -499,7 +508,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil function onSearchSubmit(aEvent) { let searchText = document.getElementById("searchText"); -@@ -381,144 +157,6 @@ +@@ -381,144 +167,6 @@ document.dispatchEvent(event); } @@ -739,9 +748,9 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/sou # LOCALIZATION NOTE The correct localization of this file might be to keep it diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd mozilla-release/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd ---- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd 2015-06-30 19:57:55.000000000 -0300 -+++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd 2015-07-05 23:08:31.667565805 -0300 -@@ -83,7 +83,7 @@ +--- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd 2015-08-07 12:54:09.000000000 -0300 ++++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd 2015-08-14 02:23:52.122946356 -0300 +@@ -86,7 +86,7 @@ - checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled - boolean preference in about:config, in the options panel. --> <!ENTITY options.enableRemote.label3 "Enable remote debugging"> @@ -750,7 +759,7 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/too <!-- LOCALIZATION NOTE (options.disableJavaScript.label, - options.disableJavaScript.tooltip): This is the options panel label and -@@ -106,7 +106,7 @@ +@@ -109,7 +109,7 @@ <!-- LOCALIZATION NOTE (options.selectDefaultTools.label): This is the label for - the heading of group of checkboxes corresponding to the default developer - tools. --> @@ -781,8 +790,8 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/web <!ENTITY key_quit "W"> <!-- open menu --> diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/webide.properties mozilla-release/browser/locales/en-US/chrome/browser/devtools/webide.properties ---- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/webide.properties 2015-02-23 05:39:34.000000000 -0200 -+++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/webide.properties 2015-02-25 21:33:17.993024651 -0200 +--- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/webide.properties 2015-08-07 12:54:09.000000000 -0300 ++++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/webide.properties 2015-08-14 02:23:52.122946356 -0300 @@ -2,8 +2,8 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -794,7 +803,7 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/web runtimeButton_label=Select Runtime projectButton_label=Open App -@@ -47,10 +47,10 @@ +@@ -50,10 +50,10 @@ addons_stable=stable addons_unstable=unstable # LOCALIZATION NOTE (addons_simulator_label): This label is shown as the name of @@ -808,14 +817,14 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/web addons_uninstall_button=uninstall addons_adb_label=ADB Helper Add-on diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties ---- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2015-01-09 02:38:16.000000000 -0200 -+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2015-01-16 15:03:01.408257268 -0200 +--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2015-08-07 12:54:09.000000000 -0300 ++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2015-08-14 02:25:49.750538381 -0300 @@ -3,17 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Default search engine -browser.search.defaultenginename=Google -+browser.search.defaultenginename=DuckDuckGo HTML ++browser.search.defaultenginename=searx # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=Google @@ -826,9 +835,9 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio -# selection UI -browser.contentHandlers.types.0.title=My Yahoo! -browser.contentHandlers.types.0.uri=https://add.my.yahoo.com/rss?url=%s -+browser.search.order.1=DuckDuckGo HTML -+browser.search.order.2=DuckDuckGo Lite -+browser.search.order.3=searx ++browser.search.order.1=searx ++browser.search.order.2=DuckDuckGo HTML ++browser.search.order.3=DuckDuckGo Lite # increment this number when anything gets changed in the list below. This will # cause Firefox to re-read these prefs and inject any new handlers into the diff --git a/libre/iceweasel/mozconfig b/libre/iceweasel/mozconfig index bee4b2c90..0997645d4 100644 --- a/libre/iceweasel/mozconfig +++ b/libre/iceweasel/mozconfig @@ -36,6 +36,7 @@ ac_add_options --disable-debug-symbols # Parabola features ac_add_options --disable-safe-browsing +ac_add_options --disable-url-classifier ac_add_options --disable-eme # Other diff --git a/libre/iceweasel/vendor.js b/libre/iceweasel/vendor.js index 4f45d6ebb..3b04e96b4 100644 --- a/libre/iceweasel/vendor.js +++ b/libre/iceweasel/vendor.js @@ -97,9 +97,9 @@ pref("app.update.url", "http://127.0.0.1/");" // Spoof the useragent to a generic one pref("general.useragent.compatMode.firefox", true); // Spoof the useragent to a generic one -pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:38.0) Gecko/20100101 Firefox/38.0"); +pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:40.0) Gecko/20100101 Firefox/40.0"); pref("general.appname.override", "Netscape"); -pref("general.appversion.override", "38.0"); +pref("general.appversion.override", "40.0"); pref("general.buildID.override", "Gecko/20100101"); pref("general.oscpu.override", "Windows NT 6.1"); pref("general.platform.override", "Win32"); diff --git a/libre/java8-openjdk/JDK-8074312-hotspot.patch b/libre/java8-openjdk/JDK-8074312-hotspot.patch deleted file mode 100644 index a4e3f607f..000000000 --- a/libre/java8-openjdk/JDK-8074312-hotspot.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -r 61edd5c7412e make/linux/Makefile ---- a/make/linux/Makefile Mon Mar 02 18:12:06 2015 +0000 -+++ b/make/linux/Makefile Tue Mar 03 15:58:13 2015 +0100 -@@ -233,7 +233,7 @@ - # Solaris 2.5.1, 2.6). - # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok. - --SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% -+SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4% - OS_VERSION := $(shell uname -r) - EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION)) - diff --git a/libre/java8-openjdk/JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch b/libre/java8-openjdk/JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch deleted file mode 100644 index f6bd4ae98..000000000 --- a/libre/java8-openjdk/JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch +++ /dev/null @@ -1,46 +0,0 @@ - -# HG changeset patch -# User sgehwolf -# Date 1430335428 25200 -# Node ID 2a55e4998f0d28c7003a8a0f43d2c7602d89f54b -# Parent cd8fe1a9205aedb6b5a1fc16e664412e48aee565 -8078666: JVM fastdebug build compiled with GCC 5 asserts with "widen increases" -Summary: do the math on the unsigned type where overflows are well defined -Reviewed-by: kvn, aph - -diff -r cd8fe1a9205a -r 2a55e4998f0d src/share/vm/opto/type.cpp ---- a/src/share/vm/opto/type.cpp Wed Jun 10 20:15:29 2015 -0400 -+++ b/src/share/vm/opto/type.cpp Wed Apr 29 12:23:48 2015 -0700 -@@ -1180,11 +1180,11 @@ - // Certain normalizations keep us sane when comparing types. - // The 'SMALLINT' covers constants and also CC and its relatives. - if (lo <= hi) { -- if ((juint)(hi - lo) <= SMALLINT) w = Type::WidenMin; -- if ((juint)(hi - lo) >= max_juint) w = Type::WidenMax; // TypeInt::INT -+ if (((juint)hi - lo) <= SMALLINT) w = Type::WidenMin; -+ if (((juint)hi - lo) >= max_juint) w = Type::WidenMax; // TypeInt::INT - } else { -- if ((juint)(lo - hi) <= SMALLINT) w = Type::WidenMin; -- if ((juint)(lo - hi) >= max_juint) w = Type::WidenMin; // dual TypeInt::INT -+ if (((juint)lo - hi) <= SMALLINT) w = Type::WidenMin; -+ if (((juint)lo - hi) >= max_juint) w = Type::WidenMin; // dual TypeInt::INT - } - return w; - } -@@ -1438,11 +1438,11 @@ - // Certain normalizations keep us sane when comparing types. - // The 'SMALLINT' covers constants. - if (lo <= hi) { -- if ((julong)(hi - lo) <= SMALLINT) w = Type::WidenMin; -- if ((julong)(hi - lo) >= max_julong) w = Type::WidenMax; // TypeLong::LONG -+ if (((julong)hi - lo) <= SMALLINT) w = Type::WidenMin; -+ if (((julong)hi - lo) >= max_julong) w = Type::WidenMax; // TypeLong::LONG - } else { -- if ((julong)(lo - hi) <= SMALLINT) w = Type::WidenMin; -- if ((julong)(lo - hi) >= max_julong) w = Type::WidenMin; // dual TypeLong::LONG -+ if (((julong)lo - hi) <= SMALLINT) w = Type::WidenMin; -+ if (((julong)lo - hi) >= max_julong) w = Type::WidenMin; // dual TypeLong::LONG - } - return w; - } - diff --git a/libre/java8-openjdk/PKGBUILD b/libre/java8-openjdk/PKGBUILD index 4e5834fb4..528a1190a 100644 --- a/libre/java8-openjdk/PKGBUILD +++ b/libre/java8-openjdk/PKGBUILD @@ -11,9 +11,10 @@ pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk') pkgbase=java8-openjdk _java_ver=8 -# http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html -_jdk_update=51 -_jdk_build=16 +# Found @ http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html +_jdk_update=60 +# Found @ http://hg.openjdk.java.net/jdk8u/jdk8u +_jdk_build=24 pkgver=${_java_ver}.u${_jdk_update} _repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build} pkgrel=1.parabola1 @@ -30,20 +31,16 @@ source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/archive/${_repo_ver}.tar.gz jaxws-${_repo_ver}.tar.gz::${_url_src}/jaxws/archive/${_repo_ver}.tar.gz jaxp-${_repo_ver}.tar.gz::${_url_src}/jaxp/archive/${_repo_ver}.tar.gz langtools-${_repo_ver}.tar.gz::${_url_src}/langtools/archive/${_repo_ver}.tar.gz - nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz - JDK-8074312-hotspot.patch - JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch) - -sha256sums=('02eab2b937ed83c4505e93f58ad0b84a4e1a69e6d0baa4d041ec09ed98f18c2d' - '00d783dda3a7d87eb55a72febe7666c4b3297616ef3f11bbd679a05f19a81825' - 'a7236d5e5824cea20b48ca4efb8e5109007024af9b85214e9153c4d633665d0a' - 'f7554dc2fba5dfd36af0ed618ebe4c7b1527b5a067052299a1679a4142bbbeee' - 'aa202ddf3bcc1dc54723bb26c0ae5ccaefc1693647e6b463955065d2b1720382' - '5d6faf6c726392212659cebd93fdbf89a11b86bab60f5b220493d9d8e7ff0686' - '3171ec4dbd96747eeb876a8fd3caf1e1e52da3dc91b63308193c914a5501d6e4' - 'ffdd0446fce7b624f2cdc80297b99eecfdf30adfee39d3b8832a78c1dc202636' - '95fbd155806cac22de9e6df6f4f92ae79530f86d63cea1deaf98e607953e0b50' - '8df4d5d78753ebc5bc425fd1c8fe788106ac8b9d3155feb162a748a96c81cc05') + nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz) + +sha256sums=('97e368187b08067d57eb10bce08fb9057e63242c263f63ab7b7dd036cbf7aebf' + '76736786a1205367167b1abd10b6f173885f8ca8b2c3f56d5ff94b9e65a98865' + '9e7830631897679c97127387a1e962bfac46bafbe2b5a4be88e8bbf238e6c84c' + '999f0242213a4d048cee4e990d62024d277bcc8d49ab6fd807e32271fe078985' + '9643d8c22c4d6a680609168d84ac5a92421aa9973aea15cac687e4ccf167ff96' + 'cb854984714541af5cba6e920958d0c68f2de52bff5acf723387fa03d63d8c3d' + '93a553f2e9dfc820e50bfd70f989c96cd330857849ddba23dc50246e99ab1329' + '518dd422df787547bbeedb57a524501548a6efd8f96443ebc59276cc7922e801') case "${CARCH}" in 'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;; @@ -66,13 +63,6 @@ prepare() { do ln -s ../${subrepo}-${_repo_ver} ${subrepo} done - - cd "${srcdir}/hotspot-${_repo_ver}" - # https://bugs.openjdk.java.net/browse/JDK-8074312 - patch -p1 < "${srcdir}"/JDK-8074312-hotspot.patch - # https://bugs.archlinux.org/task/45386 - # https://bugs.openjdk.java.net/browse/JDK-8078666 - patch -p1 < "${srcdir}"/JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch } build() { diff --git a/libre/kdebase-konqueror/PKGBUILD b/libre/kdebase-konqueror/PKGBUILD index 662034484..4aa023576 100644 --- a/libre/kdebase-konqueror/PKGBUILD +++ b/libre/kdebase-konqueror/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 241398 2015-06-29 17:50:28Z arojas $ +# $Id: PKGBUILD 244976 2015-08-28 19:28:40Z arojas $ # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> @@ -6,26 +6,26 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname='kdebase-konqueror' -pkgver=15.04.3 -pkgrel=1.parabola1 +pkgver=15.08.0 +pkgrel=3.parabola1 arch=('i686' 'x86_64') url="http://kde.org/applications/internet/konqueror/" license=('GPL' 'LGPL' 'FDL') groups=('kde-applications' 'kdebase') conflicts=('kdebase-nsplugins' 'kdebase-konqueror-libre') replaces=('kdebase-nsplugins' 'kdebase-konqueror-libre') -makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'baloo4-widgets') +makedepends=('libkactivities4' 'cmake' 'automoc4' 'tidyhtml') source=("http://download.kde.org/stable/applications/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" 'konq-about-fsdg.diff') -sha1sums=('5f5168f3ad9d60b4dc9ba88b1d649364a0534fc6' +sha1sums=('637d91462557487fe2e1a1fc7cf38729658ded81' 'd6cbb53c04179b8180f9439eca156b7ff2e76b3a') pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation' -depends=('kdebase-dolphin' 'kdebase-keditbookmarks') +depends=('dolphinpart4' 'kdebase-keditbookmarks') optdepends=('kwebkitpart: to enable webkit engine') install='kdebase-konqueror.install' prepare() { - mkdir build + mkdir -p build cd kde-baseapps-${pkgver} # Don't recommend nonfree software or Google. diff --git a/libre/kdebase-runtime/PKGBUILD b/libre/kdebase-runtime/PKGBUILD index 09ca57226..504066520 100644 --- a/libre/kdebase-runtime/PKGBUILD +++ b/libre/kdebase-runtime/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 242137 2015-07-11 22:33:39Z arojas $ +# $Id: PKGBUILD 243783 2015-08-16 08:40:47Z arojas $ # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> @@ -6,18 +6,18 @@ pkgbase=kdebase-runtime pkgname=kdebase-runtime -pkgver=15.04.3 -pkgrel=4.parabola1 -pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers" +pkgver=15.08.0 +pkgrel=1.parabola2 +pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search engines" arch=('i686' 'x86_64') url='https://projects.kde.org/projects/kde/kde-runtime' license=('GPL' 'LGPL') makedepends=('kdelibs' 'libkactivities4' 'smbclient' 'libssh' 'libcanberra' 'libwebp' - 'pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen' 'networkmanager' 'boost') + 'pkg-config' 'cmake' 'automoc4' 'kdepimlibs4' 'openslp' 'doxygen' 'networkmanager' 'boost') source=("http://download.kde.org/stable/applications/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" 'duckduckgo_html.desktop' 'duckduckgo_lite.desktop') -sha1sums=('9984b22d2706e7d3efefeefca94a9de5b53f07c3' +sha1sums=('cf356762677d80adfec16d5756839cdfa36b84d7' 'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd' 'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b') @@ -52,7 +52,7 @@ build() { package_kdebase-runtime() { depends=('kdelibs' 'kactivities' 'libkactivities4' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' 'xorg-xauth' 'libwebp') - optdepends=('kdepimlibs: for kwalletd, and is needed by DrKonqi to send crash reports to KDE.org' 'kdebase-runtime-doc: KDE4 documentation' + optdepends=('kdepimlibs4: for kwalletd, and is needed by DrKonqi to send crash reports to KDE.org' 'kdebase-runtime-doc: KDE4 documentation' 'gdb: needed by DrKonqi to generate backtrace' 'khelpcenter: to display applications documentation') replaces=("${pkgname}-libre") conflicts=("${pkgname}-libre") diff --git a/libre/kdelibs/PKGBUILD b/libre/kdelibs/PKGBUILD index 861ea3b64..e670df6a9 100644 --- a/libre/kdelibs/PKGBUILD +++ b/libre/kdelibs/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 241398 2015-06-29 17:50:28Z arojas $ +# $Id: PKGBUILD 243962 2015-08-18 22:43:39Z arojas $ # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=kdelibs -pkgver=4.14.10 -_kdeappver=15.04.3 +pkgver=4.14.11 +_kdeappver=15.08.0 pkgrel=1.parabola1 pkgdesc="KDE Core Libraries, without nonfree plugins recommendation support" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ url='https://projects.kde.org/projects/kde/kdelibs' license=('GPL' 'LGPL' 'FDL') replaces=('kdelibs-libre') conflicts=('kdelibs-libre') -depends=('attica-qt4' 'libxss' 'krb5' 'qca' 'libdbusmenu-qt' 'polkit-qt4' +depends=('attica-qt4' 'libxss' 'krb5' 'qca' 'libdbusmenu-qt4' 'polkit-qt4' 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'strigi' 'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4' 'media-player-info' 'libxtst' 'libutempter' 'qtwebkit' 'icu') @@ -22,7 +22,7 @@ makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa' 'grantlee-qt4') install=${pkgname}.install source=("http://download.kde.org/stable/applications/${_kdeappver}/src/${pkgname}-${pkgver}.tar.xz" 'kde-applications-menu.patch' 'khtml-fsdg.diff' 'qt4.patch') -sha1sums=('0f05d3d85d29dae45f3d7c246ae2e88ea91ab94f' +sha1sums=('b25177d6247db8b83faed710f5e713a81c8f8e81' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'a1502a964081ad583a00cf90c56e74bf60121830' 'ed1f57ee661e5c7440efcaba7e51d2554709701c') diff --git a/libre/kdenetwork-kopete/PKGBUILD b/libre/kdenetwork-kopete/PKGBUILD index b010f0f3a..ee59492ad 100644 --- a/libre/kdenetwork-kopete/PKGBUILD +++ b/libre/kdenetwork-kopete/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 241398 2015-06-29 17:50:28Z arojas $ +# $Id: PKGBUILD 243760 2015-08-15 17:04:46Z arojas $ # Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=kdenetwork-kopete -pkgver=15.04.3 +pkgver=15.08.0 pkgrel=1.parabola1 pkgdesc='Instant Messenger, without nonfree Skype support' url='http://kde.org/applications/internet/kopete/' @@ -12,12 +12,12 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde-applications' 'kdenetwork') replaces=(${pkgname}-libre) conflicts=(${pkgname}-libre) -depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'qimageblitz' 'jsoncpp') -makedepends=('cmake' 'automoc4' 'boost' 'kdepim-libkdepim' 'mediastreamer' 'libgadu' 'kdepim-kleopatra') +depends=('kdebase-runtime' 'kdepimlibs4' 'qca-ossl' 'libotr' 'qimageblitz' 'jsoncpp') +makedepends=('cmake' 'automoc4' 'boost' 'mediastreamer' 'libgadu') optdepends=('mediastreamer: jingle support' 'libgadu: Gadu-Gadu protocol') install=${pkgname}.install source=("http://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz") -sha1sums=('1dddde0459361c47bcc7a27b88f8a53499cf73c5') +sha1sums=('b7ee954b96d10be94fa59b99ecdf302ba73c88f8') prepare() { cd kopete-${pkgver} diff --git a/libre/kdeutils-ark/PKGBUILD b/libre/kdeutils-ark/PKGBUILD deleted file mode 100644 index 99d261862..000000000 --- a/libre/kdeutils-ark/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 241398 2015-06-29 17:50:28Z arojas $ -# Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> -# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> -# Maintainer: André Silva <emulatorman@parabola.nu> - -pkgname=kdeutils-ark -pkgver=15.04.3 -pkgrel=1.parabola1 -pkgdesc='Archiving Tool, with unar support' -url='http://kde.org/applications/utilities/ark/' -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde-applications' 'kdeutils') -replaces=('kdeutils-ark-libre') -conflicts=('kdeutils-ark-libre') -depends=('kdebase-runtime' 'kdebase-lib' 'libarchive' 'qjson') -makedepends=('cmake' 'automoc4') -optdepends=('p7zip' 'zip' 'unzip' 'unar') -install=${pkgname}.install -source=("http://download.kde.org/stable/applications/${pkgver}/src/ark-${pkgver}.tar.xz" - 'ark-unar-06.patch') -sha1sums=('891187b1c49258ab461f1dcbfae82f0640a96f54' - 'a0a836950f185d9b2245204579f969203036fdec') - -prepare() { - cd "${srcdir}/ark-${pkgver}" - # This patch will allow Ark to use The Unarchiver command line utilities (unar/lsar) to operate on RAR files, particularly RARv3. - patch -Np1 -i "${srcdir}/ark-unar-06.patch" -} - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../ark-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DKDE4_BUILD_TESTS=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd $srcdir/build - make DESTDIR=$pkgdir install -} diff --git a/libre/kodi/PKGBUILD b/libre/kodi/PKGBUILD index e75f194b2..7fc416586 100644 --- a/libre/kodi/PKGBUILD +++ b/libre/kodi/PKGBUILD @@ -1,5 +1,5 @@ # vim:set ts=2 sw=2 et: -# $Id: PKGBUILD 137372 2015-07-24 12:44:05Z idevolder $ +# $Id: PKGBUILD 138449 2015-08-17 10:49:09Z idevolder $ # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer (Arch): BlackIkeEagle < ike DOT devolder AT gmail DOT com > # Contributor (Arch): Brad Fanella <bradfanella@archlinux.us> @@ -15,7 +15,7 @@ _prefix=/usr _pkgbase=kodi-libre pkgbase=kodi pkgname=kodi -pkgver=15.0 +pkgver=15.1 _codename=Isengard pkgrel=1.parabola1 arch=('i686' 'x86_64') @@ -38,10 +38,10 @@ source=( "https://repo.parabola.nu/other/$_pkgbase/$_pkgbase-$pkgver-$_codename.tar.gz" ) mksha256sums=( - '27dba173cfe74b323f4dbaa72ae2bfe5961f76c27bddcd5210253be91cae0dff' + '72b2610d8fbff807128d74429f25bf6716ba880c27c2c5d9fad012ec7fc70705' ) sha256sums=( - 'feff6278b4b6570f053c954bbe0ab0df34dbd5db5cadfdd37fea43b03306a437' + 'df1cf288ae5aba3ac6530b31b17eff98a2f2a853415eb0360707266e9688142d' ) mksource() { diff --git a/libre/lesspipe/PKGBUILD b/libre/lesspipe/PKGBUILD index 942b526de..cd1d317a9 100644 --- a/libre/lesspipe/PKGBUILD +++ b/libre/lesspipe/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 130024 2015-03-27 10:04:07Z spupykin $ +# $Id: PKGBUILD 138775 2015-08-26 07:05:31Z spupykin $ # Maintainer (Arch): Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor (Arch): solsTiCe d'Hiver <solstice.dhiver@gmail.com> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=lesspipe -pkgver=1.82 -pkgrel=3.parabola1 -pkgdesc='an input filter for the pager less, with libarchive support' +pkgver=1.83 +pkgrel=1.parabola1 +pkgdesc='an input filter for the pager less, with libarchive recommendation' depends=('less') arch=('any') license=('GPL') @@ -26,19 +26,9 @@ optdepends=('perl' 'imagemagick: support for some image file') url="http://www-zeuthen.desy.de/~friebel/unix/lesspipe.html" source=("http://downloads.sourceforge.net/project/lesspipe/lesspipe/$pkgver/lesspipe-$pkgver.tar.gz" - "html2text.patch::https://bugs.archlinux.org/task/44365?getfile=12856" - lesspipe.sh - libarchive.patch) -md5sums=('dd6f7bc9b9f9afaf04c9aa0cdbe9fe56' - '4bb768cae4723b3719a70848d36cf5fe' - '675b56f560c600f43108adfd98222251' - 'ec452ea980d5c1e254e9775fd424c18c') - -prepare() { - cd $srcdir/$pkgname-$pkgver - patch -p1 <$srcdir/html2text.patch - patch -Np1 -i ../libarchive.patch -} + lesspipe.sh) +md5sums=('fff7da88b9af45497c493a1682c67652' + '675b56f560c600f43108adfd98222251') build() { cd $srcdir/$pkgname-$pkgver diff --git a/libre/lesspipe/libarchive.patch b/libre/lesspipe/libarchive.patch deleted file mode 100644 index b4fb48788..000000000 --- a/libre/lesspipe/libarchive.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff --git a/configure b/configure -index cbd34af..5df4a31 100755 ---- a/configure -+++ b/configure -@@ -405,8 +405,7 @@ LESS_ADVANCED_PREPROCESSOR N # always interpret textlike files (html, ...) - # compression programs - bzip2 Y # include bzip2 and unzip code, it is fairly essential - unzip Y --rar Y --unrar Y -+bsdtar Y # bsdtar is the best free as in freedom alternative for rar - lzip N # default for lzma, lzip, xz, 7za should probably be N - lzma Y - xz Y -diff --git a/lesspipe.sh b/lesspipe.sh -index c80c75b..262a47b 100755 ---- a/lesspipe.sh -+++ b/lesspipe.sh -@@ -276,12 +276,8 @@ get_cmd () { - cmd=(isrpm "$2" "$file2") - elif [[ "$1" = *Zip* || "$1" = *ZIP* ]] && cmd_exist unzip; then - cmd=(istemp "unzip -avp" "$2" "$file2") -- elif [[ "$1" = *RAR\ archive* ]]; then -- if cmd_exist unrar; then -- cmd=(istemp "unrar p -inul" "$2" "$file2") -- elif cmd_exist rar; then -- cmd=(istemp "rar p -inul" "$2" "$file2") -- fi -+ elif [[ "$1" = *RAR\ archive* ]] && cmd_exist bsdtar; then -+ cmd=(bsdtar xOf "$2" "$file2") - elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7za; then - cmd=(istemp "7za e -so" "$2" "$file2") - elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7zr; then -@@ -534,14 +530,9 @@ isfinal() { - elif [[ "$1" = *Zip* || "$1" = *ZIP* ]] && cmd_exist unzip; then - msg "use zip_file${sep}contained_file to view a file in the archive" - istemp "unzip -lv" "$2" -- elif [[ "$1" = *RAR\ archive* ]]; then -- if cmd_exist unrar; then -- msg "use rar_file${sep}contained_file to view a file in the archive" -- istemp "unrar v" "$2" -- elif cmd_exist rar; then -- msg "use rar_file${sep}contained_file to view a file in the archive" -- istemp "rar v" "$2" -- fi -+ elif [[ "$1" = *RAR\ archive* ]] && cmd_exist bsdtar; then -+ msg "use rar_file${sep}contained_file to view a file in the archive" -+ bsdtar tf "$2" - elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7za; then - typeset res - res=$(istemp "7za l" "$2") -diff --git a/lesspipe.sh.in b/lesspipe.sh.in -index 407bc7d..753f3c5 100755 ---- a/lesspipe.sh.in -+++ b/lesspipe.sh.in -@@ -323,17 +323,10 @@ get_cmd () { - elif [[ "$1" = *Zip* || "$1" = *ZIP* ]] && cmd_exist unzip; then - set -A cmd istemp "unzip -avp" "$2" "$file2" - #endif --#ifdef unrar -- elif [[ "$1" = *RAR\ archive* ]]; then -- if cmd_exist unrar; then -- set -A cmd istemp "unrar p -inul" "$2" "$file2" -- elif cmd_exist rar; then -- set -A cmd istemp "rar p -inul" "$2" "$file2" -- fi --#elif rar -- elif [[ "$1" = *RAR\ archive* ]] && cmd_exist rar; then -- set -A cmd istemp "rar p -inul" "$2" "$file2" --#endif -+#ifdef bsdtar -+ elif [[ "$1" = *RAR\ archive* ]] && cmd_exist bsdtar; then -+ set -A cmd bsdtar xOf "$2" "$file2" -+#endif - #ifdef 7za - elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7za; then - set -A cmd istemp "7za e -so" "$2" "$file2" -@@ -705,19 +698,10 @@ isfinal() { - msg "use zip_file${sep}contained_file to view a file in the archive" - istemp "unzip -lv" "$2" - #endif --#ifdef unrar -- elif [[ "$1" = *RAR\ archive* ]]; then -- if cmd_exist unrar; then -- msg "use rar_file${sep}contained_file to view a file in the archive" -- istemp "unrar v" "$2" -- elif cmd_exist rar; then -- msg "use rar_file${sep}contained_file to view a file in the archive" -- istemp "rar v" "$2" -- fi --#elif rar -- elif [[ "$1" = *RAR\ archive* ]] && cmd_exist rar; then -+#ifdef bsdtar -+ elif [[ "$1" = *RAR\ archive* ]] && cmd_exist bsdtar; then - msg "use rar_file${sep}contained_file to view a file in the archive" -- istemp "rar v" "$2" -+ bsdtar tf "$2" - #endif - #ifdef 7za - elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7za; then diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD index 6b3bdf850..29384cde6 100644 --- a/libre/linux-libre-grsec/PKGBUILD +++ b/libre/linux-libre-grsec/PKGBUILD @@ -9,9 +9,9 @@ pkgbase=linux-libre-grsec _pkgbasever=4.1-gnu -_pkgver=4.1.5-gnu +_pkgver=4.1.6-gnu _grsecver=3.1 -_timestamp=201508102129 +_timestamp=201508181953 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -46,9 +46,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch') sha256sums=('48b2e5ea077d0a0bdcb205e67178e8eb5b2867db3b2364b701dbc801d9755324' 'SKIP' - '2f8b5d3176112f3b1679a77acbdd303e9e45bffde76a1972f7e90d457614afb3' + '335d3e07319ddf393c69e047c27bc5d28ee9e6126282619e3364db56a4331d34' 'SKIP' - 'edf25146df39686581c63b91c80e83dc4568bd50ce4d91ca73cfd00cf9e1528d' + 'a7898f8f6852998f76cdf0dd2a7cb6941c64be868f41745722eec363b6a1b35e' 'SKIP' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' 'SKIP' diff --git a/libre/linux-libre-lts-grsec/PKGBUILD b/libre/linux-libre-lts-grsec/PKGBUILD index 247d9152b..2da1845b8 100644 --- a/libre/linux-libre-lts-grsec/PKGBUILD +++ b/libre/linux-libre-lts-grsec/PKGBUILD @@ -9,9 +9,9 @@ pkgbase=linux-libre-lts-grsec _pkgbasever=3.14-gnu -_pkgver=3.14.50-gnu +_pkgver=3.14.51-gnu _grsecver=3.1 -_timestamp=201508102128 +_timestamp=201508181951 _replacesarchkernel=('linux-grsec-lts') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26-grsec-lts' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -51,9 +51,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'SKIP' - '811f8820610d9c8622229151c638f08d62b693242cac6b0c04428b6f5df863a2' + 'b12b75dfeac07e8bfe7c76bc7b4d9012dfbfc25201b7cdf9edf31466ee5a0fac' 'SKIP' - '64ca1482a0eb070df19c279dae3a34f9352e1cf6d7adce043497452891fde1f5' + '8b28ae2f46283274dbd6fd77bba36e6a18be633887125e2077ea269587b0b0b7' 'SKIP' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' 'SKIP' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 56ebfd485..ce763409a 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-lts _pkgbasever=3.14-gnu -_pkgver=3.14.50-gnu +_pkgver=3.14.51-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -47,7 +47,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'SKIP' - '811f8820610d9c8622229151c638f08d62b693242cac6b0c04428b6f5df863a2' + 'b12b75dfeac07e8bfe7c76bc7b4d9012dfbfc25201b7cdf9edf31466ee5a0fac' 'SKIP' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' 'SKIP' diff --git a/libre/linux-libre-pck/PKGBUILD b/libre/linux-libre-pck/PKGBUILD index 10480c3a8..be7b01f52 100644 --- a/libre/linux-libre-pck/PKGBUILD +++ b/libre/linux-libre-pck/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-pck _pkgbasever=4.1-gnu -_pkgver=4.1.5-gnu +_pkgver=4.1.6-gnu _pckpatchver=pck1 _replacesarchkernel=('linux-zen') @@ -44,9 +44,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li 'change-default-console-loglevel.patch') sha256sums=('48b2e5ea077d0a0bdcb205e67178e8eb5b2867db3b2364b701dbc801d9755324' 'SKIP' - '2f8b5d3176112f3b1679a77acbdd303e9e45bffde76a1972f7e90d457614afb3' + '335d3e07319ddf393c69e047c27bc5d28ee9e6126282619e3364db56a4331d34' 'SKIP' - '183faa34a7ef069ebb0f5f7c8f9a54cda01b81769092758e80bc29ac8006a338' + '985ce51fbed0630802badaa1848671395b897557969a1109bb0a9da28426d695' 'SKIP' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' 'SKIP' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 21de41ece..6611a4b2d 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -10,7 +10,7 @@ pkgbase=linux-libre # Build stock kernel #pkgbase=linux-libre-custom # Build kernel with a different name _pkgbasever=4.1-gnu -_pkgver=4.1.5-gnu +_pkgver=4.1.6-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -43,7 +43,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch') sha256sums=('48b2e5ea077d0a0bdcb205e67178e8eb5b2867db3b2364b701dbc801d9755324' 'SKIP' - '2f8b5d3176112f3b1679a77acbdd303e9e45bffde76a1972f7e90d457614afb3' + '335d3e07319ddf393c69e047c27bc5d28ee9e6126282619e3364db56a4331d34' 'SKIP' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' 'SKIP' diff --git a/libre/linux-libre/linux-libre_kernels_aur_version.sh b/libre/linux-libre/linux-libre_kernels_aur_version.sh index d80096905..a4db1583e 100755 --- a/libre/linux-libre/linux-libre_kernels_aur_version.sh +++ b/libre/linux-libre/linux-libre_kernels_aur_version.sh @@ -20,7 +20,7 @@ # You should have received a copy of the GNU General Public License # along with Parabola. If not, see <http://www.gnu.org/licenses/>. -for kernel in libre/linux-libre{,-lts,-grsec,-pck} kernels/linux-libre-{knock,grsec-knock,rt,pae,xen,lts-{grsec,knock,grsec-knock}}; do +for kernel in libre/linux-libre{,-lts{,-grsec},-grsec,-pck} kernels/linux-libre-{knock,grsec-knock,rt,pae,xen,lts-{knock,grsec-knock}}; do cd ~/packages/abslibre/$kernel sed -i '\|conflicts=| s|"${_replacesarchkernel\[@][/%a-z-]*}" ||' $(grep -rlI 'conflicts') cd ~/packages/abslibre diff --git a/libre/luxrays/PKGBUILD b/libre/luxrays/PKGBUILD index 36a84af49..596bedbe0 100644 --- a/libre/luxrays/PKGBUILD +++ b/libre/luxrays/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 132036 2015-04-23 06:25:24Z fyan $ +# $Id: PKGBUILD 138970 2015-08-30 09:36:35Z stativ $ # Maintainer (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com> # Maintainer: Márcio Silva <coadde@parabola.nu> pkgname='luxrays' -pkgver=1.4 -_pkgver=7c7127ee1fa4 -pkgrel=4.parabola1 +pkgver=1.5 +_pkgver=53c0b9a41ea2 +pkgrel=1.parabola1 pkgdesc="Accelerate the ray intersection process by using GPUs, with opencl-mesa recommendation" -arch=('i686' 'x86_64' 'mips64el') +arch=('x86_64') url="http://www.luxrender.net/" license=('GPL') -depends=('freetype2' 'libcl' 'libgl' 'libpng' 'openimageio') -makedepends=('cmake' 'boost' 'mesa' 'opencl-headers' 'glew' 'freeglut') +depends=('embree' 'libcl' 'libgl' 'openimageio') +makedepends=('boost' 'cmake' 'freetype2' 'libpng' 'mesa' 'opencl-headers' 'glew' 'freeglut') optdepends=('opencl-mesa: OpenCL support for AMD/ATI GPUs' \ - 'glew: demos (SmallLuxGPU etc.)' 'freeglut: demos (SmallLuxGPU etc.)' \ + 'glew: demos (SmallLuxGPU etc.)' \ + 'freeglut: demos (SmallLuxGPU etc.)' \ 'boost-libs: demos (SmallLuxGPU etc.)') options=('staticlibs') source=($pkgname-$pkgver.tar.bz2::https://bitbucket.org/luxrender/luxrays/get/${_pkgver}.tar.bz2 \ force_python3.diff) -md5sums=('2dda3316fb2ae9be6e58b5fa3a35de62' +md5sums=('b432c48332a765791d27aaa25fee4783' '3bfb5594a709d1ea772866d66904b8fd') prepare() { @@ -29,10 +30,10 @@ prepare() { build() { cd "$srcdir/luxrender-luxrays-$_pkgver" - cmake -DCMAKE_INSTALL_PREFIX=/usr \ + cmake . \ + -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_SKIP_RPATH=ON \ - -DLUXRAYS_DISABLE_OPENCL=OFF \ - . + -DLUXRAYS_DISABLE_OPENCL=OFF make } diff --git a/libre/luxrender/PKGBUILD b/libre/luxrender/PKGBUILD index 9a883bb48..4be470e69 100644 --- a/libre/luxrender/PKGBUILD +++ b/libre/luxrender/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 133054 2015-05-09 12:38:26Z stativ $ +# $Id: PKGBUILD 138968 2015-08-30 09:36:10Z stativ $ # Maintainer (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor (Arch): flixie <69one@gmx.net> # Contributor (Arch): Imanol Celaya <ornitorrincos@archlinux-es.org> # Maintainer: Márcio Silva <coadde@parabola.nu> pkgname=luxrender -pkgver=1.4 -_pkgver=dfd211d6faa0 -pkgrel=6.parabola1 +pkgver=1.5 +_pkgver=216e294b59e3 +pkgrel=1.parabola1 pkgdesc="Rendering system for physically correct, unbiased image synthesis, with opencl-mesa recommendation" -arch=('i686' 'x86_64' 'mips64el') +arch=('x86_64') url="http://www.luxrender.net/" license=('GPL') -depends=('boost-libs' 'freeimage' 'openexr' 'openimageio' 'libpng' 'libcl' 'libgl' 'fftw') -optdepends=('blender-addon-luxrender: Blender exporter' 'qt4: Qt GUI' +depends=('boost-libs' 'embree' 'freeimage' 'openexr' 'openimageio' 'libpng' 'libcl' 'libgl' 'fftw') +optdepends=('blender-addon-luxrender: Blender exporter' 'qt4: Qt GUI' \ 'python: pylux Python interface' 'opencl-mesa: OpenCL support for AMD/ATI GPUs') makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers') @@ -20,7 +20,7 @@ conflicts=("$pkgname-libre" "$pkgname-parabola") replaces=("$pkgname-libre" "$pkgname-parabola") source=(https://bitbucket.org/luxrender/lux/get/${_pkgver}.tar.bz2 \ force_python3.diff) -md5sums=('7591ac4e86d0232245af38f6cf932c02' +md5sums=('531234aaa2969c3aacf2a69ed7835335' '42692e65eabc5828693e2682e94b7c64') prepare() { @@ -33,13 +33,13 @@ build() { cd "$srcdir"/luxrender-lux-$_pkgver - cmake -DCMAKE_INSTALL_PREFIX=/usr \ + cmake . \ + -DCMAKE_INSTALL_PREFIX=/usr \ -DLUXRAYS_DISABLE_OPENCL=OFF \ -DPYTHON_CUSTOM=ON \ -DPYTHON_LIBRARIES=/usr/lib/libpython3.4m.so \ -DPYTHON_INCLUDE_PATH=/usr/include/python3.4m/ \ - -DCMAKE_EXE_LINKER_FLAGS=-lpthread \ - . + -DCMAKE_EXE_LINKER_FLAGS=-lpthread make } @@ -50,7 +50,7 @@ package() { # fix library path on x86_64 [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib - #install pylux + # install pylux install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.4/pylux.so } diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD index 433ab70e3..2b62e0a44 100644 --- a/libre/mesa-libcl/PKGBUILD +++ b/libre/mesa-libcl/PKGBUILD @@ -4,10 +4,10 @@ pkgbase=mesa _pkgname=libcl pkgname=$pkgbase-$_pkgname -pkgver=10.6.4 +pkgver=10.6.5 pkgrel=1 pkgdesc='Mesa 3-D OpenCL library and ICD loader' -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url="http://${pkgbase}3d.sourceforge.net" license=('custom') depends=("$pkgbase" 'libclc' 'clang') @@ -19,7 +19,7 @@ conflicts=("$_pkgname" "$_pkgname-libre" 'opencl-nvidia' 'opencl-nvidia-304xx' ' replaces=("$_pkgname" "$_pkgname-libre" 'opencl-nvidia' 'opencl-nvidia-304xx') source=(ftp://ftp.freedesktop.org/pub/$pkgbase/$pkgver/$pkgbase-$pkgver.tar.xz{,.sig} 0001-i965-Remove-early-release-of-DRI2-miptree.patch) -sha512sums=('913800ebb73bde04ceed1dfe0c622f36622a89be2a795b63e6b05fbb59a982f4b0d83531b2b1697aeb20bab0aac4b82adf8e7d1985713e525d722b3b7b58f683' +sha512sums=('46be6bd683d286bdf9ab8b4c1b1b32f89c95701b8c48cee49b060f5beaacea4540a69b99b4fde0f80acdd8e725552bef17dbd4251b9e977caeb5fd9d0ba56595' 'SKIP' '86bfab88131440d1e5aefd157f12d8927c1a71af4f29b43c607bd2c37ee87f8164c92dc4309fade3c667f7d5907f99d0aa79b5fee1b8ff0eafe5f6d869bbed99') validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov@gmail.com> diff --git a/libre/midori-gtk3/PKGBUILD b/libre/midori-gtk3/PKGBUILD index 9bb49c055..36ed4f4ee 100644 --- a/libre/midori-gtk3/PKGBUILD +++ b/libre/midori-gtk3/PKGBUILD @@ -9,9 +9,9 @@ pkgname=midori-gtk3 pkgver=0.5.10 -pkgrel=1.parabola1 -pkgdesc='Lightweight web browser (GTK3), without non-privacy search providers' -arch=('x86_64' 'i686' 'mips64el') +pkgrel=1.parabola2 +pkgdesc='Lightweight web browser (GTK3), without non-privacy search engines' +arch=('x86_64' 'i686') url='http://www.midori-browser.org/' license=('LGPL2.1') install='midori.install' @@ -31,7 +31,7 @@ sha256sums=('702344f68d7f034866a46398e35b3c16a5a5f3e431a5d916ea5efc3eaaa3e46f') prepare() { #cd "${pkgname/-gtk3}-$pkgver" - # remove non-privacy search providers + # remove non-privacy search engines sed -i 's|Duck Duck Go|DuckDuckGo HTML| s|duckduckgo[.]com|duckduckgo.com/html| \|Yahoo|d diff --git a/libre/midori/PKGBUILD b/libre/midori/PKGBUILD index ab72b2c62..a400cbcb0 100644 --- a/libre/midori/PKGBUILD +++ b/libre/midori/PKGBUILD @@ -9,8 +9,8 @@ pkgname=midori pkgver=0.5.10 -pkgrel=1.parabola1 -pkgdesc='Lightweight web browser (GTK2), without non-privacy search providers' +pkgrel=1.parabola2 +pkgdesc='Lightweight web browser (GTK2), without non-privacy search engines' arch=('x86_64' 'i686') url='http://www.midori-browser.org/' license=('LGPL2.1') @@ -26,7 +26,7 @@ sha256sums=('702344f68d7f034866a46398e35b3c16a5a5f3e431a5d916ea5efc3eaaa3e46f') prepare() { #cd "$pkgname-$pkgver" - # remove non-privacy search providers + # remove non-privacy search engines sed -i 's|Duck Duck Go|DuckDuckGo HTML| s|duckduckgo[.]com|duckduckgo.com/html| \|Yahoo|d diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD index e99b42fb4..832756cbf 100644 --- a/libre/mozilla-searchplugins/PKGBUILD +++ b/libre/mozilla-searchplugins/PKGBUILD @@ -9,35 +9,38 @@ # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> pkgname=mozilla-searchplugins -pkgver=1.7 +pkgver=1.9 pkgrel=1 pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers." arch=('any') license=('MPL' 'GPL' 'LGPL') url="https://www.parabola.nu/" source=( + list.txt + searx.xml duckduckgo-html.xml duckduckgo-lite.xml seeks.xml::https://seeks.ru/opensearch.xml - searx.xml::https://searx.laquadrature.net/opensearch.xml internet-archive.xml parabola-packages.xml::https://www.parabola.nu/opensearch/packages/ - parabola-wiki-en.xml:: - yacy.xml::http://search.yacy.net/opensearchdescription.xml + parabola-wiki-en.xml + yacy.xml wikipedia-en.xml::https://en.wikipedia.org/w/opensearch_desc.php ) package() { - install -m755 -d "${pkgdir}/usr/lib/mozilla/searchplugins" - install -m644 "${srcdir}"/*.xml "${pkgdir}/usr/lib/mozilla/searchplugins" + install -m755 -d "${pkgdir}/usr/lib/mozilla/searchplugins" + install -m644 "${srcdir}"/*.xml "${pkgdir}/usr/lib/mozilla/searchplugins" + install -m644 "${srcdir}"/list.txt "${pkgdir}/usr/lib/mozilla/searchplugins" } -sha256sums=('cd8e9eb45567cb362acf607e65fcabfaf682f0051a251aa6a616ca25cd77106e' +sha256sums=('f05c7f1505a2511ccb5a58174ed52605238431ae880e526176393fe72b73ffb9' + '3e95dff7d062889c86531aa80962b80e3c0d6c87244ec838963b313193c3f367' + 'cd8e9eb45567cb362acf607e65fcabfaf682f0051a251aa6a616ca25cd77106e' '1cd8dc8d1275a4e1fa10187997a0558f578c21a91e97c48222448e485de35d6a' '7ee18525957e05326db0bb2d6264bdceaf754b4df0a2fbe27d36707b7afae821' - '6811be771ea12bea5ac52e04a3d57a753b3e38553020e4acae3b62b04e07f76d' 'ec4a1054f4b9cca9cf410b3302fa86e2322a8dfdfe560b5dbbabba7d0bdd3197' '2480ca917a10d0955b818498171ecff6b86faf2eeae25684dd617ec4da40d585' '5e249e946193da91c95ade7f60fe227c28b99ecf40aba717b77d004ac9080905' - '3913ad1b9951a7550c73a6ff6690120b9a3663f55ddce62fb74e9b4018b580cc' - '6887bd0cdf2cf116c35b689b78cdd97657376b57cd6b4d51c940af0f22c5c232') + '8ed0e09a96020c5ba0df60b74c37a23d1bb1f2c80b04608abed3d1d450001722' + '44d8d849806e21a8e32489ade3e8191c4b4b23b416632beb258dea2484ed4ea3') diff --git a/libre/mozilla-searchplugins/list.txt b/libre/mozilla-searchplugins/list.txt new file mode 100644 index 000000000..030fb86a9 --- /dev/null +++ b/libre/mozilla-searchplugins/list.txt @@ -0,0 +1,9 @@ +duckduckgo-html +duckduckgo-lite +internet-archive +parabola-packages +parabola-wiki-en +searx +seeks +wikipedia-en +yacy diff --git a/libre/mozilla-searchplugins/searx.xml b/libre/mozilla-searchplugins/searx.xml new file mode 100644 index 000000000..e5eaed548 --- /dev/null +++ b/libre/mozilla-searchplugins/searx.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> + <ShortName>searx</ShortName> + <Description>Search searx</Description> + <Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAQAAAAAYLlVAAAACXBIWXMAAB8/AAAfPwHBe4GKAAAAB3RJTUUH3gELEhkV5/5DowAAAAJiS0dEAP+Hj8y/AAAHnUlEQVRo3u2Za4xdVRXHf2ef173z6kxnOjPMzE2pbVOJlKYipYE0Ko0EKfiKBpuABY1CTCDYRL9ASGiCfiDEUKOBGAFRgeCLQE1aP2jTCCnFgoq1pUNaCy0thdoW+ph7z9nn74ez77l3ppS5MzWDH1g7557csx/rv9de67/XPgc+lA/lQ6nLTS216vT6vSFvkB6CFloval39eRx7/wbel8xTwf7grfBYdDw8Fh4JDvnPe2tpf99OjzO7VQCfRiw/i+oV5qEwi1VWuzrV5UqH2lRSqGCLuY7oLKPu5v5WAXwf8ch7PJ9lXo5smzrVrdnq0xwNaEAD6lefetWjLrUplj/Gte/Rdx7i8GSKjbtfBlxH94TKO8Nj8YUlUyIvZcqU3FUunpUoxdHT/u/pnzD2BqDMnEmW1t0PMQC8zEVFTWS2hktDQkICfHx8DAYPg7CAJcOSYklJSEjesYt0qOj/FZ4EqizhlVYAJM6r7+QeAALzYrQ4ogGgygJWciG9RKS8wyv8hW2EUFdPjVrVrtSzAMxmHx1AyjJeasUHasiVLwAlM1pSl+ZoSOdrgS7Sau3QmfK21mqpFmieRtSvHrUrkDcXmMVbbrSEi1tzwkMFALHGPJGrH9Y8zdcV2qmzy2F9R/M1XxUNqEdtCt705vJqMVaNxa0B2NwA4ClSp/o0rHlaqNs1uazXRzVfFfWrWyUZNU3mFHNbi4KtjUc+Efnqw/X8sAX0t3J/0ScibK5KeKs1AJsaXhkSEBARsoq7WqSRK7mVjMg5bBNL7+LU+/f03b3Kt4gBAiIiYmJiflNUTy6X8Cr/dnbPsPXHt7GzNQsc5IXm+QeIB4lJsU0lG1eaa1ISbkOub1AHfpTftcqEsCb/6zsjLmYJVUc0deX2DDh19RbLQlaB6+8ArJ/ccg0A+3kAjIMgVsKE+VssEVW28U8ivAk1KSdZ6/jSx+QM96OpAIC7OZnTrcFyFSnpuPmLd1nLEJ9jJcP8etxCpFgS2ljk+hs8uJ4jkwNo9rITZiS4JCIiYIhvU3UOhbuf4BqepewCdCOHuZqqg5a5+9/YiyUlw/4ru6UV5zXj/i3wMHh4fIxqYYEUSwY8wMEmvD6/YnOTFfKWFfJlBK/TeFMG4FWM258GqTZ5QIbF5+kJXSM2uZCrA03pQXh4GOhqLXzHZ3blXL1H5OadW0R4wGuUJnR+nYwUuUUQahrOC7xpADglBIgTWFK39+cAUjpIJ3Ruw2KdBwiLOAnOZ5SIKS+B9uZMBq9hScbFQZVLG+14jF34LCVpWgBLypt4zm05ztQBsD2fDewo1jYlJSHlNDcU2YvlOEfp5JpxLVIS9ruIEU250RQs8IfMDfAuuwoL1G2whHsxJAjDDXyNR6GpRQ5iXxGW2ptpyj6g57PMGosl5k+sdpTi42EwZCxjI7/k77RxBZ/nFMm4vUEcZH8RltramgUmuGqwOf5kiTIxQ/wAHx/PXcaFV06yGdbZqlEi7mCUGmOMcZrkfPZN3QfINlgsCZY32AIu3UyoFVeVMcaoFjWN8iJ7yOoO+Y/W1J9hAdqDE2ViYkpE3MUAfsHtuQ0akaCCATIyDHfzGlXGqHKa9OPZS60BmJhxJNS8lXWFe1leUEwjC6j/po6C8/IwL5ORYKmR7rTryKZnASgFu+NKnhFFVLidoLCBV9hA0AQMNrKRmgvF05hr39nQaiZlzngyZm+vFev+Ous5TEr1jDLm7jXG+DnPUCPFInxCXb5bQWrkTc8CgLkvXBsTuRKwmkWETfOv+wBY3uAR3iWlRkKGhw+kp5ZetmkHmZdNEwC++XO4Ii4SbY9BFnMps5zreYAh4a9s5wCJO5zVyBARJTxqta6bR39xnG47PQCA2RKtCF2iHRDgkTHEXGZTIuEoB9iLh+cYMAdgETElYgxVZn1z96NjtmynCQDf/DS4KT+c+oTF2dhrCsI8FtLieGox+C6EfRLMg2/cciToTafmhHWx2deTm2v/qUf2aU4z5kio6tguv/J/tT9aICNljFNUsYRkNw8+9UyHfGumY4EcXxs/878aNL0d8PBcztBIzNM92Wc1yo08lA/pE1EiJsCSjB5ejMV6YtpygX9fsCdSWW3qUKc61akOtausWOEJ/wlvVdFyFSfz422gsno0qIqG1b//MxdAZs71Nd6wd4f/nH8yqIW1sBbU/FHzE+/SM1otzHcpT75K6taAKhpWr5YtV3juEOobeFt+ijyLDLK7DiFWlwY0ohH11+Z9A9L/EYTJZVsOwShWp+ZoRBX1q/I9xfJb48dzFZ+H8kg1itShPg2rogH1P6ng4AxBgHV1CKHa1athVTSowd/e0y0zUxCurr/yCdSuXg2povPUN7qu9+1wpiBc1QjLNvVoSBUNqe/A8iXyj84QhH6O1GOirG4NakTD6jt55QUKNEMxMcQL+VL4KmmWY4Y+LfmUIjtDEEK21yFEDWY4/nifIvkzxQzrG2GZM8OIhl6pdimeuS8y9zbCMmeGEV1+ozpnjBz5Ll/Gbdj59m45egkzpx+ACzmQx0SoNnUfX7M0nTXTn8YifuzCMv3ER1RS6YP4PncxD/Oc+aK81Jfv8cGIh0AflPb/K/kvIVmE2W8jhuAAAAAASUVORK5CYII=</Image> + <InputEncoding>UTF-8</InputEncoding> + <LongName>searx metasearch</LongName> + + <Url type="text/html" method="post" template="https://searx.laquadrature.net/"> + <Param name="q" value="{searchTerms}" /> + </Url> + + +</OpenSearchDescription> diff --git a/libre/mozilla-searchplugins/yacy.xml b/libre/mozilla-searchplugins/yacy.xml new file mode 100644 index 000000000..ec7bf2970 --- /dev/null +++ b/libre/mozilla-searchplugins/yacy.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<OpenSearchDescription + xmlns="http://a9.com/-/spec/opensearch/1.1/" + xmlns:suggestions="http://www.opensearch.org/specifications/opensearch/extensions/suggestions/1.1"> + <ShortName>YaCy</ShortName> + <LongName>YaCy.net - Web Search by the People, for the People</LongName> + <Image type="image/gif">http://search.yacy.net:7001/env/grafics/yacy.png</Image> + <Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAAAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////Chiu+fBm+fRq+fRq+fRq+fRq+fRq8ehXMmk////////////////////////////++exjUqGfZsnjYsXbYsXbYsXbZsnjTp2W+fBr///////////////////////////+9exfs2r/69/L58+z58+z58+z59e/z59bChSn///////////////////////////+9fBnnz638+fX69O369e748un38Ob59O3Ll0fVrGz////////////////////////Jk0HJlUjXuYrWt4jVtYPr28T58+r59OzPn1fPnlX////////////////////////Rolu8eRXCiTPEjTvCijbNnlj169359e7Zs3vLlkf////////////////////////UqmrAgSLt3MP27eH1693169327+T59Ozo0rG/gB////////////////////////////+/gCDv4Mn48+v38Of59Oz58+v48+vr2b2+fRv///////////////////////////+9ehXr17n58+z48ejo0bDp07T48+zx49DBhCj///////////////////////////+/fhzjyJ/59Oz59OzQoVvNmU759Oz58+vKlUbXrnH////////////////////////LlkfUqmn59Oz48+vZtHzNm1D48+v59OzPoFjOnlX////////////////////////OnVPOnFL59e348+vq1rnEiC7u38j69vDXsHTIkT3////////////////////////UqWjIkD327+T58+3s2bzAgSLp07T79/Pmzqq+fBn///////////////////////////+/fx7v4Mr7+PTx5NDHkD3kyqP8+vjs2r+9exf///////////////////////////++fBjQoFnVq2zTp2bGjTjJk0LWrW7SpWC+exf////////////////////////////Nm1C6dQy7eBG8eBK9exe8ehS7dxC6dQzLlkj////////////AH///wB8x+sAf///AD/+PwA///8AP///AD///4A9PU+APoz/gB///4AdxvOAHoz/gB3368AfjU/AHT1PwB/+P +</Image> + <Language>en-us</Language> + <OutputEncoding>UTF-8</OutputEncoding> + <InputEncoding>UTF-8</InputEncoding> + <AdultContent>true</AdultContent> + <Description>YaCy is a free GPL-licensed software that can be used for stand-alone search engine installations or as a client for a multi-user P2P-based web indexing cluster. This is the access to peer.</Description> + + <Url type="text/html" method="GET" template="http://search.yacy.net:7001/yacysearch.html?query={searchTerms}&startRecord={startIndex?}&maximumRecords={count?}&nav=all&resource=global" /> + <Url type="application/rss+xml" method="GET" template="http://search.yacy.net:7001/yacysearch.rss?nav=&query={searchTerms}&startRecord={startIndex?}&maximumRecords={count?}&nav=all&resource=global" /> + <Url type="application/atom+xml" method="GET" template="http://search.yacy.net:7001/yacysearch.atom?query={searchTerms}&startRecord={startIndex?}&maximumRecords={count?}&resource=global" /> + + <Url type="application/x-suggestions+json" template="http://search.yacy.net:7001/suggest.json?query={searchTerms}"/> + <Url type="application/x-suggestions+xml" template="http://search.yacy.net:7001/suggest.xml?query={searchTerms}"/> + <!-- syntax according to http://www.loc.gov/standards/sru/. Set verify=true to get snippets in the search results --> + <Developer>See http://github.com/orgs/yacy/teams/yacy_developers</Developer> + <Query role="example" searchTerms="yacy+free+software" /> + <Tags>YaCy Free Software P2P Peer-to-Peer Uncensored Distributed Web Search Engine</Tags> + <Contact>See http://search.yacy.net:7001/ViewProfile.html?hash=localhash</Contact> + <Attribution>http://yacy.net YaCy Software &copy; 2004-2014 by Michael Christen et al., YaCy.net; Content: ask peer owner</Attribution> + <SyndicationRight>open</SyndicationRight> +</OpenSearchDescription> diff --git a/libre/netsurf/PKGBUILD b/libre/netsurf/PKGBUILD index e4fdaed84..50a3270e8 100644 --- a/libre/netsurf/PKGBUILD +++ b/libre/netsurf/PKGBUILD @@ -7,9 +7,9 @@ pkgname=netsurf pkgver=3.3 -pkgrel=1.parabola1 -pkgdesc='Lightweight and fast web browser, without non-privacy search providers' -arch=('x86_64' 'i686' 'mips64el') +pkgrel=1.parabola2 +pkgdesc='Lightweight and fast web browser, without non-privacy search engines' +arch=('x86_64' 'i686') url='http://www.netsurf-browser.org/' license=('MIT' 'GPL2') replaces=(${pkgname}-libre) @@ -25,7 +25,7 @@ sha256sums=('23f92a0940f577b9605f2e54786fea3521680d32d6c00f2a3db1eae3f29e3686' prepare() { cd "$pkgname-$pkgver" - # remove non-privacy search providers + # remove non-privacy search engines sed -i '\|Google|d \|Yahoo|d \|Bing|d diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD index 7698faa60..9bbeaa040 100644 --- a/libre/parabolaweb-utils/PKGBUILD +++ b/libre/parabolaweb-utils/PKGBUILD @@ -1,14 +1,14 @@ # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> pkgname=(parabolaweb-utils parabolaweb-dev) -pkgver=20150417 +pkgver=20150814 pkgdesc="Utilities for managing the ParabolaWeb website application" url="https://projects.parabola.nu/packages/parabolaweb-utils.git/" license=('GPL2') # The commit to get dependency info for # Bump pkgrel instead of pkgver if updating this is the only change -_parabolaweb_commit=d2eb47c0dfc068c7727232d89daeee377969288d +_parabolaweb_commit=97d80ca25b9d0b76c88774b8d566d15d4e1eb21f pkgrel=1 epoch=1 @@ -16,8 +16,8 @@ arch=('i686' 'x86_64') source=("https://projects.parabolagnulinux.org/packages/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" "requirements_prod-${_parabolaweb_commit}.txt::https://projects.parabolagnulinux.org/parabolaweb.git/plain/requirements_prod.txt?id=${_parabolaweb_commit}") -md5sums=('12419393e81d9a890a98a676eec4103e' - '28653bf82e9c73b6f1d736bf107d2a40') +md5sums=('4f4cbe0de96b1b5c526506017b600c13' + '2a282dc52fb6cf3c4907715a2e85dc7b') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/libre/qupzilla/PKGBUILD b/libre/qupzilla/PKGBUILD index 9565202e7..a328f4f89 100644 --- a/libre/qupzilla/PKGBUILD +++ b/libre/qupzilla/PKGBUILD @@ -5,8 +5,8 @@ pkgbase=qupzilla pkgname=(qupzilla qupzilla-qt4) pkgver=1.8.6 -pkgrel=1.parabola1 -arch=(i686 x86_64 mips64el) +pkgrel=1.parabola2 +arch=(i686 x86_64) url="http://www.qupzilla.com/" license=('GPL3') makedepends=('qtwebkit' 'qt5-webkit' 'qt5-script' 'qt5-tools' 'hunspell' 'kdelibs' 'kwallet' 'libgnome-keyring') @@ -57,7 +57,7 @@ build() { } package_qupzilla() { - pkgdesc="Cross-platform QtWebKit browser (Qt5), without non-privacy search providers" + pkgdesc="Cross-platform QtWebKit browser (Qt5), without non-privacy search engines" depends=('qt5-webkit' 'qt5-script' 'hunspell' 'desktop-file-utils' 'hicolor-icon-theme') optdepends=('kwallet: kf5 kwallet integration' 'libgnome-keyring: gnome keyring integration') @@ -74,7 +74,7 @@ package_qupzilla() { } package_qupzilla-qt4() { - pkgdesc="Cross-platform QtWebKit browser (Qt4), without non-privacy search providers" + pkgdesc="Cross-platform QtWebKit browser (Qt4), without non-privacy search engines" depends=('qtwebkit' 'hunspell') optdepends=('kdelibs: kwallet integration' 'libgnome-keyring: gnome keyring integration') diff --git a/libre/ruby/PKGBUILD b/libre/ruby/PKGBUILD index d9a5b6890..41230a1a0 100644 --- a/libre/ruby/PKGBUILD +++ b/libre/ruby/PKGBUILD @@ -6,7 +6,7 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=(ruby ruby-docs) -pkgver=2.2.2 +pkgver=2.2.3 _jsonver=1.8.1 pkgrel=1.parabola1 arch=(i686 x86_64) @@ -15,27 +15,36 @@ license=(BSD custom) makedepends=(gdbm openssl libffi doxygen graphviz libyaml ttf-dejavu tk) options=(!emptydirs) mksource=(http://cache.ruby-lang.org/pub/ruby/${pkgver:0:3}/ruby-${pkgver}.tar.xz - https://github.com/flori/json/archive/v${_jsonver}.tar.gz - json-${_jsonver}.gem - libre.patch) + https://github.com/flori/json/archive/v${_jsonver}.tar.gz) source=(https://repo.parabola.nu/other/ruby-libre/ruby-libre-${pkgver}.tar.xz + json-${_jsonver}.gem + remove-nonfree-json-references.patch + remove-nonfree-ruby-references.patch gemrc) -mksha1sums=('58cfec8db9b51ad1ff3bd2b9065da087913a6268' - '043ed2df4b0ce2174c9c020ffcb4ec31f9fde560' - '2cd288d00c5211e4c9d9338080b30af65cbb143a' - '5595b4eeb67ac5f63d13630932b44bf2a8ed9197') -sha1sums=('194cabc318c0ed63042059c5f60376f254c5b626' +mksha1sums=('cff5421e3a7f6dbe72009ef44164d4b9e6d1801f' + '043ed2df4b0ce2174c9c020ffcb4ec31f9fde560') +sha1sums=('36c5a0b8179179b91ee185796519a841dfa4b9be' + '2cd288d00c5211e4c9d9338080b30af65cbb143a' + '0ba1010a271e6fcc1734f7382b99963f46133ea5' + '57b7f137daf2e925739e8c1d1471b13b9bfa8bbd' 'dc536754c8fac2c3d82965c5a708cd8f79562d98') mksource() { rm -rv ruby-${pkgver}/ext/json rm -rv ruby-${pkgver}/test/json - rm -rv json-${_jsonver}/ext +} + +prepare() { + cd ruby-${pkgver} + + install -D -m644 ${srcdir}/json-${_jsonver}.gem gems + + patch -Np1 -i ${srcdir}/remove-nonfree-ruby-references.patch - cp -v json-${_jsonver}.gem ruby-${pkgver}/gems + cd ${srcdir}/json-${_jsonver} - patch -Np0 -i libre.patch + patch -Np1 -i ${srcdir}/remove-nonfree-json-references.patch } build() { diff --git a/libre/ruby/libre.patch b/libre/ruby/remove-nonfree-json-references.patch index ea530d38d..4fb5dd1e2 100644 --- a/libre/ruby/libre.patch +++ b/libre/ruby/remove-nonfree-json-references.patch @@ -236,84 +236,3 @@ diff -Nur json-1.8.1.orig/lib/json.rb json-1.8.1/lib/json.rb - end + require 'json/pure' end -diff -Nur ruby-2.2.2.orig/common.mk ruby-2.2.2/common.mk ---- ruby-2.2.2.orig/common.mk 2015-03-22 00:39:38.000000000 -0300 -+++ ruby-2.2.2/common.mk 2015-04-14 15:33:02.058396283 -0300 -@@ -15,7 +15,7 @@ - - RUBYLIB = $(PATH_SEPARATOR) - RUBYOPT = - --RUN_OPTS = --disable-gems -+RUN_OPTS = --disable-gems -I$(srcdir)/../json-1.8.1/lib - - SPEC_GIT_BASE = git://github.com/ruby - MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git -@@ -728,8 +728,6 @@ - - srcs-ext: $(EXT_SRCS) - --srcs-extra: $(srcdir)/ext/json/parser/parser.c -- - LIB_SRCS = $(srcdir)/lib/unicode_normalize/tables.rb - - srcs-lib: $(LIB_SRCS) -@@ -816,11 +814,6 @@ - top_srcdir=../.. srcdir=. \ - RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)" - --$(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl -- $(ECHO) generating $@ -- $(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(MFLAGS) \ -- Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. BASERUBY="$(BASERUBY)" -- - $(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \ - $(srcdir)/tool/generic_erb.rb $(srcdir)/template/sizes.c.tmpl $(srcdir)/configure.in - $(ECHO) generating $@ -diff -Nur ruby-2.2.2.orig/defs/default_gems ruby-2.2.2/defs/default_gems ---- ruby-2.2.2.orig/defs/default_gems 2014-07-15 00:43:04.000000000 -0300 -+++ ruby-2.2.2/defs/default_gems 2015-04-14 15:33:02.058396283 -0300 -@@ -1,4 +1,3 @@ - # gem base directory versioning file [executable files under bin] - rake lib/rake lib/rake.rb [rake] - rdoc lib/rdoc lib/rdoc.rb [rdoc ri] --json ext/json ext/json/lib/json/version.rb -diff -Nur ruby-2.2.2.orig/ext/.document ruby-2.2.2/ext/.document ---- ruby-2.2.2.orig/ext/.document 2014-08-02 11:55:36.000000000 -0300 -+++ ruby-2.2.2/ext/.document 2015-04-14 15:33:02.058396283 -0300 -@@ -35,9 +35,6 @@ - io/nonblock/nonblock.c - io/wait/lib - io/wait/wait.c --json/ext/generator/generator.c --json/ext/parser/parser.c --json/lib - mathn/complex/complex.c - mathn/rational/rational.c - nkf/lib -diff -Nur ruby-2.2.2.orig/gems/bundled_gems ruby-2.2.2/gems/bundled_gems ---- ruby-2.2.2.orig/gems/bundled_gems 2014-12-12 11:00:15.000000000 -0200 -+++ ruby-2.2.2/gems/bundled_gems 2015-04-14 15:33:02.058396283 -0300 -@@ -1,3 +1,4 @@ - power_assert 0.2.2 - test-unit 3.0.8 - minitest 5.4.3 -+json 1.8.1 -diff -Nur ruby-2.2.2.orig/test/ruby/test_module.rb ruby-2.2.2/test/ruby/test_module.rb ---- ruby-2.2.2.orig/test/ruby/test_module.rb 2015-04-12 12:41:32.000000000 -0300 -+++ ruby-2.2.2/test/ruby/test_module.rb 2015-04-14 15:33:02.058396283 -0300 -@@ -202,7 +202,6 @@ - - ancestors = Object.ancestors - mixins = ancestors - [Object, Kernel, BasicObject] -- mixins << JSON::Ext::Generator::GeneratorMethods::String if defined?(JSON::Ext::Generator::GeneratorMethods::String) - assert_equal([Object, Kernel, BasicObject], ancestors - mixins) - assert_equal([String, Comparable, Object, Kernel, BasicObject], String.ancestors - mixins) - end -@@ -436,7 +435,6 @@ - assert_equal([Mixin], User.included_modules) - - mixins = Object.included_modules - [Kernel] -- mixins << JSON::Ext::Generator::GeneratorMethods::String if defined?(JSON::Ext::Generator::GeneratorMethods::String) - assert_equal([Kernel], Object.included_modules - mixins) - assert_equal([Comparable, Kernel], String.included_modules - mixins) - end diff --git a/libre/ruby/remove-nonfree-ruby-references.patch b/libre/ruby/remove-nonfree-ruby-references.patch new file mode 100644 index 000000000..77966827c --- /dev/null +++ b/libre/ruby/remove-nonfree-ruby-references.patch @@ -0,0 +1,81 @@ +diff -Nur ruby-2.2.3.orig/common.mk ruby-2.2.3/common.mk +--- ruby-2.2.3.orig/common.mk 2015-08-15 15:10:16.000000000 -0300 ++++ ruby-2.2.3/common.mk 2015-08-20 01:58:55.065621626 -0300 +@@ -15,7 +15,7 @@ + + RUBYLIB = $(PATH_SEPARATOR) + RUBYOPT = - +-RUN_OPTS = --disable-gems ++RUN_OPTS = --disable-gems -I$(srcdir)/../json-1.8.1/lib + + SPEC_GIT_BASE = git://github.com/ruby + MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git +@@ -729,8 +729,6 @@ + + srcs-ext: $(EXT_SRCS) + +-srcs-extra: $(srcdir)/ext/json/parser/parser.c +- + LIB_SRCS = $(srcdir)/lib/unicode_normalize/tables.rb + + srcs-lib: $(LIB_SRCS) +@@ -817,11 +815,6 @@ + top_srcdir=../.. srcdir=. \ + RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)" + +-$(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl +- $(ECHO) generating $@ +- $(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(MFLAGS) \ +- Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. BASERUBY="$(BASERUBY)" +- + $(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \ + $(srcdir)/tool/generic_erb.rb $(srcdir)/template/sizes.c.tmpl $(srcdir)/configure.in + $(ECHO) generating $@ +diff -Nur ruby-2.2.3.orig/defs/default_gems ruby-2.2.3/defs/default_gems +--- ruby-2.2.3.orig/defs/default_gems 2014-07-15 00:43:04.000000000 -0300 ++++ ruby-2.2.3/defs/default_gems 2015-08-20 01:58:55.065621626 -0300 +@@ -1,4 +1,3 @@ + # gem base directory versioning file [executable files under bin] + rake lib/rake lib/rake.rb [rake] + rdoc lib/rdoc lib/rdoc.rb [rdoc ri] +-json ext/json ext/json/lib/json/version.rb +diff -Nur ruby-2.2.3.orig/ext/.document ruby-2.2.3/ext/.document +--- ruby-2.2.3.orig/ext/.document 2014-08-02 11:55:36.000000000 -0300 ++++ ruby-2.2.3/ext/.document 2015-08-20 01:58:55.065621626 -0300 +@@ -35,9 +35,6 @@ + io/nonblock/nonblock.c + io/wait/lib + io/wait/wait.c +-json/ext/generator/generator.c +-json/ext/parser/parser.c +-json/lib + mathn/complex/complex.c + mathn/rational/rational.c + nkf/lib +diff -Nur ruby-2.2.3.orig/gems/bundled_gems ruby-2.2.3/gems/bundled_gems +--- ruby-2.2.3.orig/gems/bundled_gems 2014-12-12 11:00:15.000000000 -0200 ++++ ruby-2.2.3/gems/bundled_gems 2015-08-20 01:58:55.065621626 -0300 +@@ -1,3 +1,4 @@ + power_assert 0.2.2 + test-unit 3.0.8 + minitest 5.4.3 ++json 1.8.1 +diff -Nur ruby-2.2.3.orig/test/ruby/test_module.rb ruby-2.2.3/test/ruby/test_module.rb +--- ruby-2.2.3.orig/test/ruby/test_module.rb 2015-04-12 12:41:32.000000000 -0300 ++++ ruby-2.2.3/test/ruby/test_module.rb 2015-08-20 01:58:55.065621626 -0300 +@@ -202,7 +202,6 @@ + + ancestors = Object.ancestors + mixins = ancestors - [Object, Kernel, BasicObject] +- mixins << JSON::Ext::Generator::GeneratorMethods::String if defined?(JSON::Ext::Generator::GeneratorMethods::String) + assert_equal([Object, Kernel, BasicObject], ancestors - mixins) + assert_equal([String, Comparable, Object, Kernel, BasicObject], String.ancestors - mixins) + end +@@ -436,7 +435,6 @@ + assert_equal([Mixin], User.included_modules) + + mixins = Object.included_modules - [Kernel] +- mixins << JSON::Ext::Generator::GeneratorMethods::String if defined?(JSON::Ext::Generator::GeneratorMethods::String) + assert_equal([Kernel], Object.included_modules - mixins) + assert_equal([Comparable, Kernel], String.included_modules - mixins) + end diff --git a/libre/sagemath/PKGBUILD b/libre/sagemath/PKGBUILD index e121efc5f..872ceceb7 100644 --- a/libre/sagemath/PKGBUILD +++ b/libre/sagemath/PKGBUILD @@ -11,34 +11,35 @@ pkgname=sagemath pkgver=6.8 -pkgrel=1.parabola1 +pkgrel=3.parabola1 pkgdesc="Free Mathematics Software, free software replacement of Magma, Maple, Mathematica, and Matlab, without nonfree nauty recommendation" arch=(i686 x86_64) url="http://www.sagemath.org" license=(GPL) -depends=(ipython2 ppl glpk mpfi palp polybori singular libcliquer maxima-ecl gfan sympow tachyon python2-rpy2 +depends=(ipython2 ppl mpfi palp polybori singular libcliquer maxima-ecl gfan sympow tachyon python2-rpy2 python2-matplotlib python2-scipy python2-sympy python2-networkx libgap gap flintqs lcalc lrcalc eclib gmp-ecm zn_poly gd python2-cvxopt pynac linbox gsl rubiks pari-galdata pari-seadata-small planarity rankwidth sage-data-combinatorial_designs sage-data-elliptic_curves sage-data-graphs sage-data-polytopes_db sage-data-conway_polynomials) optdepends=('cython2: to compile cython code' 'jmol: 3D plots' 'sage-notebook: Browser-based (flask) notebook interface' - 'sagemath-doc: Documentation and inline help' 'ipython2-notebook: IPython notebook interface' 'mathjax: IPython notebook interface' + 'sagemath-doc: Documentation and inline help' 'ipython2-notebook: Jupyter notebook interface' 'mathjax: Jupyter notebook interface' 'coin-or-cbc: COIN backend for numerical computations' 'buckygen: for generating fullerene graphs' 'plantri: for generating some classes of graphs' 'benzene: for generating fusenes and benzenoids' 'modular_decomposition: modular decomposition of graphs' 'lrs: Algorithms for linear reverse search used in game theory and for computing volume of polytopes' 'imagemagick: to show animations' 'coxeter3: Coxeter groups implementation' 'cryptominisat: SAT solver' 'arb: floating-point ball arithmetic') -makedepends=(cython2-devel boost ratpoints symmetrica fflas-ffpack python2-jinja coin-or-cbc +makedepends=(cython2 boost ratpoints symmetrica fflas-ffpack python2-jinja coin-or-cbc mcqd coxeter3 cryptominisat arb modular_decomposition bliss-graphs) # libfes conflicts=(sage-mathematics) replaces=(sage-mathematics) provides=(sage-mathematics) source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz" # "http://www.sagemath.org/packages/upstream/pexpect/pexpect-2.0.tar.bz2" -"http://mirrors.mit.edu/sage/spkg/upstream/pexpect/pexpect-2.0.tar.bz2" +"http://mirrors.mit.edu/sage/spkg/upstream/pexpect/pexpect-2.0.tar.bz2" 'kernel.json' 'anal.h' 'package.patch' 'env.patch' 'paths.patch' 'clean.patch' 'skip-check.patch' -'pexpect-env.patch' 'pexpect-del.patch' 'disable-fes.patch') +'pexpect-env.patch' 'pexpect-del.patch' 'disable-fes.patch' 'cython-0.23.patch' 'ipython-4.patch') md5sums=('943780ef4460e38f28fefe95e3138981' 'd9a3e113ed147dcee8f89962a8dccd43' + '4cee4f96bcd877587e7efc40c20adba7' 'a906a180d198186a39820b0a2f9a9c63' 'f72e544032b1a3f952b7ddafc3a49d63' '843a6cc3b17a1850604593813321418e' @@ -47,7 +48,9 @@ md5sums=('943780ef4460e38f28fefe95e3138981' '5947a420a0b1483f0cbc74c76895789b' 'a83a3b1bc7fcb7cbf752a83a8311fc42' 'f333939ea6c41377b66407c81016cee4' - '4eb23a3c7363258bc9ba764d6e5512ba') + '4eb23a3c7363258bc9ba764d6e5512ba' + '1b8dfa047115180aa0afbeaf19d97762' + '41aa997ad9f00afdc3357b37fc70f0e6') prepare(){ cd sage-$pkgver @@ -78,12 +81,16 @@ prepare(){ sed -e "s|os.path.join(SAGE_ROOT, 'sage')|'/usr/bin/sage'|" -i src/sage/repl/ipython_kernel/install.py # find bliss headers sed -e 's|graph.hh|bliss/graph.hh|' -i src/sage/graphs/bliss.pyx +# fix IPython 4 compatibility + patch -p0 -i ../ipython-4.patch # Upstream patches # fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209 # patch -p0 -i "$srcdir"/fes02.patch # disable fes module, fails to compile patch -p0 -i ../disable-fes.patch +# fix build with cython 0.23 + patch -p1 -i "$srcdir"/cython-0.23.patch # use python2 sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -e 's|exec python|exec python2|' -i src/bin/* @@ -155,4 +162,14 @@ package() { python2 setup.py install --root="$pkgdir" --optimize=1 mkdir -p "$pkgdir"/usr/lib/sage/site-packages/ mv "$pkgdir"/usr/lib/python2.7/site-packages/pexpect* "$pkgdir"/usr/lib/sage/site-packages/ + +# Install Jupyter kernel + install -Dm644 "$srcdir"/kernel.json "$pkgdir"/usr/share/jupyter/kernels/sagemath/kernel.json + cd "$pkgdir"/usr/share/jupyter/kernels/sagemath + ln -s /usr/share/doc/sage/output/html/en doc + ln -s /usr/share/sage/ext/notebook-ipython/logo.svg . + ln -s /usr/share/sage/ext/notebook-ipython/logo-64x64.png . + + mkdir "$pkgdir"/usr/share/jupyter/nbextensions + ln -s /usr/share/{jsmol,mathjax} "$pkgdir"/usr/share/jupyter/nbextensions } diff --git a/libre/sagemath/c_lib.patch b/libre/sagemath/c_lib.patch deleted file mode 100644 index 6df7b8efa..000000000 --- a/libre/sagemath/c_lib.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- src/setup.py.orig 2014-11-01 23:49:10.000000000 +0100 -+++ src/setup.py 2014-11-07 00:40:58.414838636 +0100 -@@ -171,10 +171,12 @@ - m.libraries = ['csage'] + m.libraries - if m.language == 'c++': - m.libraries.append('stdc++') -+ m.libraries.append('ntl') -+ m.libraries = m.libraries + ['gmp', 'm', 'dl'] - - m.extra_compile_args = m.extra_compile_args + extra_compile_args - m.extra_link_args = m.extra_link_args + extra_link_args -- m.library_dirs = m.library_dirs + [os.path.join(SAGE_LOCAL, "lib")] -+ m.library_dirs += ['c_lib', '%s/lib' % SAGE_LOCAL] - m.include_dirs = m.include_dirs + include_dirs - - - diff --git a/libre/sagemath/cython-0.23.patch b/libre/sagemath/cython-0.23.patch new file mode 100644 index 000000000..2ae14ad57 --- /dev/null +++ b/libre/sagemath/cython-0.23.patch @@ -0,0 +1,16 @@ +diff --git a/src/sage/libs/polybori/decl.pxd b/src/sage/libs/polybori/decl.pxd +index b8fcc6e..6ec4bce 100644 +--- a/src/sage/libs/polybori/decl.pxd ++++ b/src/sage/libs/polybori/decl.pxd +@@ -10,8 +10,8 @@ cdef extern from "sage/libs/polybori/pb_wrap.h": + pbdp_asc "CTypes::dp_asc" + pbblock_dlex "CTypes::block_dlex" + pbblock_dp_asc "CTypes::block_dp_asc" +- pbdp "17" +- pbblock_dp "19" ++ pbdp "static_cast<COrderEnums::ordercodes>(17)" ++ pbblock_dp "static_cast<COrderEnums::ordercodes>(19)" + + cdef enum comparecodes "CCompareEnums::comparecodes": + less_than "CTypes::less_than" + diff --git a/libre/sagemath/ipython-4.patch b/libre/sagemath/ipython-4.patch new file mode 100644 index 000000000..a3b17563d --- /dev/null +++ b/libre/sagemath/ipython-4.patch @@ -0,0 +1,35 @@ +--- src/sage/repl/interpreter.py.orig 2015-08-16 14:57:55.571128473 +0200 ++++ src/sage/repl/interpreter.py 2015-08-16 14:58:06.647849803 +0200 +@@ -104,8 +104,8 @@ + import sys + from sage.repl.preparse import preparse + +-from IPython import Config +-from IPython.utils.traitlets import Bool, Type ++from traitlets.config.loader import Config ++from traitlets import Bool, Type + + from sage.env import SAGE_LOCAL + +--- src/sage/repl/ipython_kernel/__main__.py.orig 2015-08-22 12:32:58.595605714 +0200 ++++ src/sage/repl/ipython_kernel/__main__.py 2015-08-22 12:33:36.065900491 +0200 +@@ -1,3 +1,3 @@ +-from IPython.kernel.zmq.kernelapp import IPKernelApp ++from ipykernel.kernelapp import IPKernelApp + from sage.repl.ipython_kernel.kernel import SageKernel + IPKernelApp.launch_instance(kernel_class=SageKernel) +--- src/sage/repl/ipython_kernel/kernel.py.orig 2015-08-22 12:35:08.709928354 +0200 ++++ src/sage/repl/ipython_kernel/kernel.py 2015-08-22 12:35:31.983429208 +0200 +@@ -15,9 +15,9 @@ + #***************************************************************************** + + import sys +-from IPython.kernel.zmq.ipkernel import IPythonKernel +-from IPython.kernel.zmq.zmqshell import ZMQInteractiveShell +-from IPython.utils.traitlets import Type ++from ipykernel.ipkernel import IPythonKernel ++from ipykernel.zmqshell import ZMQInteractiveShell ++from traitlets import Type + + from sage.env import SAGE_VERSION, SAGE_EXTCODE, SAGE_DOC + from sage.repl.interpreter import SageNotebookInteractiveShell diff --git a/libre/sagemath/kernel.json b/libre/sagemath/kernel.json new file mode 100644 index 000000000..19b0f197b --- /dev/null +++ b/libre/sagemath/kernel.json @@ -0,0 +1 @@ +{"display_name": "SageMath", "argv": ["/usr/bin/sage", "-python", "-m", "sage.repl.ipython_kernel", "-f", "{connection_file}"]} diff --git a/libre/sh-roundup/PKGBUILD b/libre/sh-roundup/PKGBUILD index 10fdff645..cc614c0d9 100644 --- a/libre/sh-roundup/PKGBUILD +++ b/libre/sh-roundup/PKGBUILD @@ -1,39 +1,35 @@ # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> +# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=sh-roundup -pkgver=0.0.5.git17 -_gitver='commit=695ae7609353a360556e1f465ac81ce447235179' - +_pkgname="roundup" +pkgver=0.0.6 +pkgrel=1 pkgdesc='A unit testing framework for POSIX shell' -license=("custom:MIT") -url="http://bmizerany.github.io/roundup/" - -pkgrel=2 arch=('any') +url="http://bmizerany.github.io/roundup/" +license=("custom:MIT") depends=(sh) -makedepends=(ronn) +makedepends=(ruby-ronn) -source=("https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz" 'makefile-fix.patch') -md5sums=('053754e0a450288710bde0b9e5deb67e' +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/bmizerany/$_pkgname/archive/v$pkgver.tar.gz" + 'makefile-fix.patch') +md5sums=('607023b4fe4e42fdc2f0cb14b4138b2e' '9efcd83d666c1e84302fe611610c60fa') -mksource=("$pkgname-$pkgver::git://github.com/bmizerany/roundup.git#${_gitver}") -mkmd5sums=('SKIP') - prepare() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$_pkgname-$pkgver" patch -i ../makefile-fix.patch Makefile } build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$_pkgname-$pkgver" ./configure --prefix="$pkgdir"/usr make -j1 build man } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$_pkgname-$pkgver" make -j1 install install-man install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } - diff --git a/libre/smplayer/PKGBUILD b/libre/smplayer/PKGBUILD index 430eb40a3..0191b5bbd 100644 --- a/libre/smplayer/PKGBUILD +++ b/libre/smplayer/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 244955 2015-08-28 08:42:55Z foutrelis $ # Maintainer (Arch): Ionut Biru <ibiru@archlinux.org> # Contributor (Arch): Allan McRae <allan@archlinux.org> # Contributor (Arch): Alessio 'mOLOk' Bolognino <themolok@gmail.com> @@ -7,8 +7,8 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=smplayer -pkgver=14.9.0.6690 -pkgrel=1.parabola2 +pkgver=14.9.0.6994 +pkgrel=1.parabola1 pkgdesc="A complete front-end for MPlayer, without nonfree smtube recommendation" arch=('i686' 'x86_64') url="http://smplayer.sourceforge.net/" @@ -19,11 +19,14 @@ optdepends=('smplayer-themes: icon themes collection' 'smplayer-skins: skin themes collection' 'mpv: for using mpv instead of mplayer') install=smplayer.install -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('75d8947682de96f7bf29c6f1a2f21391') +source=(https://downloads.sourceforge.net/project/$pkgname/Unstable/releases/$pkgname-$pkgver.tar.bz2 + add-missing-QDataStream-include.patch) +md5sums=('666a589b1fc3480a29e87f0ee7efd511' + '418ab45eb94448fc8a2f44500c9742c2') prepare() { cd "$pkgname-$pkgver" + patch -Np1 -i ../add-missing-QDataStream-include.patch sed -i 's|DEFINES [+][=] YOUTUBE_SUPPORT|#DEFINES += YOUTUBE_SUPPORT| s|DEFINES [+][=] YT_USE_SCRIPT|#DEFINES += YT_USE_SCRIPT| ' src/smplayer.pro diff --git a/libre/smplayer/add-missing-QDataStream-include.patch b/libre/smplayer/add-missing-QDataStream-include.patch new file mode 100644 index 000000000..5f37b0957 --- /dev/null +++ b/libre/smplayer/add-missing-QDataStream-include.patch @@ -0,0 +1,11 @@ +diff -upr smplayer-14.9.0.6994.orig/src/qtsingleapplication/qtlocalpeer.cpp smplayer-14.9.0.6994/src/qtsingleapplication/qtlocalpeer.cpp +--- smplayer-14.9.0.6994.orig/src/qtsingleapplication/qtlocalpeer.cpp 2013-08-30 03:53:57.000000000 +0300 ++++ smplayer-14.9.0.6994/src/qtsingleapplication/qtlocalpeer.cpp 2015-08-28 11:37:18.435899495 +0300 +@@ -41,6 +41,7 @@ + + #include "qtlocalpeer.h" + #include <QCoreApplication> ++#include <QDataStream> + #include <QTime> + + #if defined(Q_OS_WIN) diff --git a/libre/spacefm/PKGBUILD b/libre/spacefm/PKGBUILD index 00d0b0e08..9f4ac3867 100644 --- a/libre/spacefm/PKGBUILD +++ b/libre/spacefm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 134719 2015-06-03 22:17:41Z arojas $ +# $Id: PKGBUILD 138873 2015-08-28 13:04:56Z arojas $ # Maintainer (Arch): Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor (Arch): IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ # Contributor (Arch): ridikulus_rat <the.ridikulus.rat@gmail.com> @@ -6,10 +6,10 @@ # Contributor: Edison Ibañez <arkhan.xxx@gmail.com> pkgname=spacefm -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=1.parabola1 pkgdesc='Multi-panel tabbed file manager, with unar support' -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url='http://ignorantguru.github.com/spacefm/' license=('GPL3') install=$pkgname.install @@ -24,7 +24,7 @@ replaces=(${pkgname}-libre) conflicts=(${pkgname}-libre) source=($pkgname-$pkgver.tar.gz::https://github.com/IgnorantGuru/spacefm/archive/$pkgver.tar.gz libre.patch) -md5sums=('cef34680fc5b76d8aefc1efa5e4b8824' +md5sums=('000e26dc414443f934e3838610cb6174' '66cc35023050ff6664bf14b1073700e2') prepare() { diff --git a/libre/tp_smapi/PKGBUILD b/libre/tp_smapi/PKGBUILD index 2cde342b2..8e44e9be4 100644 --- a/libre/tp_smapi/PKGBUILD +++ b/libre/tp_smapi/PKGBUILD @@ -14,7 +14,7 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then _basekernel=4.1 - _archrel=72 + _archrel=73 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 diff --git a/libre/vhba-module/PKGBUILD b/libre/vhba-module/PKGBUILD index 43ec48eb1..dfc2e1145 100644 --- a/libre/vhba-module/PKGBUILD +++ b/libre/vhba-module/PKGBUILD @@ -9,7 +9,7 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then _basekernel=4.1 - _archrel=16 + _archrel=17 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index ac615d742..831fa315e 100644 --- a/libre/your-freedom/PKGBUILD +++ b/libre/your-freedom/PKGBUILD @@ -5,8 +5,8 @@ pkgdesc="This package conflicts with every nonfree package known to date to ensu license=('GPL3') url="https://projects.parabola.nu/blacklist.git" #url="https://lukeshu.com/git/mirror/parabola/blacklist.git" -pkgver=20150730 -_gitver=ccec75e41f57f1ebb883d2789b48bf37211ed035 +pkgver=20150829 +_gitver=42873ae6fb9fa2b22d9c46e8b3b6ff0525f3850f pkgrel=1 arch=('any') @@ -16,7 +16,7 @@ install=${pkgname}.install makedepends=(librelib) source=(blacklist-${_gitver}.txt::https://projects.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_gitver}) #source=(blacklist-${_gitver}.txt::https://lukeshu.com/git/mirror/parabola/blacklist.git/plain/blacklist.txt?id=${_gitver}) -md5sums=('cae24bfe8b2c73a8e3c620f01d8fe7b9') +md5sums=('454551c4d6374c405b520ef86b1a98c4') package() { cd "$srcdir" diff --git a/nonprism/gthumb/PKGBUILD b/nonprism/gthumb/PKGBUILD index 1189ebd79..f90e13fd0 100644 --- a/nonprism/gthumb/PKGBUILD +++ b/nonprism/gthumb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 241735 2015-07-03 08:49:39Z jgc $ +# $Id: PKGBUILD 244968 2015-08-28 18:58:35Z arojas $ # Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor (Arch): Jan de Groot <jgc@archlinux.org> # Contributor (Arch): Tobias Kieslich <tobias@justdreams.de> @@ -7,7 +7,7 @@ pkgname=gthumb pkgver=3.4.0 -pkgrel=2.nonprism1 +pkgrel=3.nonprism1 pkgdesc="Image browser and viewer for the GNOME Desktop, without support for unsafe and dangerous for privacy protocols" arch=(i686 x86_64) license=(GPL) diff --git a/nonprism/icedove/PKGBUILD b/nonprism/icedove/PKGBUILD index 9db1e0a0d..11ff5d333 100644 --- a/nonprism/icedove/PKGBUILD +++ b/nonprism/icedove/PKGBUILD @@ -3,7 +3,7 @@ # We're getting this from Debian Sid _debname=icedove -_debver=31.7.0 +_debver=38.1.0 _debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -11,13 +11,16 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } pkgname=${_debname} epoch=1 pkgver=${_debver}.${_debrel} -pkgrel=1.nonprism1 +pkgrel=2.nonprism1 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird, without support for unsafe and dangerous for privacy protocols" -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') license=('MPL' 'GPL' 'LGPL') url="http://packages.debian.org/sid/${pkgname}" -depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libvpx=1.4.0' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') -makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'libpulse' 'autoconf2.13' 'quilt' 'jquery-ui') +depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types' + 'dbus-glib' 'alsa-lib' 'desktop-file-utils' 'hicolor-icon-theme' + 'libvpx' 'icu' 'libevent' 'nss' 'hunspell' 'sqlite' 'mozilla-searchplugins') +makedepends=('unzip' 'zip' 'python2' 'wireless_tools' 'yasm' 'mesa' 'libpulse' + 'pkg-config' 'autoconf2.13' 'quilt' 'jquery-ui') optdepends=('libcanberra: for sound support') replaces=('thunderbird' "${pkgname}-libre" "${pkgname}-libre-nonprism") conflicts=('thunderbird' "${pkgname}-libre" "${pkgname}-libre-nonprism") @@ -27,55 +30,49 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz" "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.xz" mozconfig ${pkgname}.desktop - ${pkgname}-install-dir.patch + changing-the-default-search-engine.patch vendor.js) -options=(!emptydirs) -sha256sums=('00ce17575690400e22e7ce21dc5b3b4f71092b7708ee9aad74448d1401da8794' - '04c30b4e72819b764bc463d36c39f55741d3e47ae994ba89fd14e63fe32c6561' - '09a0041f7f12498d933284b3d3a44e19002515accaff767d145a8f404b79e86a' +options=(!emptydirs !makeflags) +sha256sums=('b59c74f67d2f9684d9cf0db62b5c60d3ef155807e17a91ebf0899dd55670f6a0' + '29de44253624814ae3ce3e0a6a786ba229c62e78d8c97e36257f730d38d542f7' + 'e3d0f5f78fede687dfc38a2787c2c8f33c8213be286abeb9176e3dcebabb0b74' '0b0d25067c64c6b829c84e5259ffca978e3971f85acc8483f47bdbed5b0b5b6a' - '24599eab8862476744fe1619a9a53a5b8cdcab30b3fc5767512f31d3529bd05d' - 'b44f0eb82dce8a02aa71f0eab4b0d820e5383f613becc62cc995aac8638b54ec') + '9765d9bbcae82d0006766741c813840db46c56ee16f79d39b8d7d96d716ee2d7' + '798d5bff1e6025e9a803b67f629afac740f16e537b714ee7c7e829b2345fb6a2') prepare() { - export DEBIAN_BUILD="comm-esr31" + export DEBIAN_BUILD=comm-esr${pkgver%%.*} export QUILT_PATCHES=debian/patches export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' export QUILT_DIFF_ARGS='--no-timestamps' - mv debian "${srcdir}/${DEBIAN_BUILD}" - cd "${srcdir}/${DEBIAN_BUILD}" + mv debian ${srcdir}/${DEBIAN_BUILD} + cd ${srcdir}/${DEBIAN_BUILD} - mv debian/${pkgname}-branding "${srcdir}/${DEBIAN_BUILD}/mail/branding/${pkgname}" + # Prepare branding for the Icedove packages + mkdir -v mail/branding/${pkgname} - cp -a debian/app-icons/${pkgname}big.svg debian/app-icons/${pkgname}_icon.svg - for i in 16x16 22x22 24x24 32x32 48x48 256x256; do - install -Dm644 "debian/app-icons/${pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${pkgname}/mailicon${i/x*/}.png" + # Copy needed icons + cp -va debian/${pkgname}-branding/* mail/branding/${pkgname} + for i in 16 22 24 32 48 256; do + install -vDm 644 debian/app-icons/${pkgname}${i}.png mail/branding/${pkgname}/mailicon${i}.png done - for i in 48x48 64x64; do - install -Dm644 "debian/app-icons/${pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${pkgname}/content/icon${i/x*/}.png" + for i in 48 64; do + install -vDm 644 debian/app-icons/${pkgname}${i}.png mail/branding/${pkgname}/content/icon${i}.png done + cp -va debian/preview.png mail/themes/linux/mail/preview.png - # We are doing it from sed commands - rm -v debian/patches/fixes/vp8_impl.cc-backporting-naming-for-constants.patch || true + # Useless since we are doing it ourselves + rm -v debian/patches/debian-hacks/changing-the-default-search-engine.patch || true quilt push -av - # Fix paths on makefile - sed -i 's|topsrcdir = [.][.]/[.][.]/[.][.]/|topsrcdir = @top_srcdir@|; - s|include $(topsrcdir)/config/autoconf.mk|include $(DEPTH)/config/autoconf.mk|; - s|include $(DEPTH)/config/rules.mk|include $(topsrcdir)/config/rules.mk|; - ' mail/branding/icedove/Makefile.in - - sed -i 's|topsrcdir = [.][.]/[.][.]/[.][.]/[.][.]|topsrcdir = @top_srcdir@|; - s|include $(topsrcdir)/config/autoconf.mk|include $(DEPTH)/config/autoconf.mk|; - s|include $(DEPTH)/config/rules.mk|include $(topsrcdir)/config/rules.mk|; - ' mail/branding/icedove/locales/Makefile.in - - # Fix package-manifest.in - sed -i '\|; Phishing Protection| s|$|\n#ifdef MOZ_SAFE_BROWSING|; - \|@BINPATH@/components/url-classifier[.]xpt| s|$|\n#endif| + # Remove url-classifier from package-manifest.in to build and disable Phishing Protection + sed -i '\|Phishing Protection|d + \|UrlClassifier|d + \|URLClassifier|d + \|url-classifier|d ' mail/installer/package-manifest.in # Fix branding @@ -101,65 +98,64 @@ prepare() { \|gtalk[.]manifest|d \|twitter[.]js|d \|twitter[.]manifest|d + \|yahoo[.]js|d + \|yahoo[.]manifest|d ' mail/installer/package-manifest.in - rm -rv chat/protocols/{facebook,gtalk,twitter} + rm -rv chat/protocols/{facebook,gtalk,twitter,yahoo} - cp "${srcdir}/mozconfig" .mozconfig + cp -v ${srcdir}/mozconfig .mozconfig - # configure script misdetects the preprocessor without an optimization level + # Configure script misdetects the preprocessor without an optimization level # https://bugs.archlinux.org/task/34644 sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure - # Install to /usr/lib/$pkgname - patch -Np1 -i "$srcdir/${pkgname}-install-dir.patch" - - # Add symlinks to use jquery files built for us - ln -s /usr/share/javascript/jquery/jquery.min.js mail/jquery - ln -s /usr/share/javascript/jquery-ui/jquery-ui.min.js mail/jquery - - # Fixing for libvpx >= 1.4.0 - sed -i 's|IMG_FMT_I420|VPX_IMG_FMT_I420|; - s|PLANE_U|VPX_PLANE_U|; - s|PLANE_V|VPX_PLANE_V|; - s|PLANE_Y|VPX_PLANE_Y|; - s|VPX_VPX_PLANE_|VPX_PLANE_|; - ' mozilla/content/media/encoder/VP8TrackEncoder.cpp \ - mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc + # Change the default search engine using our system-provided searchplugins + patch -Np1 -i ${srcdir}/changing-the-default-search-engine.patch + + # Add symlinks to use jquery files built by us + ln -vs /usr/share/javascript/jquery/jquery.min.js mail/jquery + ln -vs /usr/share/javascript/jquery-ui/jquery-ui.min.js mail/jquery } build() { - export DEBIAN_BUILD="comm-esr31" + export DEBIAN_BUILD=comm-esr${pkgver%%.*} - cd "${srcdir}/${DEBIAN_BUILD}" + cd ${srcdir}/${DEBIAN_BUILD} - export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/lib/${pkgname}" - export PYTHON="/usr/bin/python2" + export PYTHON=/usr/bin/python2 - make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" + make -f client.mk build } package() { - export DEBIAN_BUILD="comm-esr31" + export DEBIAN_BUILD=comm-esr${pkgver%%.*} + + cd ${srcdir}/${DEBIAN_BUILD} - cd "${srcdir}/${DEBIAN_BUILD}" + make -f client.mk DESTDIR=${pkgdir} install - make -j1 -f client.mk DESTDIR="${pkgdir}" install + install -vDm 644 ${srcdir}/vendor.js ${pkgdir}/usr/lib/${pkgname}/defaults/preferences/vendor.js - install -Dm644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${pkgname}/defaults/preferences/vendor.js" + # Install Icedove menu icon + install -vDm 644 debian/${pkgname}.xpm ${pkgdir}/usr/share/pixmaps/${pkgname}.xpm - for i in 16x16 22x22 24x24 32x32 48x48 64x64 128x128 256x256; do - install -Dm644 "debian/app-icons/${pkgname}${i/x*/}.png" "${pkgdir}/usr/share/icons/hicolor/$i/apps/${pkgname}.png" + # Install Icedove icons + for i in 16 22 24 32 48 64 128 256; do + install -vDm 644 debian/app-icons/${pkgname}${i}.png ${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/${pkgname}.png done - install -Dm644 "debian/app-icons/${pkgname}_icon.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg" - - install -Dm644 "${srcdir}/${pkgname}.desktop" \ - "${pkgdir}/usr/share/applications/${pkgname}.desktop" - - rm -rf "${pkgdir}"/usr/lib/${pkgname}/{dictionaries,hyphenation,searchplugins} - ln -sf /usr/share/hunspell "${pkgdir}/usr/lib/${pkgname}/dictionaries" - ln -sf /usr/share/hyphen "${pkgdir}/usr/lib/${pkgname}/hyphenation" - ln -sf /usr/lib/mozilla/searchplugins "${pkgdir}/usr/lib/${pkgname}/searchplugins" - - # We don't want the development stuff - rm -r "${pkgdir}"/usr/{include,lib/${pkgname}-devel,share/idl} + install -vDm 644 debian/app-icons/${pkgname}big.svg ${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg + + # Install Icedove desktop + install -vDm 644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop + + # Use system-provided dictionaries + rm -vrf ${pkgdir}/usr/lib/${pkgname}/{dictionaries,hyphenation,searchplugins} + ln -vsf /usr/share/hunspell ${pkgdir}/usr/lib/${pkgname}/dictionaries + ln -vsf /usr/share/hyphen ${pkgdir}/usr/lib/${pkgname}/hyphenation + + # Use system-provided searchplugins + ln -vsf /usr/lib/mozilla/searchplugins ${pkgdir}/usr/lib/${pkgname}/searchplugins + + # Remove development stuff + rm -vr ${pkgdir}/usr/{include,lib/${pkgname}-devel,share/idl} } diff --git a/nonprism/icedove/changing-the-default-search-engine.patch b/nonprism/icedove/changing-the-default-search-engine.patch new file mode 100644 index 000000000..845e4f2fa --- /dev/null +++ b/nonprism/icedove/changing-the-default-search-engine.patch @@ -0,0 +1,31 @@ +diff -Nur comm-esr38.orig/mail/locales/en-US/chrome/messenger-region/region.properties comm-esr38/mail/locales/en-US/chrome/messenger-region/region.properties +--- comm-esr38.orig/mail/locales/en-US/chrome/messenger-region/region.properties 2015-07-07 14:34:06.000000000 -0300 ++++ comm-esr38/mail/locales/en-US/chrome/messenger-region/region.properties 2015-08-16 13:30:55.466053010 -0300 +@@ -3,12 +3,12 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + # Default search engine +-browser.search.defaultenginename=Bing ++browser.search.defaultenginename=searx + + # Search engine order (order displayed in the search bar dropdown)s +-browser.search.order.1=Bing +-browser.search.order.2=Yahoo +-browser.search.order.3= ++browser.search.order.1=searx ++browser.search.order.2=DuckDuckGo HTML ++browser.search.order.3=DuckDuckGo Lite + + # To make mapit buttons to disappear in the addressbook, specify empty string. For example: + # mail.addr_book.mapit_url.format= +@@ -19,8 +19,8 @@ + # @ST == state + # @ZI == zip code + # @CO == country +-mail.addr_book.mapit_url.format=http://maps.google.com/maps?q=@A1%20@A2%20@CI%20@ST%20@ZI%20@CO +-mailnews.messageid_browser.url=http://groups.google.com/search?as_umsgid=%mid ++mail.addr_book.mapit_url.format= ++mailnews.messageid_browser.url= + + # Recognize non-standard versions of "Re:" in subjects from localized versions of MS Outlook et al. + # Specify a comma-separated list without spaces. For example: mailnews.localizedRe=AW,SV diff --git a/nonprism/icedove/icedove-install-dir.patch b/nonprism/icedove/icedove-install-dir.patch deleted file mode 100644 index 0c7ffaa4a..000000000 --- a/nonprism/icedove/icedove-install-dir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -upr comm-esr31.orig/mozilla/config/baseconfig.mk comm-esr31/mozilla/config/baseconfig.mk ---- comm-esr31.orig/mozilla/config/baseconfig.mk 2014-07-22 09:44:22.000000000 +0300 -+++ comm-esr31/mozilla/config/baseconfig.mk 2014-07-22 09:46:45.000000000 +0300 -@@ -4,7 +4,7 @@ - # whether a normal build is happening or whether the check is running. - includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) - sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) - ifndef TOP_DIST - TOP_DIST = dist diff --git a/nonprism/icedove/mozconfig b/nonprism/icedove/mozconfig index 3987c2c5a..20cb08590 100644 --- a/nonprism/icedove/mozconfig +++ b/nonprism/icedove/mozconfig @@ -3,10 +3,11 @@ ac_add_options --enable-application=mail ac_add_options --prefix=/usr ac_add_options --libdir=/usr/lib +ac_add_options --enable-pie # Icedove -ac_add_options --disable-official-branding ac_add_options --with-branding=mail/branding/icedove +#ac_add_options --enable-calendar # System libraries ac_add_options --with-system-nspr @@ -17,12 +18,12 @@ ac_add_options --with-system-bz2 ac_add_options --with-system-png ac_add_options --with-system-libevent ac_add_options --with-system-libvpx +ac_add_options --with-system-icu ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite ac_add_options --enable-system-ffi ac_add_options --enable-system-cairo ac_add_options --enable-system-pixman -ac_add_options --with-pthreads # Features ac_add_options --enable-startup-notification @@ -44,4 +45,6 @@ export MOZILLA_OFFICIAL=1 mk_add_options MOZILLA_OFFICIAL=1 # Parabola features +ac_add_options --disable-official-branding ac_add_options --disable-safe-browsing +ac_add_options --disable-url-classifier diff --git a/nonprism/icedove/vendor.js b/nonprism/icedove/vendor.js index 05cce3d61..4d58bfc4a 100644 --- a/nonprism/icedove/vendor.js +++ b/nonprism/icedove/vendor.js @@ -18,3 +18,6 @@ pref("social.directories", ""); // Disable the GeoLocation API for content pref("geo.enabled", false); + +// Pointing the "Help -> What's new" menu entry to mozilla.debian.net +pref("mailnews.start_page.override_url", "http://wiki.debian.org/Icedove/WhatsNew38"); diff --git a/nonprism/kde-applications-meta/PKGBUILD b/nonprism/kde-applications-meta/PKGBUILD index 5cdbc55ce..258d0bc40 100644 --- a/nonprism/kde-applications-meta/PKGBUILD +++ b/nonprism/kde-applications-meta/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 233809 2015-03-14 17:55:07Z arojas $ +# $Id: PKGBUILD 244390 2015-08-19 17:39:12Z arojas $ # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> # Maintainer (Arch): Antonio Rojas <arojas@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> @@ -7,29 +7,25 @@ pkgbase=kde-applications-meta pkgname=('kde-meta-kdepim') -pkgver=15.04 -pkgrel=7.nonprism1 +pkgver=15.08 +pkgrel=1.nonprism1 arch=(any) url='http://www.parabola.nu/' license=(GPL) package_kde-meta-kdepim() { - pkgdesc=('Meta package for kdepim, without kdepim-blogilo') - depends=('kdepim-akonadiconsole' - 'kdepim-akregator' - 'kdepim-console' - 'kdepim-kaddressbook' - 'kdepim-kalarm' - 'kdepim-kjots' - 'kdepim-kleopatra' - 'kdepim-kmail' - 'kdepim-knode' - 'kdepim-knotes' - 'kdepim-kontact' - 'kdepim-korganizer' - 'kdepim-kresources' - 'kdepim-ktimetracker' - 'kdepim-ktnef') + pkgdesc=('Meta package for kdepim, without blogilo') + depends=('akonadiconsole' + 'akregator' + 'konsolekalendar' + 'kaddressbook' + 'kalarm' + 'kleopatra' + 'kmail' + 'knotes' + 'kontact' + 'korganizer' + 'ktnef') replaces=('kdepim' 'kde-meta-kdepim-nonprism') conflicts=('kdepim' 'kde-meta-kdepim-nonprism') } diff --git a/nonprism/kdenetwork-kopete/PKGBUILD b/nonprism/kdenetwork-kopete/PKGBUILD index 9eebdb748..e19936bd8 100644 --- a/nonprism/kdenetwork-kopete/PKGBUILD +++ b/nonprism/kdenetwork-kopete/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 241398 2015-06-29 17:50:28Z arojas $ +# $Id: PKGBUILD 243760 2015-08-15 17:04:46Z arojas $ # Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=kdenetwork-kopete -pkgver=15.04.3 +pkgver=15.08.0 pkgrel=1.parabola1.nonprism1 pkgdesc='Instant Messenger, without nonfree Skype support and support for unsafe and dangerous for privacy protocols' url='http://kde.org/applications/internet/kopete/' @@ -12,13 +12,13 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde-applications' 'kdenetwork') replaces=(${pkgname}-libre ${pkgname}-libre-nonprism) conflicts=(${pkgname}-libre ${pkgname}-libre-nonprism) -depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'qimageblitz' 'jsoncpp') -makedepends=('cmake' 'automoc4' 'boost' 'kdepim-libkdepim' 'mediastreamer' 'kdepim-kleopatra') +depends=('kdebase-runtime' 'kdepimlibs4' 'qca-ossl' 'libotr' 'qimageblitz' 'jsoncpp') +makedepends=('cmake' 'automoc4' 'boost' 'mediastreamer') optdepends=('mediastreamer: jingle support') install=${pkgname}.install source=("http://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz" 'libre-nonprism.patch') -sha1sums=('1dddde0459361c47bcc7a27b88f8a53499cf73c5' +sha1sums=('b7ee954b96d10be94fa59b99ecdf302ba73c88f8' 'f0d7b727da1b5160f05952eec4df1bfbefab99cf') prepare() { diff --git a/nonprism/kdepim-runtime/PKGBUILD b/nonprism/kdepim-runtime/PKGBUILD index 2ec0e2864..920cf85f6 100644 --- a/nonprism/kdepim-runtime/PKGBUILD +++ b/nonprism/kdepim-runtime/PKGBUILD @@ -1,39 +1,39 @@ -# $Id: PKGBUILD 241398 2015-06-29 17:50:28Z arojas $ +# $Id: PKGBUILD 244411 2015-08-20 09:51:07Z arojas $ # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=kdepim-runtime -pkgver=4.14.10 -_kdeappver=15.04.3 +pkgver=15.08.0 pkgrel=1.nonprism1 -pkgdesc='Extends the functionality of kdepim, without libkgapi and libkfbapi support' +pkgdesc='Extends the functionality of kdepim, without libkgapi support' arch=('i686' 'x86_64') url='https://projects.kde.org/projects/kde/kdepim-runtime' license=('GPL' 'LGPL' 'FDL') -depends=('kdebase-runtime' 'libkolab' 'libaccounts-qt' 'libsignon-qt4') -makedepends=('cmake' 'automoc4' 'boost') -install="${pkgname}.install" -replaces=('kdepim-runtime-coherence' 'kdepim-runtime-nonprism') -conflicts=('kdepim-runtime-coherence' 'kdepim-runtime-nonprism') -source=("http://download.kde.org/stable/applications/${_kdeappver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('f5b1e44f1d10d29bad308b3fd90a48b34da7493c') +depends=(hicolor-icon-theme qt5-quick1 libkolab akonadi-socialutils akonadi-calendar + knotifyconfig kross kalarmcal kmbox kimap kde-syndication) +makedepends=(extra-cmake-modules kdoctools boost) +install=$pkgname.install +source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz") +sha1sums=('fcc9549bdacc25cb464a18efefcbacf7494dfd34') prepare() { - mkdir build + mkdir -p build } build() { cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../$pkgname-$pkgver \ -DCMAKE_BUILD_TYPE=Release \ - -DKDE4_BUILD_TESTS=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr + -DBUILD_TESTING=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON make } package() { cd build - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install } diff --git a/nonprism/kdepim/PKGBUILD b/nonprism/kdepim/PKGBUILD index 178518a44..948ae3f6e 100644 --- a/nonprism/kdepim/PKGBUILD +++ b/nonprism/kdepim/PKGBUILD @@ -1,175 +1,128 @@ -# $Id: PKGBUILD 241398 2015-06-29 17:50:28Z arojas $ -# Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 244953 2015-08-28 08:31:00Z arojas $ +# Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> +# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> # Maintainer: André Silva <emulatorman@parabola.nu> - pkgbase=kdepim -pkgname=('kdepim-akonadiconsole' - 'kdepim-kaddressbook' - 'kdepim-kjots' - 'kdepim-kmail' - 'kdepim-knode' - 'kdepim-knotes' - 'kdepim-korganizer' - 'kdepim-libkdepim') -pkgver=4.14.10 -_kdeappver=15.04.3 -pkgrel=1.nonprism1 +pkgname=(akonadiconsole kaddressbook kmail knotes + korganizer libkdepim) +pkgver=15.08.0 +pkgrel=4.nonprism1 arch=('i686' 'x86_64') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde-applications' 'kdepim') -makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' - 'libbaloo4' 'grantlee-qt4') -source=("http://download.kde.org/stable/applications/${_kdeappver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('6f74763dda68dbb44394e807eab9204777bddf0a') +makedepends=(extra-cmake-modules kdepim-runtime qt5-tools grantlee-qt5 kdoctools knewstuff khtml + ktexteditor kdnssd kldap libktnef boost gpgmepp kontactinterface kxmlrpcclient kblog + akonadi-search) +source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgbase-$pkgver.tar.xz") +sha1sums=('e0bdf22fbf9bc4ebcb85f8202315334d4eff8c3f') + +prepare() { + mkdir -p build +} build() { - mkdir build cd build - cmake ../${pkgbase}-${pkgver} \ + cmake ../$pkgbase-$pkgver \ -DCMAKE_BUILD_TYPE=Release \ - -DKDE4_BUILD_TESTS=OFF \ - -DCMAKE_SKIP_RPATH=ON \ + -DBUILD_TESTING=OFF \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DKDEPIM_BUILD_MOBILE=OFF \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DLIBEXEC_INSTALL_DIR=lib \ -DKDEPIM_STORAGESERVICE_GDRIVE=OFF make } -package_kdepim-akonadiconsole() { +package_akonadiconsole() { pkgdesc='Akonadi Management and Debugging Console, without Google Drive support' - depends=('kdepim-libkdepim') - conflicts=('kdepim-akonadiconsole-nonprism') - replaces=('kdepim-akonadiconsole-nonprism') + depends=('libkdepim') + conflicts=("kdepim-$pkgname") url='http://pim.kde.org' install='kdepim.install' - cd "${srcdir}"/build/akonadiconsole - make DESTDIR="${pkgdir}" install + cd build/akonadiconsole + make DESTDIR="$pkgdir" install } -package_kdepim-kaddressbook() { +package_kaddressbook() { pkgdesc='Contact Manager, without Google Drive support' - depends=('kdepim-libkdepim') + depends=('libkdepim' 'kontactinterface') + conflicts=("kdepim-$pkgname") url="http://kde.org/applications/office/kaddressbook/" - conflicts=('kdepim-kaddressbook-nonprism') - replaces=('kdepim-kaddressbook-nonprism') - install='kdepim-kaddressbook.install' - for i in kaddressbook kontact/plugins/kaddressbook \ - plugins/kaddressbook; do - cd "${srcdir}"/build/${i} - make DESTDIR="${pkgdir}" install - done -} - -package_kdepim-kjots() { - pkgdesc='Note Taker, without Google Drive support' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/utilities/kjots/" - conflicts=('kdepim-kjots-nonprism') - replaces=('kdepim-kjots-nonprism') - install='kdepim.install' - cd "${srcdir}"/build/kjots - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/kontact/plugins/kjots - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/kjots - make DESTDIR="${pkgdir}" install + install='kaddressbook.install' + for _i in kaddressbook plugins/kaddressbook; do + cd "$srcdir"/build/$_i + make DESTDIR="$pkgdir" install + done } -package_kdepim-kmail() { +package_kmail() { pkgdesc='Mail Client, without Google Drive support' - depends=('kdepim-libkdepim') - optdepends=('kde-agent: For starting and shutting down gpg-agent with KDE session manager') + depends=('libkdepim' 'kontactinterface' 'kio-pim') + conflicts=("kdepim-$pkgname") url="http://kde.org/applications/internet/kmail/" - install='kdepim-kmail.install' - conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' - 'kdepim-mimelib' 'kdepim-plugins' 'kdepim-kmail-nonprism') - replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' - 'kdepim-mimelib' 'kdepim-plugins' 'kdepim-kmail-nonprism') - for i in kmail kmailcvt agents/archivemailagent storageservicemanager\ - agents/mailfilteragent agents/followupreminderagent importwizard ksendemail\ - libksieve messagelist kontact/plugins/kmail grantleeeditor mboximporter; do - cd "${srcdir}"/build/${i} - make DESTDIR="${pkgdir}" install - done - cd "${srcdir}"/build/doc/kmail - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/sieveeditor - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/importwizard - make DESTDIR="${pkgdir}" install -} - -package_kdepim-knode() { - pkgdesc='News Reader, without Google Drive support' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/internet/knode/" - conflicts=('kdepim-knode-nonprism') - replaces=('kdepim-knode-nonprism') - install='kdepim-knode.install' - cd "${srcdir}"/build/knode - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/kontact/plugins/knode - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/knode - make DESTDIR="${pkgdir}" install + install='kmail.install' + for _i in kmail agents/archivemailagent agents/mailfilteragent \ + storageservicemanager importwizard libksieve messagelist grantleeeditor mboximporter sieveeditor; do + cd "$srcdir"/build/$_i + make DESTDIR="$pkgdir" install + done + for _i in akonadi_archivemail_agent kmail importwizard sieveeditor; do + cd "$srcdir"/build/doc/$_i + make DESTDIR="$pkgdir" install + done } -package_kdepim-knotes() { +package_knotes() { pkgdesc='Popup Notes, without Google Drive support' - depends=('kdepim-libkdepim') + depends=('libkdepim' 'kontactinterface') + conflicts=("kdepim-$pkgname") url="http://kde.org/applications/utilities/knotes/" - conflicts=('kdepim-knotes-nonprism') - replaces=('kdepim-knotes-nonprism') install='kdepim.install' - cd "${srcdir}"/build/knotes - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/agents/notesagent - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/kontact/plugins/knotes - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/knotes - make DESTDIR="${pkgdir}" install + cd "$srcdir"/build/knotes + make DESTDIR="$pkgdir" install + cd "$srcdir"/build/agents/notesagent + make DESTDIR="$pkgdir" install + cd "$srcdir"/build/doc/knotes + make DESTDIR="$pkgdir" install + cd "$srcdir"/build/doc/akonadi_notes_agent + make DESTDIR="$pkgdir" install } -package_kdepim-korganizer() { +package_korganizer() { pkgdesc='Calendar and Scheduling Program, without Google Drive support' - depends=('kdepim-libkdepim') + depends=('libkdepim' 'kontactinterface') + conflicts=("kdepim-$pkgname") url="http://kde.org/applications/office/korganizer" - conflicts=('kdepim-korganizer-nonprism') - replaces=('kdepim-korganizer-nonprism') - install='kdepim-korganizer.install' - for i in korganizer korgac kontact/plugins/korganizer calendarviews; do - cd "${srcdir}"/build/${i} - make DESTDIR="${pkgdir}" install + install='korganizer.install' + for _i in korganizer korgac; do + cd "$srcdir"/build/$_i + make DESTDIR="$pkgdir" install done - cd "${srcdir}"/build/doc/korganizer - make DESTDIR="${pkgdir}" install + cd "$srcdir"/build/doc/korganizer + make DESTDIR="$pkgdir" install } -package_kdepim-libkdepim() { - pkgdesc='Library for KDE PIM, without Google Drive support' - groups=() - depends=('kdepim-runtime' 'baloo4-akonadi' 'grantlee-qt4') +package_libkdepim() { + pkgdesc='Common libraries and resources for KDE PIM applications, without Google Drive support' + groups=() + depends=('kdepim-runtime' 'grantlee-qt5' 'akonadi-search' 'knewstuff' 'kldap' 'kdnssd' 'libktnef') + conflicts=('kdepim-libkdepim' 'kdepim-kjots' 'kdepim-knode' 'kdepim-kresources' 'kdepim-ktimetracker') url='http://pim.kde.org' - conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' - 'kdepim-akonadi' 'kdepim-libkdepim-nonprism') - replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' - 'kdepim-akonadi' 'kdepim-libkdepim-nonprism') - install='kdepim.install' - for i in agents/sendlateragent akonadi_next calendarsupport \ - incidenceeditor-ng kaddressbookgrantlee grantleetheme kdgantt2 libkdepim \ - libkdepimdbusinterfaces libkleo libkpgp mailcommon mailimporter \ - messagecomposer messagecore messageviewer noteshared icons templateparser \ - plugins/messageviewer plugins/ktexteditor pimcommon pimsettingexporter; do - cd "${srcdir}"/build/${i} - make DESTDIR="${pkgdir}" install + install=kdepim.install + for _i in agents/sendlateragent calendarsupport grantleetheme incidenceeditor-ng kdgantt2 libkdepim \ + accountwizard icons libkdepimdbusinterfaces libkleo libkpgp mailcommon mailimporter \ + messagecomposer messagecore messageviewer noteshared templateparser calendarviews agents/followupreminderagent \ + plugins/messageviewer pimcommon pimsettingexporter kaddressbookgrantlee; do + cd "$srcdir"/build/$_i + make DESTDIR="$pkgdir" install done - cd "${srcdir}"/build/doc/pimsettingexporter - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/headerthemeeditor - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/contactthemeeditor - make DESTDIR="${pkgdir}" install + for _i in akonadi_sendlater_agent akonadi_followupreminder_agent contactthemeeditor headerthemeeditor pimsettingexporter; do + cd "$srcdir"/build/doc/$_i + make DESTDIR="$pkgdir" install + done + + mkdir -p "$pkgdir"/etc/xdg + install -m644 "$srcdir"/$pkgbase-$pkgver/kdepim.categories "$pkgdir"/etc/xdg } diff --git a/nonprism/kdepim/kdepim-akregator.install b/nonprism/kdepim/akregator.install index 5787df72f..5787df72f 100644 --- a/nonprism/kdepim/kdepim-akregator.install +++ b/nonprism/kdepim/akregator.install diff --git a/nonprism/kdepim/kdepim-kaddressbook.install b/nonprism/kdepim/kaddressbook.install index 5c501dc49..5c501dc49 100644 --- a/nonprism/kdepim/kdepim-kaddressbook.install +++ b/nonprism/kdepim/kaddressbook.install diff --git a/nonprism/kdepim/kdepim.install b/nonprism/kdepim/kdepim.install index e70c054ec..e9e8b444b 100644 --- a/nonprism/kdepim/kdepim.install +++ b/nonprism/kdepim/kdepim.install @@ -1,5 +1,7 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q + update-mime-database usr/share/mime } post_upgrade() { diff --git a/nonprism/kdepim/kdepim-kmail.install b/nonprism/kdepim/kmail.install index 5787df72f..5787df72f 100644 --- a/nonprism/kdepim/kdepim-kmail.install +++ b/nonprism/kdepim/kmail.install diff --git a/nonprism/kdepim/kdepim-knode.install b/nonprism/kdepim/knode.install index 5787df72f..5787df72f 100644 --- a/nonprism/kdepim/kdepim-knode.install +++ b/nonprism/kdepim/knode.install diff --git a/nonprism/kdepim/kdepim-korganizer.install b/nonprism/kdepim/korganizer.install index 5787df72f..5787df72f 100644 --- a/nonprism/kdepim/kdepim-korganizer.install +++ b/nonprism/kdepim/korganizer.install diff --git a/nonprism/kdepim4-runtime/PKGBUILD b/nonprism/kdepim4-runtime/PKGBUILD new file mode 100644 index 000000000..255852156 --- /dev/null +++ b/nonprism/kdepim4-runtime/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 244440 2015-08-20 14:58:15Z arojas $ +# Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> +# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> +# Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> +# Maintainer: André Silva <emulatorman@parabola.nu> + +pkgname=kdepim4-runtime +pkgver=4.14.10 +_kdeappver=15.04.3 +pkgrel=4.nonprism1 +pkgdesc='Extends the functionality of kdepim4, without libkgapi4 support' +arch=('i686' 'x86_64') +url='https://projects.kde.org/projects/kde/kdepim-runtime' +license=('GPL' 'LGPL' 'FDL') +depends=('kdebase-runtime' 'libkolab4' 'libaccounts-qt4' 'libsignon-qt4' 'akonadi-qt4') +makedepends=('cmake' 'automoc4' 'boost') +replaces=('kdepim-runtime<15' 'kdepim-runtime-coherence' 'kdepim-runtime-nonprism') +conflicts=('kdepim-runtime' 'kdepim-runtime-coherence' 'kdepim-runtime-nonprism') +install="${pkgname}.install" +source=("http://download.kde.org/stable/applications/${_kdeappver}/src/kdepim-runtime-${pkgver}.tar.xz") +sha1sums=('f5b1e44f1d10d29bad308b3fd90a48b34da7493c') + +prepare() { + mkdir build +} + +build() { + cd build + cmake ../kdepim-runtime-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DKDE4_BUILD_TESTS=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd build + make DESTDIR="${pkgdir}" install +} diff --git a/nonprism/kdepim4-runtime/kdepim4-runtime.install b/nonprism/kdepim4-runtime/kdepim4-runtime.install new file mode 100644 index 000000000..c77e68041 --- /dev/null +++ b/nonprism/kdepim4-runtime/kdepim4-runtime.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/nonprism/kdepim4/PKGBUILD b/nonprism/kdepim4/PKGBUILD new file mode 100644 index 000000000..a0520dd16 --- /dev/null +++ b/nonprism/kdepim4/PKGBUILD @@ -0,0 +1,180 @@ +# $Id: PKGBUILD 243749 2015-08-15 10:54:22Z arojas $ +# Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> +# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> +# Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> +# Maintainer: André Silva <emulatorman@parabola.nu> + +pkgbase=kdepim4 +pkgname=('kdepim-akonadiconsole' + 'kdepim-kaddressbook' + 'kdepim-kjots' + 'kdepim-kmail' + 'kdepim-knode' + 'kdepim-knotes' + 'kdepim-korganizer' + 'kdepim-libkdepim') +pkgver=4.14.10 +_kdeappver=15.04.3 +pkgrel=3.nonprism1 +arch=('i686' 'x86_64') +url='http://pim.kde.org' +license=('GPL' 'LGPL' 'FDL') +makedepends=('cmake' 'automoc4' 'boost' 'kdepim4-runtime' 'libxss' 'pilot-link' + 'libbaloo4' 'grantlee-qt4') +groups=('kdepim4') +source=("http://download.kde.org/stable/applications/${_kdeappver}/src/kdepim-${pkgver}.tar.xz") +sha1sums=('6f74763dda68dbb44394e807eab9204777bddf0a') + +build() { + mkdir build + cd build + cmake ../kdepim-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DKDE4_BUILD_TESTS=OFF \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DKDEPIM_BUILD_MOBILE=OFF \ + -DKDEPIM_STORAGESERVICE_GDRIVE=OFF + make +} + +package_kdepim-akonadiconsole() { + pkgdesc='Akonadi Management and Debugging Console, without Google Drive support' + depends=('kdepim-libkdepim') + conflicts=('kdepim-akonadiconsole-nonprism') + replaces=('kdepim-akonadiconsole-nonprism') + provides=('akonadiconsole') + url='http://pim.kde.org' + install='kdepim4.install' + cd "${srcdir}"/build/akonadiconsole + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kaddressbook() { + pkgdesc='Contact Manager, without Google Drive support' + depends=('kdepim-libkdepim') + provides=('kaddressbook') + url="http://kde.org/applications/office/kaddressbook/" + conflicts=('kdepim-kaddressbook-nonprism') + replaces=('kdepim-kaddressbook-nonprism') + install='kdepim-kaddressbook.install' + for i in kaddressbook kontact/plugins/kaddressbook \ + plugins/kaddressbook; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} + +package_kdepim-kjots() { + pkgdesc='Note Taker, without Google Drive support' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/kjots/" + install='kdepim4.install' + conflicts=('kdepim-kjots-nonprism') + replaces=('kdepim-kjots-nonprism') + cd "${srcdir}"/build/kjots + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/kjots + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kjots + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kmail() { + pkgdesc='Mail Client, without Google Drive support' + depends=('kdepim-libkdepim') + provides=('kmail') + url="http://kde.org/applications/internet/kmail/" + install='kdepim-kmail.install' + conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' + 'kdepim-mimelib' 'kdepim-plugins' 'kdepim-kmail-nonprism') + replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' + 'kdepim-mimelib' 'kdepim-plugins' 'kdepim-kmail-nonprism') + for i in kmail kmailcvt agents/archivemailagent storageservicemanager\ + agents/mailfilteragent agents/followupreminderagent importwizard ksendemail\ + libksieve messagelist kontact/plugins/kmail grantleeeditor mboximporter; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done + cd "${srcdir}"/build/doc/kmail + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/sieveeditor + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/importwizard + make DESTDIR="${pkgdir}" install +} + +package_kdepim-knode() { + pkgdesc='News Reader, without Google Drive support' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/internet/knode/" + conflicts=('kdepim-knode-nonprism') + replaces=('kdepim-knode-nonprism') + install='kdepim-knode.install' + cd "${srcdir}"/build/knode + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/knode + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/knode + make DESTDIR="${pkgdir}" install +} + +package_kdepim-knotes() { + pkgdesc='Popup Notes, without Google Drive support' + depends=('kdepim-libkdepim') + provides=('knotes') + url="http://kde.org/applications/utilities/knotes/" + install='kdepim4.install' + conflicts=('kdepim-knotes-nonprism') + replaces=('kdepim-knotes-nonprism') + cd "${srcdir}"/build/knotes + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/agents/notesagent + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/knotes + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/knotes + make DESTDIR="${pkgdir}" install +} + +package_kdepim-korganizer() { + pkgdesc='Calendar and Scheduling Program, without Google Drive support' + depends=('kdepim-libkdepim') + provides=('korganizer') + url="http://kde.org/applications/office/korganizer" + conflicts=('kdepim-korganizer-nonprism') + replaces=('kdepim-korganizer-nonprism') + install='kdepim-korganizer.install' + for i in korganizer korgac kontact/plugins/korganizer calendarviews; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done + cd "${srcdir}"/build/doc/korganizer + make DESTDIR="${pkgdir}" install +} + +package_kdepim-libkdepim() { + pkgdesc='Library for KDE PIM, without Google Drive support' + groups=() + depends=('kdepim4-runtime' 'baloo4-akonadi' 'grantlee-qt4') + url='http://pim.kde.org' + conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' + 'kdepim-akonadi' 'kdepim-libkdepim-nonprism') + replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' + 'kdepim-akonadi' 'kdepim-libkdepim-nonprism') + install='kdepim4.install' + for i in agents/sendlateragent akonadi_next calendarsupport \ + incidenceeditor-ng kaddressbookgrantlee grantleetheme kdgantt2 libkdepim \ + libkdepimdbusinterfaces libkleo libkpgp mailcommon mailimporter \ + messagecomposer messagecore messageviewer noteshared icons templateparser \ + plugins/messageviewer plugins/ktexteditor pimcommon pimsettingexporter; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done + cd "${srcdir}"/build/doc/pimsettingexporter + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/headerthemeeditor + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/contactthemeeditor + make DESTDIR="${pkgdir}" install +} diff --git a/nonprism/kdepim4/kdepim-akregator.install b/nonprism/kdepim4/kdepim-akregator.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/nonprism/kdepim4/kdepim-akregator.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/nonprism/kdepim4/kdepim-kaddressbook.install b/nonprism/kdepim4/kdepim-kaddressbook.install new file mode 100644 index 000000000..5c501dc49 --- /dev/null +++ b/nonprism/kdepim4/kdepim-kaddressbook.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/nonprism/kdepim4/kdepim-kmail.install b/nonprism/kdepim4/kdepim-kmail.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/nonprism/kdepim4/kdepim-kmail.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/nonprism/kdepim4/kdepim-knode.install b/nonprism/kdepim4/kdepim-knode.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/nonprism/kdepim4/kdepim-knode.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/nonprism/kdepim4/kdepim-korganizer.install b/nonprism/kdepim4/kdepim-korganizer.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/nonprism/kdepim4/kdepim-korganizer.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/nonprism/kdepim4/kdepim4.install b/nonprism/kdepim4/kdepim4.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/nonprism/kdepim4/kdepim4.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/nonprism/shotwell/PKGBUILD b/nonprism/shotwell/PKGBUILD index ccbedc37e..7e77317c1 100644 --- a/nonprism/shotwell/PKGBUILD +++ b/nonprism/shotwell/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 135605 2015-06-19 20:21:13Z spupykin $ +# $Id: PKGBUILD 138896 2015-08-28 19:09:01Z arojas $ # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer (Arch): Ionut Biru <ibiru@archlinux.org> # Contributor (Arch): Joeny Ang <ang(dot)joeny(at)gmail(dot)com> @@ -9,9 +9,9 @@ pkgname=shotwell epoch=1 pkgver=0.22.0 _basever=$(echo $pkgver | cut -f1-2 -d.) -pkgrel=2.nonprism1 +pkgrel=3.nonprism1 pkgdesc="A digital photo organizer designed for the GNOME desktop environment, without support for unsafe and dangerous for privacy protocols" -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url="http://yorba.org/shotwell/" license=('LGPL2.1') replaces=(${pkgname}-nonprism) diff --git a/pcr/base91/PKGBUILD b/pcr/base91/PKGBUILD new file mode 100644 index 000000000..424f638e7 --- /dev/null +++ b/pcr/base91/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697 +# Contributor (Arch): Christian Hesse <mail@eworm.de> +# Contributor (Arch): Christoph Zeiler <rabyteNOSPAM _at_ gmx.d0t.net> +# Contributor (Arch): Nathan Owe <ndowens04+AUR at gmail.com> +# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=base91 +pkgver=0.6.0 +pkgrel=6 +pkgdesc='An advanced method for encoding binary data to ASCII text' +arch=('i686' 'x86_64') +url='http://base91.sourceforge.net/' +license=('BSD') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") +sha512sums=('0785178bcf556c02c03dfb467eb936fa84d92f070827f05d356bca4e8558a2f73462228f157dc8242e31305d8a61bfbabf92706974fc3bbec21c4076adc0e37e') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + sed -i '/^\(C\|LD\)FLAGS/s/=/+=/' Makefile + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make prefix='/usr' DESTDIR="${pkgdir}" install + install -D -m0644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +}
\ No newline at end of file diff --git a/pcr/cjdns-git/PKGBUILD b/pcr/cjdns-git/PKGBUILD index 8526539ac..4daf53970 100644 --- a/pcr/cjdns-git/PKGBUILD +++ b/pcr/cjdns-git/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=cjdns pkgname=$_pkgname-git -pkgver=0.3.3403 +pkgver=0.3.3408 pkgrel=1 pkgdesc='A routing engine designed for security, scalability, speed and ease of use' url='https://github.com/cjdelisle/cjdns' diff --git a/pcr/cmix/PKGBUILD b/pcr/cmix/PKGBUILD new file mode 100644 index 000000000..e46b8d14f --- /dev/null +++ b/pcr/cmix/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697 + +pkgname=cmix +pkgver=7 +pkgrel=1 +pkgdesc="cmix is a lossless data compression program aimed at optimizing compression ratio at the cost of high CPU/memory usage." +arch=('i686' 'x86_64') +url="http://www.byronknoll.com/cmix.html" +license=('GPL3') +makedepends=('gcc') +source=("http://www.byronknoll.com/$pkgname-v$pkgver.zip") +sha512sums=('1c4f18b1fc81874d19ba136633c9b3896c1d87a1a25bcb972951b71756dcfe0ea57eb6a54ee4ce6928aaf185408e7d68262fde28d6750a7ea38272d687704df6') + +build() { + cd $pkgname + make +} + +package() { + cd $pkgname + msg "Install $pkgname in /usr/bin" + mkdir -p $pkgdir/usr/bin + install -D -m 755 "$srcdir/$pkgname/$pkgname" \ + "$pkgdir/usr/bin/$pkgname" + install -D -m0444 $srcdir/$pkgname/COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +}
\ No newline at end of file diff --git a/pcr/consolekit/01-org.freedesktop.ModemManager1.rules b/pcr/consolekit/01-org.freedesktop.ModemManager1.rules deleted file mode 100644 index 38af2c8de..000000000 --- a/pcr/consolekit/01-org.freedesktop.ModemManager1.rules +++ /dev/null @@ -1,6 +0,0 @@ -polkit.addRule(function(action, subject) { - if (/^org\.freedesktop\.ModemManager1\.(Device\.Control|Contacts|Messaging|Location)$/.test(action.id) && - subject.isInGroup("network") && subject.active) { - return "yes"; - } -}); diff --git a/pcr/consolekit/01-org.freedesktop.NetworkManager.settings.modify.system.rules b/pcr/consolekit/01-org.freedesktop.NetworkManager.settings.modify.system.rules deleted file mode 100644 index ef002c904..000000000 --- a/pcr/consolekit/01-org.freedesktop.NetworkManager.settings.modify.system.rules +++ /dev/null @@ -1,6 +0,0 @@ -polkit.addRule(function(action, subject) { - if (action.id == "org.freedesktop.NetworkManager.settings.modify.system" && - subject.isInGroup("network") && subject.active) { - return "yes"; - } -}); diff --git a/pcr/consolekit/75-consolekit.rules b/pcr/consolekit/25-consolekit.rules index adddfb1bd..adddfb1bd 100644 --- a/pcr/consolekit/75-consolekit.rules +++ b/pcr/consolekit/25-consolekit.rules diff --git a/pcr/consolekit/PKGBUILD b/pcr/consolekit/PKGBUILD index 42a4a0707..1cd602a03 100644 --- a/pcr/consolekit/PKGBUILD +++ b/pcr/consolekit/PKGBUILD @@ -1,39 +1,41 @@ -# Maintainer : freaj <freaj@riseup.net> -# Maintainer (Manjaro): artoo <artoo@manjaro.org> +# Maintainer (Arch): artoo <artoo@manjaro.org> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> _pkgname=ConsoleKit2 pkgname=consolekit -pkgver=0.9.2 -pkgrel=4 +pkgver=0.9.4 +pkgrel=1 pkgdesc="A framework for defining and tracking users, login sessions, and seats" arch=('i686' 'x86_64') url="https://github.com/ConsoleKit2/ConsoleKit2" license=('GPL') -provides=('logind') -depends=('dbus' 'dbus-glib' 'libx11' 'polkit' 'udev' 'zlib') +#provides=('logind') +depends=('dbus' 'glib2' 'libx11' 'polkit-consolekit' 'udev' 'zlib') optdepends=('consolekit-openrc: consolekit openrc initscript') makedepends=('xmlto' 'docbook-xsl') -options=(libtool) +options=('libtool') source=("$url/releases/download/$pkgver/$_pkgname-$pkgver.tar.bz2" 'consolekit.tmpfiles.conf' - '75-consolekit.rules' - 'consolekit.logrotate' - '01-org.freedesktop.ModemManager1.rules' - '01-org.freedesktop.NetworkManager.settings.modify.system.rules') -sha256sums=('102aa07e0960e56740e235bba06a546c8e0e88f47546ef252ecda917935af41f' + '25-consolekit.rules' + 'consolekit.pamd') +sha256sums=('b3e9554472f1a431576c317536d93ba1ef292916ea8447667deee0b555980e2e' '778552dc12b3c235bde200e476d4262da0c135f3f6f8b3e975a87881d1f154d1' 'c5159d9fe8fdd52ad0d6a84af7ba00bac09edaae965896ab0d099a4df1c5ea6b' - '79735ddd37b8ce6216c78542c2a4e32692dce757c86ecd5771ea8a895a1e8e4d' - 'b8c47eb6de2ffbcd533514ecbc660842e072d8ba2bbe601608038ef6bc18dd17' - '3d0b6f30de1c91a95429af4fed99e41c8e8db55b45b2f3a17974c5be36c16475') + 'f7b88e87f447e2d37c12886f57d932c385f19a8fef238e0f1de7a1746d8be69e') + +prepare(){ + cd $srcdir/$_pkgname-$pkgver +} build(){ - cd "$srcdir/$_pkgname-$pkgver" + cd $srcdir/$_pkgname-$pkgver + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --sbindir=/usr/bin \ + --with-rundir=/run \ --libexecdir=/usr/lib/ConsoleKit \ --localstatedir=/var \ --enable-polkit \ @@ -41,7 +43,6 @@ build(){ --enable-udev-acl \ --enable-docbook-docs \ --with-dbus-services=/usr/share/dbus-1/services \ - --with-logrotate-dir=/etc/logrotate.d \ --with-xinitrc-dir=/etc/X11/xinit/xinitrc.d \ --with-pam-module-dir=/usr/lib/security \ --without-systemdsystemunitdir @@ -50,22 +51,16 @@ build(){ } package() { - cd "$srcdir/$_pkgname-$pkgver" + cd $srcdir/$_pkgname-$pkgver make DESTDIR="$pkgdir" install - #install -D -m644 data/consolekit.logrotate "$pkgdir"/etc/logrotate.d/consolekit - install -D -m644 "$srcdir"/consolekit.logrotate "$pkgdir"/etc/logrotate.d/consolekit - install -D -m644 data/90-consolekit "$pkgdir"/etc/X11/xinit/xinitrc.d/90-consolekit.sh - chmod +x "$pkgdir"/etc/X11/xinit/xinitrc.d/90-consolekit.sh - - install -D -m644 "$srcdir"/consolekit.tmpfiles.conf "$pkgdir"/usr/lib/tmpfiles.d/consolekit.conf + install -Dm644 "$srcdir"/consolekit.tmpfiles.conf "$pkgdir"/usr/lib/tmpfiles.d/consolekit.conf - rm -rf "${pkgdir}"/var/run + rm -rf "${pkgdir}"/run - install -d -m700 $pkgdir/etc/polkit-1/rules.d/ - install -D -m644 ${srcdir}/75-consolekit.rules $pkgdir/etc/polkit-1/rules.d/25-consolekit.rules - install -D -m644 ${srcdir}/01-org.freedesktop.ModemManager1.rules $pkgdir/etc/polkit-1/rules.d/ - install -D -m644 ${srcdir}/01-org.freedesktop.NetworkManager.settings.modify.system.rules $pkgdir/etc/polkit-1/rules.d/ + install -dm 700 -o polkitd "${pkgdir}"/usr/share/polkit-1/rules.d + install -m 644 ${srcdir}/25-consolekit.rules $pkgdir/usr/share/polkit-1/rules.d/75-consolekit.rules - chown 102 $pkgdir/etc/polkit-1/rules.d + install -dm755 $pkgdir/etc/pam.d/ + install -Dm755 ${srcdir}/consolekit.pamd $pkgdir/etc/pam.d/consolekit } diff --git a/pcr/consolekit/consolekit.logrotate b/pcr/consolekit/consolekit.logrotate deleted file mode 100644 index 7c5346ef8..000000000 --- a/pcr/consolekit/consolekit.logrotate +++ /dev/null @@ -1,5 +0,0 @@ -/var/log/ConsoleKit/history { - missingok - notifempty - delaycompress -} diff --git a/pcr/consolekit/consolekit.pamd b/pcr/consolekit/consolekit.pamd new file mode 100644 index 000000000..7d8f614c4 --- /dev/null +++ b/pcr/consolekit/consolekit.pamd @@ -0,0 +1,11 @@ +#%PAM-1.0 + +auth include system-login + +account include system-login + +session include system-login + +password include system-login + +session optional pam_ck_connector.so nox11 diff --git a/pcr/dolphin-emu-git/PKGBUILD b/pcr/dolphin-emu-git/PKGBUILD index 94880d368..e49739393 100644 --- a/pcr/dolphin-emu-git/PKGBUILD +++ b/pcr/dolphin-emu-git/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=dolphin-emu-git pkgname=('dolphin-emu-git' 'dolphin-emu-cli-git' 'dolphin-emu-qt-git') -pkgver=4.0.2.r7202.d2413cd +pkgver=4.0.2.r7490.368867d pkgrel=1 pkgdesc='A GameCube / Wii / Triforce emulator' arch=('x86_64') diff --git a/pcr/emacs-git/PKGBUILD b/pcr/emacs-git/PKGBUILD index f036e9c44..cfaa5e813 100644 --- a/pcr/emacs-git/PKGBUILD +++ b/pcr/emacs-git/PKGBUILD @@ -7,14 +7,14 @@ # pkgname=emacs-git -pkgver=25.0.50.r121790 +pkgver=25.0.50.r122479 pkgrel=1 pkgdesc="GNU Emacs. Official git trunk." arch=('i686' 'x86_64') url="http://www.gnu.org/software/emacs/" license=('GPL') depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' - 'gtk3' 'hicolor-icon-theme' 'desktop-file-utils' + 'gtk3' 'cairo' 'hicolor-icon-theme' 'desktop-file-utils' 'alsa-lib' 'imagemagick' 'gnutls') makedepends=('git') conflicts=('emacs') @@ -53,6 +53,7 @@ build() { --with-sound=alsa \ --without-gconf \ --with-x-toolkit=gtk3 \ + --with-cairo \ --with-xft # Using "make" instead of "make bootstrap" makes incremental diff --git a/pcr/firejail/001-addmoresecurity-firefox.patch b/pcr/firejail/001-addmoresecurity-firefox.patch new file mode 100644 index 000000000..4a7641e9a --- /dev/null +++ b/pcr/firejail/001-addmoresecurity-firefox.patch @@ -0,0 +1,35 @@ +*** firefox.profile 2015-07-02 06:53:18.000000000 -0400 +--- firefox-patched.profile 2015-08-21 22:14:06.891765532 -0400 +*************** +*** 2,9 **** + include /etc/firejail/disable-mgmt.inc + include /etc/firejail/disable-secret.inc + include /etc/firejail/disable-common.inc .mozilla + caps.drop all + seccomp + netfilter +! noroot +! +--- 2,21 ---- + include /etc/firejail/disable-mgmt.inc + include /etc/firejail/disable-secret.inc + include /etc/firejail/disable-common.inc .mozilla ++ blacklist ${HOME}/.bash_history ++ blacklist ${HOME}/.ssh ++ blacklist ${HOME}/.sylpheed-2.0 ++ blacklist ${HOME}/.gnupg ++ blacklist ${HOME}/.mcabber ++ blacklist ${HOME}/.weechat ++ blacklist ${HOME}/.purple ++ blacklist ${HOME}/*.kdb ++ blacklist ${HOME}/*.dat ++ blacklist ${HOME}/*.key ++ blacklist ${HOME}/.electrum* ++ blacklist ${HOME}/.config/ ++ blacklist ${HOME}/.thumnails/ ++ blacklist ${HOME}/.zsh_history + caps.drop all + seccomp + netfilter +! noroot +\ No newline at end of file diff --git a/pcr/firejail/PKGBUILD b/pcr/firejail/PKGBUILD index 00503d8ad..d0efc4613 100644 --- a/pcr/firejail/PKGBUILD +++ b/pcr/firejail/PKGBUILD @@ -3,30 +3,50 @@ pkgname=firejail pkgver=0.9.28 -pkgrel=1 +pkgrel=2 pkgdesc="Linux namespaces sandbox program" -arch=(i686 x86_64) +arch=('i686' 'x86_64' 'armv7h') license=(GPL2) url=https://l3net.wordpress.com/projects/firejail/ -backup=(etc/firejail/login.users) -source=("https://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgname-$pkgver-rc1.tar.bz2" +source=("https://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgname-$pkgver.tar.bz2" 'PKGBUILD' -'PKGBUILD.sig') +'PKGBUILD.sig' +'001-addmoresecurity-firefox.patch' +"$pkgname.install") +install=("$pkgname.install") validpgpkeys=('CB6E213A349B8DF9E96B622AC3F4FFCF3EAE8697') # PKGBUILD Maintainer's key -sha512sums=('11343f51e1985483896a65dc21c4d9f82fe863649b817bab3cf748a198f67687114966558abb6029e0055984ce59262022f33a9bf74ba27ed2425592b32e5432' +sha512sums=('a0c6715cbaf1043f2ea92b33da5884b6ed0993b3e5d03a3edd181b6663a696a2a60a44e0ad39fc9fcfd50d79eb5acb2f0f33452467bf50912f558ec23ebfc125' + 'SKIP' + 'SKIP' + 'b1ce36df78882e9e3a9b9a6b043ce0c11b4de71cf400abf19ee808d45081f9bfc6a56911bc5befae9ac374e88fb1a57326770781b3aedb2fdd54a95e8443a441' + 'f573592cc977cc739d2913f75ebe1ab2642d1d7d638706c56bca792dce6014d88c8789341ddeae59307aa94f72f3ab178299652b71a62804b1b674433a89ec21') +whirlpoolsums=('84792b384d4e578347a859354d5639be24c3b370c3c6c07d245bbd35b7d6adcac8f5f382e92dec55a3a53cc68ea00fb7071be01aa390b37df5e0768f00efd90e' 'SKIP' -'SKIP') -whirlpoolsums=('02f9c641e91b4959383f3d61e03cc467a85f5bd7bdec52b137c061cec144573f7f3ecab47fa390aac6f497423fdac3adfd992e2851b32f9435c0e746fba730ca' 'SKIP' -'SKIP') +'66ba5f7ca349c63170bd7ac83b7bc0c9472ad5bb18c243842f969f40475ebbb84c37bd3b837f21058294dc5da14674d07b74026dbcc324324fb94b6a8abfee4f' +'8f6848ad73bb498cb6a4f754a55094629443e7f56d669990e8e3f33415ba723d7ba47eb65737dd3ed918299665bf9bd455c25b5005caa74bb8c8dbb5e02ab4dc') prepare() { - cd "${srcdir}/${pkgname}-${pkgver}-rc1" + cd "${srcdir}/${pkgname}-${pkgver}" sed -i '\|bash -c "if \[ ! -f /etc/firejail/login\.users | s|bash -c ".*"$|install -c -m 0644 etc/login.users $(DESTDIR)/etc/firejail/\.|' Makefile.in ## Fix "backup entry file not in packag" warning. + patch ${srcdir}/${pkgname}-${pkgver}/etc/firefox.profile $srcdir/001-addmoresecurity-firefox.patch ## Add additional blacklists to FireFox profile for more security + + ## Remove non-libre program profiles. + rm ${srcdir}/${pkgname}-${pkgver}/etc/dropbox.profile + sed -i 's|install -c -m 0644 etc/dropbox.profile $(DESTDIR)/etc/firejail/.||' ${srcdir}/${pkgname}-${pkgver}/Makefile + sed -i 's|install -c -m 0644 etc/dropbox.profile $(DESTDIR)/etc/firejail/.||' ${srcdir}/${pkgname}-${pkgver}/Makefile.in + + rm ${srcdir}/${pkgname}-${pkgver}/etc/chromium.profile + sed -i 's|install -c -m 0644 etc/chromium.profile $(DESTDIR)/etc/firejail/.||' ${srcdir}/${pkgname}-${pkgver}/Makefile + sed -i 's|install -c -m 0644 etc/chromium.profile $(DESTDIR)/etc/firejail/.||' ${srcdir}/${pkgname}-${pkgver}/Makefile.in + + rm ${srcdir}/${pkgname}-${pkgver}/etc/chromium-browser.profile + sed -i 's|install -c -m 0644 etc/chromium-browser.profile $(DESTDIR)/etc/firejail/.||' ${srcdir}/${pkgname}-${pkgver}/Makefile + sed -i 's|install -c -m 0644 etc/chromium-browser.profile $(DESTDIR)/etc/firejail/.||' ${srcdir}/${pkgname}-${pkgver}/Makefile.in } build() { - cd "${srcdir}/${pkgname}-${pkgver}-rc1" + cd "${srcdir}/${pkgname}-${pkgver}" # fix build export CFLAGS=${CFLAGS/-fsanitize=undefined/} ./configure --prefix=/usr @@ -34,6 +54,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}-rc1" + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install -}
\ No newline at end of file +} diff --git a/pcr/firejail/PKGBUILD.sig b/pcr/firejail/PKGBUILD.sig Binary files differindex 3704c880c..b245ce73e 100644 --- a/pcr/firejail/PKGBUILD.sig +++ b/pcr/firejail/PKGBUILD.sig diff --git a/pcr/firejail/firejail.install b/pcr/firejail/firejail.install new file mode 100644 index 000000000..e154e7dd7 --- /dev/null +++ b/pcr/firejail/firejail.install @@ -0,0 +1,119 @@ +pre_upgrade() { +echo "Checking 26 firejail profiles for user modification, backing up as needed..." + FilesToCheck=( +'/etc/firejail/audacious.profile' +'/etc/firejail/clementine.profile' +'/etc/firejail/deadbeef.profile' +'/etc/firejail/deluge.profile' +'/etc/firejail/disable-common.inc' +'/etc/firejail/disable-mgmt.inc' +'/etc/firejail/disable-secret.inc' +'/etc/firejail/empathy.profile' +'/etc/firejail/evince.profile' +'/etc/firejail/filezilla.profile' +'/etc/firejail/firefox.profile' +'/etc/firejail/generic.profile' +'/etc/firejail/gnome-mplayer.profile' +'/etc/firejail/login.users' +'/etc/firejail/midori.profile' +'/etc/firejail/opera.profile' +'/etc/firejail/pidgin.profile' +'/etc/firejail/qbittorrent.profile' +'/etc/firejail/quassel.profile' +'/etc/firejail/rhythmbox.profile' +'/etc/firejail/server.profile' +'/etc/firejail/thunderbird.profile' +'/etc/firejail/totem.profile' +'/etc/firejail/transmission-gtk.profile' +'/etc/firejail/transmission-qt.profile' +'/etc/firejail/vlc.profile' +'/etc/firejail/xchat.profile') + +OriginalFileHashes=( +'53d86924bad531072cf279faa63e0a6a6c6ccb22aeae2ba7ddfc7dcab8b09b7a563aeab758cbcbf13ec5f7319066bb0fec3ba2356177e3b8449c58ee5929a766' +'2c13c77de38d6a7c6513ee754e6cd3ca446019b0716b3db2fb90bb3befcc1bfa2de80a06255048e5f82571de076690ddd8c543ab12104f6843a520e7de042147' +'9572631ca9551866c2af91f0fed148e2be6d9ec34dff7773d6589c7245d61e6d17f7421176cbfdeadc08289b0a0c4d74453e2d79eb847355506657e98440b924' +'f730544fdc1a2db051cb73c02722c7f87f4d4536db6f853d1852ee19f527c17abb1ed91879a2b593d2704f8e63e99c4a46640187fe882d4aaced4f7c03c06c46' +'fa89a0ccaa3d3018273b2b66cb3b6e21f0b4582ecde7139a2db3523497a4da14af8ccb969707a32f7ce2f4083405a942ce9af4212948469bd1b0cd8b438e525a' +'d0808badde2e695b77900cf13f89503e23dc2a233e2489e8590551adef061390bdb77c815a7fb59a48a103340ea288832d00dd0a8ce78bd24595ca2f352c9f8f' +'52f550486c4baa03c1327d75765c0edcc3397113fab4190e7644c53112810e5bbcc89cfc8b2c1147a724366a5dffd69dce334daaf4f3ae8e754e35bc38daeedc' +'33251ba45f3f18397956ec28c6ba55e94c8638bf5b1c1de2c49d5383fc2d519f21b5e757e22f747811c1335e745607968aac1fdd93438276223c6b4c5b2bd954' +'8f7f282ada4b557b78b33dd788753daf46b10dbdd2f7f72c25fc787ca98cf99d8a45c0db54d60fa0b1bd912cbbda95bb845d373c865e9b1884b1d3e480ec2b85' +'1088d1921b3c335789fc38e05fe7a898c9615f8fb769d388b6c6d02280891dc64b8b648351b2d5edff62298b46ed21792c0ffc611858697ae02455c5ae8993a7' +'c7b3bca2f1f9fa0a2769754fc8c341a5e2a9e67613a3329e59797a93dcb5fc41c4c8d08196c41d236e4878bd48fcd44fd1737aa6971a4df2a192da522b96cac4' +'a60b88a35228f3f8b4a3acd3dce527f3b873b095f1cf28a701baa5b310ad8b85e36ad633c8ddf8c2378a1d40c634164ada63764da1f9750507e55717affe8f46' +'16777da4a6552b7a39909d7faae0aff13a7e82887409a548433a0575443cf45fa28ecfdd8d43e146a6afa5a5a7298c64aa878bc6d82d2a7b8a2ca666cdb8d2c4' +'672fa8b25ed28a07efb41fad6415c9fa96ce4bf4f4a1a6412595afb309ef6c1e67033ee256f997c32e9abe25bd6a100160ff12f2235c9be289c223547d03ca95' +'6aa7ee675b9607313056f9ab70085e9bac7c1cc3b88f3134da3bb7052100b39ed6553b261044be3f87c283543f1231eda1145392536f2a02cf97ba7d5657e969' +'1864b178483193f7a5360685573ce1c60f383924a2dd34dcd218f063b4ce6a12ca4a065a9881f685c11f7ce63cc75b822836491fcbe042c0825d432bc4fb58df' +'8be0eef7d351f68343ec3cb14dbafab0bcac604b216f5f18f3624be1270c2a223b5a4560197c0e565c40005f28a640743736d873bf3bc47dcb3df6e5746e9031' +'16ed951fafad9d07c294b80be98f694fdc47dd525c8373ac83317cb0f1665bfa70111a7eaeeda09eff3544b45507277c12c9d8618958ec38b17e1307daccca70' +'c89b5fcd02d17fcb65661bcd8ac7d230f11b8ed0c50db864bd70e4d077bac1a210526bfc4ced54dbd5e5fc62520b5b9d51c3ede841c1fc1a29afceece9062303' +'8eb8ed39164a8d2a50c06447da745be719eb02005dcdc483d5751a8e2f2390f7329845f3e9022c6fb71814f67b31aa7468fe958d2783c67276e3fc3120bef04b' +'bcc313205c260117e40fac28fc1a282b5f36a97bd7252780c628bfc48971ec2aadd99209442600d3b52b78e932982549baf0c9ba1e791f3ea7fe451e7e7a03a3' +'d739970917e87e89dc746e749f0c8bfe6cce22dd1864d2f115758627f934916aabe5d01c3c5cbe60866a1c0a1d6908df2cd1126d1d78301216678f9ab13f2a9a' +'8a65f7e84c2071869a64a493fe6ce74ef77b50f8f34c6b6cdd4e987740a3628cbf2dd02791ff89d53b7b01c1857ab4d8dba8fd5b30e82ccecb294d6bcf4e4bf3' +'25800523958101d249b96c994fb33bb1e2c646f6af4af6adcedf9aab993a5ae3d3a72dcc340cbabcb9bc0d07cb64155ae21ba6ce87a984594741b1bb806a0b75' +'a2ad0be0e77719ad5bea6167692629f5c8cc5cfaecbdf98ecf32ddd8877aac443ddd20a7201adab202b3497394c700c69de533eb493f8203ebb36b887f78d258' +'a28765a1d99dadcf4bf47774b18305167f81d136b8588420b675ee998f5d0077018d9142269968912b5e4a91559ab3a9e4fe9e8c4b0ed11cb4faa543042fb63d' +'f4ee69f5ef1487ae2b269e43c9bc61fefac168134611bcd10f3dfc2b259430815391a3e89724e8f4830d4a9effe8827ec49237453421f4ffb4f276c0362043ef') + +## Uses above arrays to check if file's original hash matches, if not the file was edited, so we save a backup and notify the user. + +[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[0]} | awk '{print $1}')" = ${OriginalFileHashes[0]} ]] || { cat "${FilesToCheck[0]}" > "${FilesToCheck[0]}.pacsave" ; echo "Backup saved: ${FilesToCheck[0]}.pacsave"; } + +[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[1]} | awk '{print $1}')" = ${OriginalFileHashes[1]} ]] || { cat "${FilesToCheck[1]}" > "${FilesToCheck[1]}.pacsave" ; echo "Backup saved: ${FilesToCheck[1]}.pacsave"; } + +[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[2]} | awk '{print $1}')" = ${OriginalFileHashes[2]} ]] || { cat "${FilesToCheck[2]}" > "${FilesToCheck[2]}.pacsave" ; echo "Backup saved: ${FilesToCheck[2]}.pacsave"; } + +[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[3]} | awk '{print $1}')" = ${OriginalFileHashes[3]} ]] || { cat "${FilesToCheck[3]}" > "${FilesToCheck[3]}.pacsave" ; echo "Backup saved: ${FilesToCheck[3]}.pacsave"; } + +[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[4]} | awk '{print $1}')" = ${OriginalFileHashes[4]} ]] || { cat "${FilesToCheck[4]}" > "${FilesToCheck[4]}.pacsave" ; echo "Backup saved: ${FilesToCheck[4]}.pacsave"; } + +[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[5]} | awk '{print $1}')" = ${OriginalFileHashes[5]} ]] || { cat "${FilesToCheck[5]}" > "${FilesToCheck[5]}.pacsave" ; echo "Backup saved: ${FilesToCheck[5]}.pacsave"; } + +[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[6]} | awk '{print $1}')" = ${OriginalFileHashes[6]} ]] || { cat "${FilesToCheck[6]}" > "${FilesToCheck[6]}.pacsave" ; echo "Backup saved: ${FilesToCheck[6]}.pacsave"; } + +[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[7]} | awk '{print $1}')" = ${OriginalFileHashes[7]} ]] || { cat "${FilesToCheck[7]}" > "${FilesToCheck[7]}.pacsave" ; echo "Backup saved: ${FilesToCheck[7]}.pacsave"; } + +[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[8]} | awk '{print $1}')" = ${OriginalFileHashes[8]} ]] || { cat "${FilesToCheck[8]}" > "${FilesToCheck[8]}.pacsave" ; echo "Backup saved: ${FilesToCheck[8]}.pacsave"; } + +[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[9]} | awk '{print $1}')" = ${OriginalFileHashes[9]} ]] || { cat "${FilesToCheck[9]}" > "${FilesToCheck[9]}.pacsave" ; echo "Backup saved: ${FilesToCheck[9]}.pacsave"; } + +[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[10]} | awk '{print $1}')" = ${OriginalFileHashes[10]} ]] || { cat "${FilesToCheck[10]}" > "${FilesToCheck[10]}.pacsave" ; echo "Backup saved: ${FilesToCheck[10]}.pacsave"; } + +[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[11]} | awk '{print $1}')" = ${OriginalFileHashes[11]} ]] || { cat "${FilesToCheck[11]}" > "${FilesToCheck[11]}.pacsave" ; echo "Backup saved: ${FilesToCheck[11]}.pacsave"; } + +[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[12]} | awk '{print $1}')" = ${OriginalFileHashes[12]} ]] || { cat "${FilesToCheck[12]}" > "${FilesToCheck[12]}.pacsave" ; echo "Backup saved: ${FilesToCheck[12]}.pacsave"; } + +[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[13]} | awk '{print $1}')" = ${OriginalFileHashes[13]} ]] || { cat "${FilesToCheck[13]}" > "${FilesToCheck[13]}.pacsave" ; echo "Backup saved: ${FilesToCheck[13]}.pacsave"; } + +[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[14]} | awk '{print $1}')" = ${OriginalFileHashes[14]} ]] || { cat "${FilesToCheck[14]}" > "${FilesToCheck[14]}.pacsave" ; echo "Backup saved: ${FilesToCheck[14]}.pacsave"; } + +[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[15]} | awk '{print $1}')" = ${OriginalFileHashes[15]} ]] || { cat "${FilesToCheck[15]}" > "${FilesToCheck[15]}.pacsave" ; echo "Backup saved: ${FilesToCheck[15]}.pacsave"; } + +[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[16]} | awk '{print $1}')" = ${OriginalFileHashes[16]} ]] || { cat "${FilesToCheck[16]}" > "${FilesToCheck[16]}.pacsave" ; echo "Backup saved: ${FilesToCheck[16]}.pacsave"; } + +[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[17]} | awk '{print $1}')" = ${OriginalFileHashes[17]} ]] || { cat "${FilesToCheck[17]}" > "${FilesToCheck[17]}.pacsave" ; echo "Backup saved: ${FilesToCheck[17]}.pacsave"; } + +[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[18]} | awk '{print $1}')" = ${OriginalFileHashes[18]} ]] || { cat "${FilesToCheck[18]}" > "${FilesToCheck[18]}.pacsave" ; echo "Backup saved: ${FilesToCheck[18]}.pacsave"; } + +[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[19]} | awk '{print $1}')" = ${OriginalFileHashes[19]} ]] || { cat "${FilesToCheck[19]}" > "${FilesToCheck[19]}.pacsave" ; echo "Backup saved: ${FilesToCheck[19]}.pacsave"; } + +[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[20]} | awk '{print $1}')" = ${OriginalFileHashes[20]} ]] || { cat "${FilesToCheck[20]}" > "${FilesToCheck[20]}.pacsave" ; echo "Backup saved: ${FilesToCheck[20]}.pacsave"; } + +[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[21]} | awk '{print $1}')" = ${OriginalFileHashes[21]} ]] || { cat "${FilesToCheck[21]}" > "${FilesToCheck[21]}.pacsave" ; echo "Backup saved: ${FilesToCheck[21]}.pacsave"; } + +[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[22]} | awk '{print $1}')" = ${OriginalFileHashes[22]} ]] || { cat "${FilesToCheck[22]}" > "${FilesToCheck[22]}.pacsave" ; echo "Backup saved: ${FilesToCheck[22]}.pacsave"; } + +[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[23]} | awk '{print $1}')" = ${OriginalFileHashes[23]} ]] || { cat "${FilesToCheck[23]}" > "${FilesToCheck[23]}.pacsave" ; echo "Backup saved: ${FilesToCheck[23]}.pacsave"; } + +[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[24]} | awk '{print $1}')" = ${OriginalFileHashes[24]} ]] || { cat "${FilesToCheck[24]}" > "${FilesToCheck[24]}.pacsave" ; echo "Backup saved: ${FilesToCheck[24]}.pacsave"; } + +[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[25]} | awk '{print $1}')" = ${OriginalFileHashes[25]} ]] || { cat "${FilesToCheck[25]}" > "${FilesToCheck[25]}.pacsave" ; echo "Backup saved: ${FilesToCheck[25]}.pacsave"; } + +[[ "$(openssl dgst -r -whirlpool ${FilesToCheck[26]} | awk '{print $1}')" = ${OriginalFileHashes[26]} ]] || { cat "${FilesToCheck[26]}" > "${FilesToCheck[26]}.pacsave" ; echo "Backup saved: ${FilesToCheck[26]}.pacsave"; } + +echo "Done!" + +}
\ No newline at end of file diff --git a/pcr/gmusicbrowser/PKGBUILD b/pcr/gmusicbrowser/PKGBUILD index f8dd68ee2..b55bfea61 100644 --- a/pcr/gmusicbrowser/PKGBUILD +++ b/pcr/gmusicbrowser/PKGBUILD @@ -4,8 +4,8 @@ # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=gmusicbrowser -pkgver=1.1.14 -pkgrel=3 +pkgver=1.1.15 +pkgrel=2 pkgdesc="A customizable open-source jukebox for large collections" arch=('any') url="http://gmusicbrowser.org" @@ -16,13 +16,14 @@ optdepends=('alsa-utils: enables the ALSA backend' 'mpg321: mp3 support for the ALSA backend' 'vorbis-tools: vorbis support for the ALSA backend' 'mplayer: enables the mplayer backend' + 'mpv: enables the mpv backend' 'gstreamer: enables the gstreamer backend' 'perl-glib-object-introspection: enables the gstreamer backend' 'gst-plugins-base: vorbis support for the gstreamer backend' 'gst-plugins-good: flac support for the gstreamer backend' 'gst-plugins-bad: mpc support for the gstreamer backend' 'gst-plugins-ugly: mp3 support for the gstreamer backend' - 'perl-gstreamer: enables the gstreamer0.10 backend' + 'perl-gstreamer: enables the old gstreamer0.10 backend' 'gstreamer0.10-base: vorbis support for the gstreamer0.10 backend' 'gstreamer0.10-good-plugins: flac support for the gstreamer0.10 backend' 'gstreamer0.10-bad-plugins: mpc support for the gstreamer0.10 backend' @@ -39,16 +40,10 @@ conflicts=('gmusicbrowser-devel' 'gmusicbrowser-development' 'gmusicbrowser-git' options=('!libtool') install=$pkgname.install source=($url/download/$pkgname-$pkgver.tar.gz) -md5sums=('8eb2d3f22e0734a7f5efbf4f0b2bd71e') +md5sums=('4a16dcbe369d4b3cb78fb1a6967a60b3') package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir/" install - - # put some images in sane locations - install -Dm644 pix/trayicon.png "$pkgdir"/usr/share/icons/hicolor/16x16/apps/gmusicbrowser.png - install -Dm644 pix/gmusicbrowser32x32.png "$pkgdir"/usr/share/icons/hicolor/32x32/apps/gmusicbrowser.png - install -Dm644 pix/gmusicbrowser.png "$pkgdir"/usr/share/icons/hicolor/48x48/apps/gmusicbrowser.png - install -Dm644 pix/gmusicbrowser.png "$pkgdir"/usr/share/pixmaps/gmusicbrowser.png } diff --git a/pcr/gmusicbrowser/gmusicbrowser.install b/pcr/gmusicbrowser/gmusicbrowser.install index 2035fe0b0..049ea6f0a 100644 --- a/pcr/gmusicbrowser/gmusicbrowser.install +++ b/pcr/gmusicbrowser/gmusicbrowser.install @@ -4,7 +4,8 @@ post_install() { ==> In order to play your music with gmusicbrowser, you need to install: - gstreamer, perl-glib-object-introspection + gstreamer plugins or - mpg321/vorbis-tools/flac123/alsa-utils or -- mplayer +- mplayer or +- mpv (look at optdepends for details) _EOF diff --git a/pcr/gnoduino/PKGBUILD b/pcr/gnoduino/PKGBUILD index 329c5a5bd..3d719723f 100644 --- a/pcr/gnoduino/PKGBUILD +++ b/pcr/gnoduino/PKGBUILD @@ -1,19 +1,20 @@ -# Maintainer : Aurelien Desbriers <aurelien@hackers.camp> -# Contributor: speps <speps at aur dot archlinux dot org> +# Maintainer (Arch): speps <speps at aur dot archlinux dot org> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=gnoduino pkgver=0.5.1 -pkgrel=1 +pkgrel=2 pkgdesc="An implementation of well-known Arduino IDE for GNOME" arch=(any) url="http://gnome.eu.org/index.php/Gnoduino" license=('GPL') -depends=('avr-libc' 'avrdude' 'avr-binutils' 'gcc-avr' 'pyxdg' +depends=('avr-libc' 'avrdude' 'avr-binutils' 'avr-gcc' 'pyxdg' 'pygtksourceview2' 'python2-pyserial' 'python2-gconf' 'desktop-file-utils') makedepends=('python2-distribute') install="$pkgname.install" source=("http://gnome.eu.org/$pkgname-$pkgver.tar.gz") +md5sums=('e458acd24860e28acec7fa71bb9cfe2f') prepare() { cd $pkgname-$pkgver diff --git a/pcr/grub2-theme-gnuaxiom/PKGBUILD b/pcr/grub2-theme-gnuaxiom/PKGBUILD new file mode 100644 index 000000000..f3aa8b887 --- /dev/null +++ b/pcr/grub2-theme-gnuaxiom/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697 + +pkgname=grub2-theme-gnuaxiom +_pkgname=GNUAxiom +pkgver=1.01 +pkgrel=1 +pkgdesc="A Parabola GNU/Linux-libre theme for grub2, forked from Axiom." +arch=('any') +url="https://github.com/g4jc/GNUAxiom" +license=('GPL2') +makedepends=('grub') +source=("https://github.com/g4jc/$_pkgname/archive/$pkgver.tar.gz") +install=("$pkgname.install") +sha512sums=('fce534c2f39b0fa210eeff9767f58a4aa9ad0a2f7f17edd0cea47ff217daaa6ad14c128d47eb840f03c0a675dfd1e39779cff3d6100808bdf4f62a837f116bf6') + +prepare() { +cd $srcdir + mv $_pkgname-$pkgver $_pkgname +} + +package() { + cd $srcdir + find . -type f -exec install -D -m644 {} ${pkgdir}/boot/grub/themes/{} \; +} diff --git a/pcr/grub2-theme-gnuaxiom/grub2-theme-gnuaxiom.install b/pcr/grub2-theme-gnuaxiom/grub2-theme-gnuaxiom.install new file mode 100644 index 000000000..a8470e53b --- /dev/null +++ b/pcr/grub2-theme-gnuaxiom/grub2-theme-gnuaxiom.install @@ -0,0 +1,10 @@ +post_install() { + cat << _EOF + +==> Installation: +==> Add theme to your /etc/default/grub: GRUB_THEME="/boot/grub/themes/GNUAxiom/theme.txt" +==> Preferred resolution 1024x768: GRUB_GFXMODE=1024x768 +==> Update grub:# grub-mkconfig -o /boot/grub/grub.cfg + +_EOF +}
\ No newline at end of file diff --git a/pcr/gtk-theme-elementary/PKGBUILD b/pcr/gtk-theme-elementary/PKGBUILD index 87b1bd1a9..e482d3a3c 100644 --- a/pcr/gtk-theme-elementary/PKGBUILD +++ b/pcr/gtk-theme-elementary/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=gtk-theme-elementary -pkgver=4.0.3 +pkgver=4.0.4 pkgrel=1 pkgdesc="The official elementary GTK theme designed to be smooth, attractive, fast, and usable." arch=('any') @@ -13,8 +13,8 @@ groups=('pantheon') depends=('gtk-engine-murrine') optdepends=('elementary-icon-theme: the elementary icon theme') conflicts=('elementary-gtk-theme' 'egtk-bzr') -source=("$pkgname-$pkgver.tar.gz::https://launchpad.net/egtk/4.x/$pkgver/+download/elementary.tar.gz") -md5sums=('ddd7a10fa56acfc85b53350f28ed521c') +source=("$pkgname-$pkgver.tar.xz::https://launchpad.net/egtk/4.x/$pkgver/+download/elementary.tar.xz") +md5sums=('89388e3c31db64fb57a0aabdb544a636') package() { cd elementary diff --git a/pcr/gws/ChangeLog b/pcr/gws/ChangeLog new file mode 100644 index 000000000..781de8fab --- /dev/null +++ b/pcr/gws/ChangeLog @@ -0,0 +1,40 @@ +2015-03-12 Fabien Dubosson <fabien.dubosson@gmail.com> + + * 0.1.7-1: + New upstream release + +2015-02-12 Fabien Dubosson <fabien.dubosson@gmail.com> + + * 0.1.5-1: + New upstream release + +2014-05-11 Fabien Dubosson <fabien.dubosson@gmail.com> + + * 0.1.4-1: + New upstream release + +2014-02-04 Fabien Dubosson <fabien.dubosson@gmail.com> + + * 0.1.3-3: + Uniformalize PKGBUILD notations + +2014-01-20 Fabien Dubosson <fabien.dubosson@gmail.com> + + * 0.1.3-2: + Patch minor bug, already patched upstream for future version + +2014-01-20 Fabien Dubosson <fabien.dubosson@gmail.com> + + * 0.1.3-1: + New upstream release + +2014-01-13 Fabien Dubosson <fabien.dubosson@gmail.com> + + * 0.1.2-1 : + New upstream release + +2014-01-09 Fabien Dubosson <fabien.dubosson@gmail.com> + + * 0.1.1-1 : + Package created + diff --git a/pcr/gws/PKGBUILD b/pcr/gws/PKGBUILD new file mode 100644 index 000000000..f737d4316 --- /dev/null +++ b/pcr/gws/PKGBUILD @@ -0,0 +1,23 @@ +# Maintainer (Arch): Fabien Dubosson <fabien.dubosson@gmail.com> + +pkgname="gws" +pkgver="0.1.8" +pkgrel="1" +pkgdesc="Colorful KISS helper for git workspaces" +url="https://github.com/StreakyCobra/gws" +license=('MIT') +arch=('any') +depends=('bash>4.0' 'git') +changelog="ChangeLog" +source=("https://github.com/StreakyCobra/${pkgname}/archive/${pkgver}.tar.gz") +md5sums=('f6da0de648b5af5ce818e109f39f003f') + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/" + + install -D -m755 'src/gws' "${pkgdir}/usr/bin/${pkgname}" + install -D -m755 'completions/zsh' "${pkgdir}/usr/share/zsh/site-functions/_${pkgname}" + install -D -m755 'completions/bash' "${pkgdir}/usr/share/bash-completion/completions/${pkgname}" +} + +# vim:set ts=4 sw=4 et: diff --git a/pcr/laptop-mode-tools/PKGBUILD b/pcr/laptop-mode-tools/PKGBUILD index 39522fcd4..ab6567d6c 100644 --- a/pcr/laptop-mode-tools/PKGBUILD +++ b/pcr/laptop-mode-tools/PKGBUILD @@ -5,14 +5,14 @@ # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=laptop-mode-tools -pkgver=1.67 +pkgver=1.68 pkgrel=1 _pkgrel=1 pkgdesc='Power Savings tool for Linux' arch=('any') url='https://github.com/rickysarraf/laptop-mode-tools' source=(${pkgname}-${pkgver}-${_pkgrel}.tar.gz::https://github.com/rickysarraf/laptop-mode-tools/archive/debian/${pkgver}-${_pkgrel}.tar.gz) -sha256sums=('9481c741ef0027479f218752230c2bb9b12edd54d6f43fafa10b72d37df17ebd') +sha256sums=('c21b43fb9cd3d6c4d7f75fe3b720f25369bceb938ebd9073f4dbcd43ef93738a') license=('GPL2') depends=('bash') optdepends=('acpid: ACPI support' diff --git a/pcr/lives/PKGBUILD b/pcr/lives/PKGBUILD index 8b76a7ce0..3203e5c34 100644 --- a/pcr/lives/PKGBUILD +++ b/pcr/lives/PKGBUILD @@ -1,21 +1,21 @@ # Contributor (Arch): Angelo Theodorou <encelo@users.sourceforge.net> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=lives -pkgver=2.2.8 +pkgver=2.4.1 pkgrel=1 pkgdesc="A Video Editing System" arch=('i686' 'x86_64') -url="http://lives.sourceforge.net" +url="http://lives-video.com" license=('GPL') -depends=('mplayer' 'imagemagick' 'gtk3' 'sox' 'libvisual' 'liboil' 'libavc1394' 'mjpegtools' 'python' 'ffmpeg' 'ffmpeg-compat' 'jack' 'fftw') +depends=('mplayer' 'imagemagick' 'gtk3' 'sox' 'libvisual' 'liboil' 'libavc1394' 'mjpegtools' 'python' 'ffmpeg' 'jack' 'fftw') optdepends=('xorg-utils' 'sdl' 'libogg' 'mkvtoolnix-cli' 'libmatroska' 'ogmtools' 'dvgrab' 'cdrkit' 'lame' 'youtube-dl') options=(!libtool) -source=(http://www.xs4all.nl/%7Esalsaman/lives/current/LiVES-$pkgver.tar.bz2) -md5sums=('8440e2a2b6e83655dfc39c9fef5ee903') +source=(http://lives-video.com/releases/LiVES-$pkgver.tar.bz2) +md5sums=('83279d1e0e73973a9bf41b48af2cb03c') build() { cd "$srcdir"/$pkgname-$pkgver - sed -i 's/gtk_label_set_y_align/gtk_label_set_yalign/g' src/widget-helper.c + # /bin/touch -> /usr/bin/touch find -type f -exec sed -i 's:/bin/touch:/usr&:g' {} \; ./configure --prefix=/usr diff --git a/pcr/mediatomb/PKGBUILD b/pcr/mediatomb/PKGBUILD index 036632eef..1d5a83234 100644 --- a/pcr/mediatomb/PKGBUILD +++ b/pcr/mediatomb/PKGBUILD @@ -1,16 +1,17 @@ -# Contributor: Martin Villagra <mvillagra0@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> -# Contributor: Nikhil Bysani <nikron@gmail.com> -# Contributor: Mika Hynnä <igheax@gmail.com> -# Contributor: Jonathan Conder <jonno.conder@gmail.com> -# Contributor: Peter Richard Lewis <plewis@aur.archlinux.org> -# Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Maintainer (Arch): S Leduc <sebastien@sleduc.fr> +# Contributor (Arch): Martin Villagra <mvillagra0@gmail.com> +# Contributor (Arch): William Rea <sillywilly@gmail.com> +# Contributor (Arch): Nikhil Bysani <nikron@gmail.com> +# Contributor (Arch): Mika Hynnä <igheax@gmail.com> +# Contributor (Arch): Jonathan Conder <jonno.conder@gmail.com> +# Contributor (Arch): Peter Richard Lewis <plewis@aur.archlinux.org> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=mediatomb pkgver=0.12.1 -pkgrel=12.1 +pkgrel=13 pkgdesc="Free UPnP/DLNA media server" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'armv6h') url="http://mediatomb.cc/" license=('GPL') depends=('file' 'curl' 'ffmpegthumbnailer' 'libexif' 'libmp4v2' 'sqlite3' 'taglib' 'libmariadbclient' 'js185') @@ -28,18 +29,17 @@ source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" 'libmp4v2_191_p497.patch' 'libavformat.patch' 'symlinks.patch') -md5sums=('e927dd5dc52d3cfcebd8ca1af6f0d3c2' - '951b133930436a0ffc1c9b0c9f8145a3' - '27e796979c7778c3876b9a16452eb6e4' - '6503695608c811133db647e0991698eb' - '0ae34c0d73b76e3d215887834c3c08cf' - 'd9e02a9956eecf5ff645bddf6dac0331' - 'a7509bdaa0301ccbd9e564f727c1dd22' - '88144653ff2dc602bcb737f59b2421ce' - '915fa5b3b72649454009511a152b6102' - '932d29fbaaea6f1715bb6da456fb5f44' - 'e1de449736dab88cbb7e10e6bb63ff0d') - +sha256sums=('31163c34a7b9d1c9735181737cb31306f29f1f2a0335fb4f53ecccf8f62f11cd' + 'e46de674e49aa85116a8ff127908f7bac21198ce7625404004b8b7832eccd3f4' + '9c917f0d6e568ce0ad77c0ed17e4bbaabc0e7a1c0a3e4772b786fb1565db9768' + '70e4a4b89cef9a7f6f5f800e1793a6cb807f52b39e5a17d0a91356608b95e62d' + '0c02a20032f0c296800b1bb9644638970c2dedbc5ab7141d66a637235e9da6ce' + '2cd8f5628c3a38b290526f008bae351b90211825f86e5959bf95f140748de574' + 'd9a3062858900d32b977f0d50d168fd7d36785b6ecc038c019e661e27f7b1c17' + 'c6523e8bf5e2da89b7475d6777ef9bffe7d089752ef2f7b27b5e39a4130fb0ff' + 'd39c2f9aab051c5447461718fd0ec72cf5982f6c920a4a985a50831f34babe84' + '76b11706d70ed8f5e157d96ca441c90c46c42176102fcb651b4ab1102b61bfee' + '72f7532d7cd827ab655df652d2912175739fe16d2b1ad989d987a0b147a1d2e8') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/pcr/mediatomb/mediatomb-mariadb.service b/pcr/mediatomb/mediatomb-mariadb.service index 5b83f1d78..87b95e284 100644 --- a/pcr/mediatomb/mediatomb-mariadb.service +++ b/pcr/mediatomb/mediatomb-mariadb.service @@ -1,6 +1,6 @@ [Unit] Description=MediaTomb Daemon using MariaDB -After=mysql.target network.target +After=mysqld.target network.target [Service] EnvironmentFile=/etc/conf.d/mediatomb diff --git a/pcr/mediatomb/mediatomb.rc b/pcr/mediatomb/mediatomb.rc deleted file mode 100644 index 7b93012cd..000000000 --- a/pcr/mediatomb/mediatomb.rc +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/mediatomb - -MT_OPTIONS="-p $MT_PORT -u $MT_USER -g $MT_GROUP -P $MT_PIDFILE \ - -l $MT_LOGFILE -m $MT_HOME -f $MT_CFGDIR $MT_OPTIONS" - -case "$1" in - start) - stat_busy "Starting Mediatomb UPnP Media Server" - - chown "$MT_USER:$MT_GROUP" "$MT_HOME" - - if ! pidof -o %PPID /usr/bin/mediatomb &> /dev/null; then - rm -f "$MT_PIDFILE" - fi - - PID="$(cat "$MT_PIDFILE" 2> /dev/null)" - - if [ -z "$PID" ] && /usr/bin/mediatomb -d $MT_OPTIONS; then - add_daemon mediatomb - stat_done - else - stat_fail - fi - ;; - - stop) - stat_busy "Stopping Mediatomb UPnP Media Server" - - PID="$(cat "$MT_PIDFILE" 2> /dev/null)" - - if [ -n "$PID" ] && kill "$PID" &> /dev/null; then - rm -f "$MT_PIDFILE" - rm_daemon mediatomb - stat_done - else - stat_fail - fi - ;; - - restart) - "$0" stop - sleep 1 - "$0" start - ;; - - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/pcr/mgba-git/PKGBUILD b/pcr/mgba-git/PKGBUILD new file mode 100644 index 000000000..f08f1c107 --- /dev/null +++ b/pcr/mgba-git/PKGBUILD @@ -0,0 +1,76 @@ +# Maintainer: Márcio Silva <coadde@parabola.nu> + +# Based on mgba package + +_pkgbase=mgba +pkgbase=mgba-git +pkgname=('libmgba-git' 'mgba-sdl-git' 'mgba-qt-git') +pkgver=r2457.3a9ac18 +pkgrel=1 +arch=('i686' 'x86_64') +url='https://endrift.com/mgba/' +license=('custom:MPL2') +makedepends=('cmake' 'qt5-multimedia' 'sdl2' 'zlib' 'libpng' 'libzip' 'libedit' + 'ffmpeg' 'imagemagick' 'desktop-file-utils' 'git') +source=($_pkgbase::git+https://github.com/mgba-emu/mgba.git + mgba.desktop) +sha1sums=('SKIP' + '0f6f43ed45b702f6571c254d4717fbc1fe15e845') + +pkgver() { + cd mgba + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +} + +prepare() { + [[ ! -d build ]] && mkdir build || rm -rf build + + cd $_pkgbase/res + convert mgba-1024.png -resize 256x256 mgba-256.png +} + +build() { + cd build + cmake "$srcdir"/$_pkgbase -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_libmgba-git() { + pkgdesc='Shared library of mGBA' + depends=('zlib' 'libpng' 'libzip' 'libedit' 'ffmpeg' 'imagemagick') + provides=('libmgba') + conflicts=('libmgba') + + cmake -DCOMPONENT=libmgba $_pkgbase -DCMAKE_INSTALL_PREFIX="$pkgdir/usr" \ + -P build/cmake_install.cmake + install -Dm644 $_pkgbase/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} + +package_mgba-sdl-git() { + pkgdesc='A Nintendo Gameboy Advance Emulator focusing on both speed and accuracy' + depends=('libmgba' 'sdl2') + provides=('mgba-sdl') + conflicts=('mgba-sdl') + + cmake -DCOMPONENT=mgba-sdl $_pkgbase -DCMAKE_INSTALL_PREFIX="$pkgdir/usr" \ + -P build/cmake_install.cmake + + install -d "$pkgdir"/usr/share/licenses/$pkgname + ln -s /usr/share/licenses/libmgba/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} + +package_mgba-qt-git() { + pkgdesc='A Nintendo Gameboy Advance Emulator focusing on both speed and accuracy. Qt5 UI.' + depends=('libmgba' 'qt5-multimedia' 'sdl2') + provides=('mgba-qt') + conflicts=('mgba-qt') + + cmake -DCOMPONENT=mgba-qt $_pkgbase -DCMAKE_INSTALL_PREFIX="$pkgdir/usr" \ + -P build/cmake_install.cmake + + desktop-file-install mgba.desktop --dir "$pkgdir"/usr/share/applications/ + install -Dm644 $_pkgbase/res/mgba-256.png "$pkgdir"/usr/share/pixmaps/mgba.png + + install -d "$pkgdir"/usr/share/licenses/$pkgname + ln -s /usr/share/licenses/libmgba/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} diff --git a/pcr/mgba-git/mgba.desktop b/pcr/mgba-git/mgba.desktop new file mode 100644 index 000000000..8edb7e49e --- /dev/null +++ b/pcr/mgba-git/mgba.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=mGBA +Comment=mGBA Game Boy Advance Emulator +Icon=mgba.png +Exec=mgba-qt +Categories=Game;Emulator; +Terminal=false +StartupNotify=false diff --git a/pcr/minimodem/PKGBUILD b/pcr/minimodem/PKGBUILD new file mode 100644 index 000000000..66d5afca4 --- /dev/null +++ b/pcr/minimodem/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697 + +pkgname=minimodem +pkgver=0.21 +pkgrel=1 +pkgdesc="Minimodem is a command-line program which decodes (or generates) audio modem tones at any specified baud rate, using various framing protocols." +arch=('i686' 'x86_64') +url="http://www.whence.com/minimodem/" +license=('GPL3') +depends=('fftw' 'alsa-lib' 'libpulse' 'libsndfile') +makedepends=('gcc') +source=("http://www.whence.com/minimodem/$pkgname-$pkgver.tar.gz") +sha512sums=('e0de84cbfe350893c2142bfd31e664b13f85f48c4bb3e7cd34cb26e1ad190f46f389f22d0976ec56752ae221f2037ffb407f9947d99453b9e33bac639b503db3') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc --sbindir=/usr/bin + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir/" install +}
\ No newline at end of file diff --git a/pcr/mosquitto/PKGBUILD b/pcr/mosquitto/PKGBUILD index b11a40bb7..f0b1969f0 100644 --- a/pcr/mosquitto/PKGBUILD +++ b/pcr/mosquitto/PKGBUILD @@ -5,7 +5,7 @@ # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=mosquitto -pkgver=1.4.2 +pkgver=1.4.3 pkgrel=1 pkgdesc="An Open Source MQTT v3.1 Broker" arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h') @@ -17,10 +17,10 @@ provides=('mosquitto') license=('BSD') source=(http://mosquitto.org/files/source/$pkgname-$pkgver.tar.gz{,.asc} "$pkgname.service" "$pkgname.install" "usr_move.patch") install=$pkgname.install -sha256sums=('5ebc3800a0018bfbec62dcc3748fb29f628df068acd39c62c4ef651d9276647e' +sha256sums=('773d7436f729b5a6088035708c9277a9c6ba5651e127b63c8f29fe39e152479c' 'SKIP' 'b09c9852b5b438bad8dd54b3ac665bb0d05d1a9e4daf8c920956457c83622b64' - '877ce99413301b0525f40adb5322dc50e69e2f90092138bf495c393dec65d449' + '09b8a17fc59f36f40ead4644fffc95458a9255c32d4848f39ceca05925dcc95b' 'c436bcc5a61d923ab36d5b3f24e5f628bf18ef14c2f351633d58ca983b5f655c') validpgpkeys=('A0D6EEA1DCAE49A635A3B2F0779B22DFB3E717B7') diff --git a/pcr/mosquitto/mosquitto.install b/pcr/mosquitto/mosquitto.install index b2dfb9600..ab99d1d0f 100644 --- a/pcr/mosquitto/mosquitto.install +++ b/pcr/mosquitto/mosquitto.install @@ -1,10 +1,12 @@ post_install() { - getent group mosquitto > /dev/null || groupadd mosquitto - getent passwd mosquitto > /dev/null || useradd -c 'Mosquitto MQTT Broker daemon' -d /etc/mosquitto -s /bin/false -g mosquitto mosquitto + getent group mosquitto > /dev/null || groupadd -g 567 mosquitto + getent passwd mosquitto > /dev/null || useradd -c 'Mosquitto MQTT Broker daemon' -d /etc/mosquitto -s /bin/false -g mosquitto -u 567 -g 567 mosquitto } post_upgrade() { post_install $1 + usermod -u 567 mosquitto + groupmod -g 567 mosquitto } post_remove() { diff --git a/pcr/navit/PKGBUILD b/pcr/navit/PKGBUILD new file mode 100644 index 000000000..26c1fd653 --- /dev/null +++ b/pcr/navit/PKGBUILD @@ -0,0 +1,42 @@ +# Maintainer: André Silva <emulatorman@parabola.nu> +# Contributor (Arch): György Balló <ballogy@freestart.hu> +pkgname=navit +pkgver=0.2.0 +pkgrel=1 +pkgdesc="Car navigation system with routing engine" +arch=('i686' 'x86_64') +url="http://www.navit-project.org/" +license=('GPL') +depends=('gtk2' 'sdl_image' 'qt4' 'postgresql-libs' 'imlib2' 'dbus-glib' 'fribidi') +makedepends=('wget') +options=(!libtool) +install=navit.install +source=(http://downloads.sourceforge.net/navit/$pkgname-$pkgver.tar.gz + freetype2_include.patch) +md5sums=('7eea687219526275f7bd41888eda609b' + '8c552a90e251fdc69dd7b1d14ef1441d') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + # fix freetype2 include path + patch -Np1 -i $srcdir/freetype2_include.patch +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + rm -rf navit/graphics/qt_qpainter/graphics_qt_qpainter.moc + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static \ + --disable-binding-python \ + --disable-vehicle-gpsd + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} + diff --git a/pcr/navit/freetype2_include.patch b/pcr/navit/freetype2_include.patch new file mode 100644 index 000000000..32cf66ca9 --- /dev/null +++ b/pcr/navit/freetype2_include.patch @@ -0,0 +1,24 @@ +diff -Nur navit-0.2.0.orig/navit/font/freetype/font_freetype.c navit-0.2.0/navit/font/freetype/font_freetype.c +--- navit-0.2.0.orig/navit/font/freetype/font_freetype.c 2010-11-21 19:33:28.000000000 -0200 ++++ navit-0.2.0/navit/font/freetype/font_freetype.c 2015-08-21 16:54:27.439825363 -0300 +@@ -17,7 +17,7 @@ + #include <fribidi/fribidi-deprecated.h> + #endif + #endif +-#include <freetype/ftglyph.h> ++#include FT_GLYPH_H + #include "point.h" + #include "graphics.h" + #include "debug.h" +diff -Nur navit-0.2.0.orig/navit/graphics/sdl/graphics_sdl.c navit-0.2.0/navit/graphics/sdl/graphics_sdl.c +--- navit-0.2.0.orig/navit/graphics/sdl/graphics_sdl.c 2010-11-21 19:33:15.000000000 -0200 ++++ navit-0.2.0/navit/graphics/sdl/graphics_sdl.c 2015-08-21 16:53:51.388282249 -0300 +@@ -70,7 +70,7 @@ + #include <fontconfig/fontconfig.h> + #include <ft2build.h> + #include FT_FREETYPE_H +-#include <freetype/ftglyph.h> ++#include FT_GLYPH_H + #endif + #include <event.h> + diff --git a/pcr/navit/navit.install b/pcr/navit/navit.install new file mode 100644 index 000000000..2c455e952 --- /dev/null +++ b/pcr/navit/navit.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/pcr/networkmanager-consolekit/NetworkManager.conf b/pcr/networkmanager-consolekit/NetworkManager.conf index e01e3c52f..668229628 100644 --- a/pcr/networkmanager-consolekit/NetworkManager.conf +++ b/pcr/networkmanager-consolekit/NetworkManager.conf @@ -1,5 +1,7 @@ [main] plugins=keyfile +dhcp=dhclient +dns=default ## Set static hostname #[keyfile] @@ -8,3 +10,4 @@ plugins=keyfile ## HTTP-based connectivity check #[connectivity] #uri=http://nmcheck.gnome.org/check_network_status.txt +#interval=100 diff --git a/pcr/networkmanager-consolekit/PKGBUILD b/pcr/networkmanager-consolekit/PKGBUILD index 423bc1b87..6033cee6a 100644 --- a/pcr/networkmanager-consolekit/PKGBUILD +++ b/pcr/networkmanager-consolekit/PKGBUILD @@ -1,28 +1,27 @@ -# Maintainer : freaj <freaj@riseup.net> -# Maintainer (Manjaro): artoo <artoo@manjaro.org> -# Contributor (Manjaro): Alexey D. <lq07829icatm@rambler.ru> -# Contributor (Manjaro): DaZ <daz.root+arch@gmail.coM> -# Contributor (Manjaro): Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Contributor (Manjaro): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor (Manjaro): Jan de Groot <jgc@archlinxu.org> -# Contributor (Manjaro): Wael Nasreddine <gandalf@siemens-mobiles.org> -# Contributor (Manjaro): Tor Krill <tor@krill.nu> -# Contributor (Manjaro): Will Rea <sillywilly@gmail.com> -# Contributor (Manjaro): Valentine Sinitsyn <e_val@inbox.ru> +# Maintainer (Arch): Alexey D. <lq07829icatm@rambler.ru> +# Contributor (Arch): DaZ <daz.root+arch@gmail.coM> +# Contributor (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com> +# Contributor (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor (Arch): Jan de Groot <jgc@archlinxu.org> +# Contributor (Arch): Wael Nasreddine <gandalf@siemens-mobiles.org> +# Contributor (Arch): Tor Krill <tor@krill.nu> +# Contributor (Arch): Will Rea <sillywilly@gmail.com> +# Contributor (Arch): Valentine Sinitsyn <e_val@inbox.ru> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=networkmanager-consolekit _pkgname=NetworkManager -pkgver=1.0.0 -pkgrel=3 +pkgver=1.0.6 +pkgrel=1 _pppver=2.4.7 pkgdesc="NetworkManager with ConsoleKit support for non-systemd systems" arch=('i686' 'x86_64') license=('GPL' 'LGPL2.1') url="http://www.gnome.org/projects/$_pkgname/" depends=("libnm-glib>=${pkgver}" 'iproute2' 'libnl' 'polkit-consolekit' 'consolekit' - 'wpa_supplicant' 'dhcp-client' 'libsoup' 'libmm-glib' 'libnewt' 'libndp' - 'libteam') -makedepends=('intltool' 'dhcpcd' 'iptables' 'gobject-introspection' 'gtk-doc' 'git' + 'wpa_supplicant' 'dhclient' 'libsoup' 'libmm-glib' 'libnewt' 'libndp' + 'libteam' 'libgudev') +makedepends=('intltool' 'iptables' 'gobject-introspection' 'gtk-doc' "ppp=$_pppver" 'modemmanager' 'rp-pppoe' 'vala') optdepends=('modemmanager: for modem management service' 'dhcpcd: alternative DHCP client; does not support DHCPv6' @@ -32,14 +31,19 @@ optdepends=('modemmanager: for modem management service' 'openresolv: resolvconf support' 'ppp: dialup connection support') provides=("networkmanager=$pkgver") -# replaces=('networkmanager') +replaces=('networkmanager') conflicts=('networkmanager') backup=('etc/NetworkManager/NetworkManager.conf') install=networkmanager.install -source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz" - 'disable_set_hostname.patch' - 'NetworkManager.conf') - +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz + NetworkManager.conf + disable_set_hostname.patch + networkmanager.rc + ) +sha256sums=('38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd' + '2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b' + '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' + 'e39a2a0401518abd1d1d060200e2ca0f0854cdc49a5cb286919be177a7cd90fc') prepare() { cd $_pkgname-$pkgver @@ -52,14 +56,15 @@ build() { cd $_pkgname-$pkgver AUTOPOINT="intltoolize -f -c --automake" autoreconf -fi - ./configure --prefix=/usr \ + ./configure \ + --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --sbindir=/usr/bin \ --libexecdir=/usr/lib/networkmanager \ --with-crypto=nss \ --with-dhclient=/usr/bin/dhclient \ - --with-dhcpcd=/usr/bin/dhcpcd \ + --without-dhcpcd \ --with-dnsmasq=/usr/bin/dnsmasq \ --with-iptables=/usr/bin/iptables \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ @@ -67,10 +72,8 @@ build() { --with-resolvconf=/usr/bin/resolvconf \ --with-pppd=/usr/bin/pppd \ --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver \ - --with-pppoe=/usr/bin/pppoe \ --with-kernel-firmware-dir=/usr/lib/firmware \ --with-session-tracking=ck \ - --with-modem-manager-1 \ --disable-static \ --enable-more-warnings=no \ --disable-wimax \ @@ -83,18 +86,17 @@ build() { package() { cd $_pkgname-$pkgver make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" -C libnm uninstall make DESTDIR="$pkgdir" -C libnm-glib uninstall make DESTDIR="$pkgdir" -C libnm-util uninstall make DESTDIR="$pkgdir" -C vapi uninstall - install -m644 $srcdir/NetworkManager.conf "$pkgdir/etc/NetworkManager/" - rm -rf "$pkgdir/usr/include" rm -rf "$pkgdir/usr/lib/pkgconfig" + install -D -m644 "${srcdir}/NetworkManager.conf" "${pkgdir}/etc/NetworkManager/NetworkManager.conf" + install -D -m755 "${srcdir}/networkmanager.rc" "${pkgdir}/etc/rc.d/networkmanager" + rm -r "${pkgdir}/var/run" } -sha256sums=('3a66afec670c975edd9832e620b725a5f16ed267a1b9e1b2d51ef27250d85947' - '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' - '759db295ddae7a6dc6b29211fc0ec08695f875584d456dd146d3679e2c33e2e3') diff --git a/pcr/networkmanager-consolekit/dnsmasq-path.patch b/pcr/networkmanager-consolekit/dnsmasq-path.patch new file mode 100644 index 000000000..c0e713266 --- /dev/null +++ b/pcr/networkmanager-consolekit/dnsmasq-path.patch @@ -0,0 +1,30 @@ +diff -u -r NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c +--- NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c 2011-10-10 23:38:20.000000000 +0200 ++++ NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c 2012-03-06 09:07:24.137460927 +0100 +@@ -52,8 +52,11 @@ + find_dnsmasq (void) + { + static const char *paths[] = { ++ "/usr/local/bin/dnsmasq", + "/usr/local/sbin/dnsmasq", ++ "/usr/bin/dnsmasq", + "/usr/sbin/dnsmasq", ++ "/bin/dnsmasq", + "/sbin/dnsmasq", + NULL + }; +diff -u -r NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c +--- NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c 2011-04-19 07:06:22.000000000 +0200 ++++ NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c 2012-03-06 09:07:58.603851818 +0100 +@@ -170,8 +170,11 @@ + nm_find_dnsmasq (void) + { + static const char *dnsmasq_binary_paths[] = { ++ "/usr/local/bin/dnsmasq", + "/usr/local/sbin/dnsmasq", ++ "/usr/bin/dnsmasq", + "/usr/sbin/dnsmasq", ++ "/bin/dnsmasq", + "/sbin/dnsmasq", + NULL + }; diff --git a/pcr/networkmanager-consolekit/git-fixes.patch b/pcr/networkmanager-consolekit/git-fixes.patch new file mode 100644 index 000000000..939d0b1e0 --- /dev/null +++ b/pcr/networkmanager-consolekit/git-fixes.patch @@ -0,0 +1,265 @@ +diff --git a/configure.ac b/configure.ac +index 94b0758..e61657d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4,7 +4,7 @@ dnl The NM version number + m4_define([nm_major_version], [0]) + m4_define([nm_minor_version], [9]) + m4_define([nm_micro_version], [10]) +-m4_define([nm_nano_version], [0]) ++m4_define([nm_nano_version], [1]) + m4_define([nm_version], + [nm_major_version.nm_minor_version.nm_micro_version.nm_nano_version]) + m4_define([nm_git_sha], [m4_esyscmd([ ( [ -d ./.git/ ] && [ "$(readlink -f ./.git/)" = "$(readlink -f "$(git rev-parse --git-dir 2>/dev/null)" 2>/dev/null)" ] && git rev-parse --verify -q HEAD 2>/dev/null ) || true ])]) +diff --git a/src/devices/nm-device-team.c b/src/devices/nm-device-team.c +index f3b25e3..51778c1 100644 +--- a/src/devices/nm-device-team.c ++++ b/src/devices/nm-device-team.c +@@ -51,7 +51,7 @@ G_DEFINE_TYPE (NMDeviceTeam, nm_device_team, NM_TYPE_DEVICE) + + #define NM_DEVICE_TEAM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEVICE_TEAM, NMDeviceTeamPrivate)) + +-#define NM_TEAM_ERROR (nm_team_error_quark ()) ++#define NM_DEVICE_TEAM_ERROR (nm_device_team_error_quark ()) + + static gboolean teamd_start (NMDevice *dev, NMSettingTeam *s_team); + +@@ -75,7 +75,7 @@ enum { + /******************************************************************/ + + static GQuark +-nm_team_error_quark (void) ++nm_device_team_error_quark (void) + { + static GQuark quark = 0; + if (!quark) +@@ -890,5 +890,5 @@ nm_device_team_class_init (NMDeviceTeamClass *klass) + G_TYPE_FROM_CLASS (klass), + &dbus_glib_nm_device_team_object_info); + +- dbus_g_error_domain_register (NM_TEAM_ERROR, NULL, NM_TYPE_TEAM_ERROR); ++ dbus_g_error_domain_register (NM_DEVICE_TEAM_ERROR, NULL, NM_TYPE_TEAM_ERROR); + } +diff --git a/src/devices/nm-device-team.h b/src/devices/nm-device-team.h +index fe1275c..32bc5fd 100644 +--- a/src/devices/nm-device-team.h ++++ b/src/devices/nm-device-team.h +@@ -35,9 +35,9 @@ G_BEGIN_DECLS + #define NM_DEVICE_TEAM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_TEAM, NMDeviceTeamClass)) + + typedef enum { +- NM_TEAM_ERROR_CONNECTION_NOT_TEAM = 0, /*< nick=ConnectionNotTeam >*/ +- NM_TEAM_ERROR_CONNECTION_INVALID, /*< nick=ConnectionInvalid >*/ +- NM_TEAM_ERROR_CONNECTION_INCOMPATIBLE, /*< nick=ConnectionIncompatible >*/ ++ NM_DEVICE_TEAM_ERROR_CONNECTION_NOT_TEAM = 0, /*< nick=ConnectionNotTeam >*/ ++ NM_DEVICE_TEAM_ERROR_CONNECTION_INVALID, /*< nick=ConnectionInvalid >*/ ++ NM_DEVICE_TEAM_ERROR_CONNECTION_INCOMPATIBLE, /*< nick=ConnectionIncompatible >*/ + } NMTeamError; + + #define NM_DEVICE_TEAM_SLAVES "slaves" +diff --git a/src/dhcp-manager/nm-dhcp-dhclient-utils.c b/src/dhcp-manager/nm-dhcp-dhclient-utils.c +index 8527e6c..bc9de12 100644 +--- a/src/dhcp-manager/nm-dhcp-dhclient-utils.c ++++ b/src/dhcp-manager/nm-dhcp-dhclient-utils.c +@@ -225,7 +225,6 @@ nm_dhcp_dhclient_create_config (const char *interface, + add_also_request (alsoreq, "dhcp6.name-servers"); + add_also_request (alsoreq, "dhcp6.domain-search"); + add_also_request (alsoreq, "dhcp6.client-id"); +- add_also_request (alsoreq, "dhcp6.server-id"); + } else { + add_ip4_config (new_contents, dhcp_client_id, hostname); + add_also_request (alsoreq, "rfc3442-classless-static-routes"); +diff --git a/src/nm-manager.c b/src/nm-manager.c +index 09a1985..0cf78e3 100644 +--- a/src/nm-manager.c ++++ b/src/nm-manager.c +@@ -1879,42 +1879,116 @@ factory_component_added_cb (NMDeviceFactory *factory, + #define PLUGIN_PATH_TAG "NMManager-plugin-path" + #define PLUGIN_TYPEFUNC_TAG "typefunc" + +-static void +-load_device_factories (NMManager *self) ++struct read_device_factory_paths_data { ++ char *path; ++ struct stat st; ++}; ++ ++static gint ++read_device_factory_paths_sort_fcn (gconstpointer a, gconstpointer b) ++{ ++ const struct read_device_factory_paths_data *da = a; ++ const struct read_device_factory_paths_data *db = b; ++ time_t ta, tb; ++ ++ ta = MAX (da->st.st_mtime, da->st.st_ctime); ++ tb = MAX (db->st.st_mtime, db->st.st_ctime); ++ ++ if (ta < tb) ++ return 1; ++ if (ta > tb) ++ return -1; ++ return 0; ++} ++ ++static char** ++read_device_factory_paths () + { +- NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self); + GDir *dir; + GError *error = NULL; + const char *item; +- char *path; +- GSList *iter; ++ GArray *paths; ++ char **result; ++ guint i; + + dir = g_dir_open (NMPLUGINDIR, 0, &error); + if (!dir) { +- nm_log_warn (LOGD_HW, "Failed to open plugin directory %s: %s", ++ nm_log_warn (LOGD_HW, "device plugin: failed to open directory %s: %s", + NMPLUGINDIR, + (error && error->message) ? error->message : "(unknown)"); + g_clear_error (&error); +- return; ++ return NULL; + } + ++ paths = g_array_new (FALSE, FALSE, sizeof (struct read_device_factory_paths_data)); ++ + while ((item = g_dir_read_name (dir))) { +- GModule *plugin; +- NMDeviceFactory *factory; +- NMDeviceFactoryCreateFunc create_func; +- NMDeviceFactoryDeviceTypeFunc type_func; +- NMDeviceType dev_type; +- const char *found = NULL; ++ struct read_device_factory_paths_data data; + + if (!g_str_has_prefix (item, PLUGIN_PREFIX)) + continue; + if (g_str_has_suffix (item, ".la")) + continue; + +- path = g_module_build_path (NMPLUGINDIR, item); +- g_assert (path); +- plugin = g_module_open (path, G_MODULE_BIND_LOCAL); +- g_free (path); ++ data.path = g_build_filename (NMPLUGINDIR, item, NULL); ++ ++ if (stat (data.path, &data.st) != 0) ++ goto continue_with_error; ++ if (!S_ISREG (data.st.st_mode)) ++ goto continue_silently; ++ if (data.st.st_uid != 0) ++ goto continue_with_error; ++ if (data.st.st_mode & (S_IWGRP | S_IWOTH | S_ISUID)) ++ goto continue_with_error; ++ ++ g_array_append_val (paths, data); ++ continue; ++ ++continue_with_error: ++ nm_log_dbg (LOGD_HW, "device plugin: skip invalid file %s", data.path); ++continue_silently: ++ g_free (data.path); ++ } ++ g_dir_close (dir); ++ ++ /* sort filenames by modification time. */ ++ g_array_sort (paths, read_device_factory_paths_sort_fcn); ++ ++ result = g_new (char *, paths->len + 1); ++ for (i = 0; i < paths->len; i++) ++ result[i] = g_array_index (paths, struct read_device_factory_paths_data, i).path; ++ result[i] = NULL; ++ ++ g_array_free (paths, TRUE); ++ return result; ++} ++ ++static void ++load_device_factories (NMManager *self) ++{ ++ NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self); ++ char **path; ++ char **paths; ++ ++ paths = read_device_factory_paths (); ++ if (!paths) ++ return; ++ ++ for (path = paths; *path; path++) { ++ GError *error = NULL; ++ GModule *plugin; ++ NMDeviceFactory *factory; ++ NMDeviceFactoryCreateFunc create_func; ++ NMDeviceFactoryDeviceTypeFunc type_func; ++ NMDeviceType dev_type; ++ const char *found = NULL; ++ GSList *iter; ++ const char *item; ++ ++ item = strrchr (*path, '/'); ++ g_assert (item); ++ ++ plugin = g_module_open (*path, G_MODULE_BIND_LOCAL); + + if (!plugin) { + nm_log_warn (LOGD_HW, "(%s): failed to load plugin: %s", item, g_module_error ()); +@@ -1939,7 +2013,7 @@ load_device_factories (NMManager *self) + } + } + if (found) { +- nm_log_warn (LOGD_HW, "Found multiple device plugins for same type: %s vs %s", ++ nm_log_warn (LOGD_HW, "Found multiple device plugins for same type: use '%s' instead of '%s'", + found, g_module_name (plugin)); + g_module_close (plugin); + continue; +@@ -1978,7 +2052,7 @@ load_device_factories (NMManager *self) + + nm_log_info (LOGD_HW, "Loaded device plugin: %s", g_module_name (plugin)); + }; +- g_dir_close (dir); ++ g_strfreev (paths); + + priv->factories = g_slist_reverse (priv->factories); + } +diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c +index f73ff32..7b11a6b 100644 +--- a/src/platform/nm-linux-platform.c ++++ b/src/platform/nm-linux-platform.c +@@ -1584,7 +1584,9 @@ announce_object (NMPlatform *platform, const struct nl_object *object, NMPlatfor + */ + switch (change_type) { + case NM_PLATFORM_SIGNAL_REMOVED: +- check_cache_items (platform, priv->route_cache, address.ifindex); ++ check_cache_items (platform, ++ priv->route_cache, ++ rtnl_addr_get_ifindex ((struct rtnl_addr *) object)); + break; + default: + break; +@@ -3500,7 +3502,8 @@ _route_match (struct rtnl_route *rtnlroute, int family, int ifindex) + rtnl_route_get_table (rtnlroute) != RT_TABLE_MAIN || + rtnl_route_get_protocol (rtnlroute) == RTPROT_KERNEL || + rtnl_route_get_family (rtnlroute) != family || +- rtnl_route_get_nnexthops (rtnlroute) != 1) ++ rtnl_route_get_nnexthops (rtnlroute) != 1 || ++ rtnl_route_get_flags (rtnlroute) & RTM_F_CLONED) + return FALSE; + + nexthop = rtnl_route_nexthop_n (rtnlroute, 0); +diff --git a/vapi/NMClient-1.0.metadata b/vapi/NMClient-1.0.metadata +index 12f1469..2d894d8 100644 +--- a/vapi/NMClient-1.0.metadata ++++ b/vapi/NMClient-1.0.metadata +@@ -1,6 +1,6 @@ +-RemoteSettings.new_async skip ++RemoteSettings.new_finish symbol_type="function" + RemoteConnection.updated#virtual_method skip +-Client.new_async skip ++Client.new_finish symbol_type="function" + + ACTIVE_CONNECTION_* cheader_filename="nm-active-connection.h" name="ACTIVE_CONNECTION_(.+)" parent="NM.ActiveConnection" + CLIENT_* cheader_filename="nm-client.h" name="CLIENT_(.+)" parent="NM.Client" diff --git a/pcr/networkmanager-consolekit/networkmanager.install b/pcr/networkmanager-consolekit/networkmanager.install index de40c17ed..f9da4feb1 100644 --- a/pcr/networkmanager-consolekit/networkmanager.install +++ b/pcr/networkmanager-consolekit/networkmanager.install @@ -1,5 +1,5 @@ post_upgrade() { - (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG + (( $(vercmp $2 0.8.3) < 0 )) && cat <<MSG ATTENTION: /etc/NetworkManager/nm-system-settings.conf has been replaced by /etc/NetworkManager/NetworkManager.conf. Make sure you move diff --git a/pcr/networkmanager-consolekit/networkmanager.rc b/pcr/networkmanager-consolekit/networkmanager.rc new file mode 100644 index 000000000..1e803e87b --- /dev/null +++ b/pcr/networkmanager-consolekit/networkmanager.rc @@ -0,0 +1,60 @@ +#!/bin/bash + +NETWORKMANAGER_BIN=/usr/bin/NetworkManager + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID $NETWORKMANAGER_BIN` +case "$1" in + start) + ck_daemon dbus && /etc/rc.d/dbus start + + stat_busy "Starting NetworkManager" + [ ! -d /var/run/NetworkManager ] && install -d /var/run/NetworkManager + if [ -z "$PID" ]; then + $NETWORKMANAGER_BIN + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon networkmanager + stat_done + fi + ;; + stop) + stat_busy "Stopping NetworkManager" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon networkmanager + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + sleep) + /usr/bin/dbus-send --system \ + --dest=org.freedesktop.NetworkManager \ + --type=method_call \ + /org/freedesktop/NetworkManager \ + org.freedesktop.NetworkManager.sleep + ;; + wake) + /usr/bin/dbus-send --system \ + --dest=org.freedesktop.NetworkManager \ + --type=method_call \ + /org/freedesktop/NetworkManager \ + org.freedesktop.NetworkManager.wake + ;; + *) + echo "usage: $0 {start|stop|restart|sleep|wake}" + ;; +esac +exit 0 + diff --git a/pcr/octave-image/PKGBUILD b/pcr/octave-image/PKGBUILD index 208c509b1..be13c904c 100644 --- a/pcr/octave-image/PKGBUILD +++ b/pcr/octave-image/PKGBUILD @@ -11,14 +11,14 @@ _pack=image pkgname=octave-$_pack -pkgver=2.2.2 -pkgrel=2 +pkgver=2.4.1 +pkgrel=1 pkgdesc="The Octave-forge Image package provides functions for processing images. The package also provides functions for feature extraction, image statistics, spatial and geometric transformations, morphological operations, linear filtering, and much more." arch=(any) url="http://octave.sourceforge.net/$_pack/" license=('custom') groups=('octave-forge') -depends=('octave>=3.8.0' 'octave-signal>=1.2.0' 'octave-general>=1.3.0') +depends=('octave>=4.0.0') makedepends=() optdepends=() backup=() @@ -27,7 +27,7 @@ install=$pkgname.install _archive=$_pack-$pkgver.tar.gz source=("http://downloads.sourceforge.net/octave/$_archive") noextract=("$_archive") -md5sums=('c02a05ba37ffb38ad2b59906a56c7807') +md5sums=('ec07f0c9daf824e908881d95a65fbe82') _install_dir() { src=$1 diff --git a/pcr/openrc-desktop/PKGBUILD b/pcr/openrc-desktop/PKGBUILD index f7189414e..672f9300e 100644 --- a/pcr/openrc-desktop/PKGBUILD +++ b/pcr/openrc-desktop/PKGBUILD @@ -1,202 +1,183 @@ -# Maintainer : freaj <freaj@riseup.net> -# Maintainer (Manjaro): artoo <artoo@manjaro.org> - -# file vars for easy update -_Cacpi=acpid-2.0.16-conf.d -_Iacpi=acpid-2.0.16-init.d -_Calsa=alsasound.confd-r4 -_Ialsa=alsasound.initd-r6 -_Ick=consolekit-0.2.rc -_Cxdm=xdm.confd-4 -_Ixdm1=xdm.initd-11 -_Ixdm2=xdm-setup.initd-1 -_Sxdm=startDM.sh -_Cgpm=gpm.conf.d -_Igpm=gpm.rc6-2 -_Cblue=rfcomm-conf.d -_Iblue1=rfcomm-init.d-r2 -_Iblue2=bluetooth-init.d-r3 -_Cwpa=wpa_supplicant-conf.d -_Iwpa=wpa_supplicant-init.d -_Swpa=wpa_cli.sh +# Maintainer (Arch): artoo <artoo@manjaro.org> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> _gentoo_uri="http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86" pkgbase=openrc-desktop pkgname=('acpid-openrc' - 'alsa-utils-openrc' - 'avahi-openrc' - 'consolekit-openrc' - 'displaymanager-openrc' - 'gpm-openrc' - 'bluez-openrc' - 'wpa_supplicant-openrc') -pkgver=20150325 + 'alsa-utils-openrc' + 'avahi-openrc' + 'consolekit-openrc' + 'displaymanager-openrc' + 'gpm-openrc' + 'bluez-openrc' + 'wpa_supplicant-openrc') +pkgver=20150828 pkgrel=1 pkgdesc="OpenRC init scripts" arch=('any') url="https://github.com/manjaro/packages-openrc" license=('GPL2') -groups=('openrc' 'openrc-desktop') +groups=('openrc-desktop') conflicts=('openrc' - 'openrc-git' - 'openrc-arch-services-git' - 'initscripts' - 'systemd-sysvcompat') -source=("${_gentoo_uri}/sys-power/acpid/files/${_Cacpi}" - "${_gentoo_uri}/sys-power/acpid/files/${_Iacpi}" - "${_gentoo_uri}/media-sound/alsa-utils/files/${_Calsa}" - "${_gentoo_uri}/media-sound/alsa-utils/files/${_Ialsa}" - "${_gentoo_uri}/sys-auth/consolekit/files/${_Ick}" - "${_gentoo_uri}/x11-base/xorg-server/files/${_Cxdm}" - "${_gentoo_uri}/x11-base/xorg-server/files/${_Ixdm1}" - "${_gentoo_uri}/x11-base/xorg-server/files/${_Ixdm2}" - "${_gentoo_uri}/x11-apps/xinit/files/${_Sxdm}" - "${_gentoo_uri}/sys-libs/gpm/files/${_Cgpm}" - "${_gentoo_uri}/sys-libs/gpm/files/${_Igpm}" - 'avahi-daemon' - 'avahi-dnsconfd' - "${_gentoo_uri}/net-wireless/bluez/files/${_Cblue}" - "${_gentoo_uri}/net-wireless/bluez/files/${_Iblue1}" - "${_gentoo_uri}/net-wireless/bluez/files/${_Iblue2}" - "${_gentoo_uri}/net-wireless/wpa_supplicant/files/${_Cwpa}" - "${_gentoo_uri}/net-wireless/wpa_supplicant/files/${_Iwpa}" - "${_gentoo_uri}/net-wireless/wpa_supplicant/files/${_Swpa}") + 'openrc-git' + 'openrc-arch-services-git' + 'initscripts' + 'systemd-sysvcompat') +source=("acpid.confd::${_gentoo_uri}/sys-power/acpid/files/acpid-2.0.16-conf.d" + "acpid.initd::${_gentoo_uri}/sys-power/acpid/files/acpid-2.0.16-init.d" + "alsasound.confd::${_gentoo_uri}/media-sound/alsa-utils/files/alsasound.confd-r4" + "alsasound.initd::${_gentoo_uri}/media-sound/alsa-utils/files/alsasound.initd-r6" + "consolekit.initd::${_gentoo_uri}/sys-auth/consolekit/files/consolekit-0.2.rc" + "xdm.confd::${_gentoo_uri}/x11-base/xorg-server/files/xdm.confd-4" + "xdm.initd::${_gentoo_uri}/x11-base/xorg-server/files/xdm.initd-11" + "xdm-setup.initd::${_gentoo_uri}/x11-base/xorg-server/files/xdm-setup.initd-1" + "${_gentoo_uri}/x11-apps/xinit/files/startDM.sh" + "gpm.confd::${_gentoo_uri}/sys-libs/gpm/files/gpm.conf.d" + "gpm.initd::${_gentoo_uri}/sys-libs/gpm/files/gpm.rc6-2" + "rfcomm.confd::${_gentoo_uri}/net-wireless/bluez/files/rfcomm-conf.d" + "rfcomm.initd::${_gentoo_uri}/net-wireless/bluez/files/rfcomm-init.d-r2" + "bluetooth.initd::${_gentoo_uri}/net-wireless/bluez/files/bluetooth-init.d-r3" + "wpa_supplicant.confd::${_gentoo_uri}/net-wireless/wpa_supplicant/files/wpa_supplicant-conf.d" + "wpa_supplicant.initd::${_gentoo_uri}/net-wireless/wpa_supplicant/files/wpa_supplicant-init.d" + "${_gentoo_uri}/net-wireless/wpa_supplicant/files/wpa_cli.sh" + 'avahi-daemon.initd' + 'avahi-dnsconfd.initd') +sha256sums=('3755d4eb8bb64a1304e5defedb949305ac550565da36fe4f94d5f31beee821ba' + '980468e6bf96c7677898330cadbcff165b4d15f1197cd544548bd0f8c376983d' + 'd1c55400b701a72dcb8bb85e016b5013fa3eb6a2766ffc20dae278d0ee4c1a43' + '5fdcb0212bf8a4be74f410534534fdda6dd8d57df0d2a6c4a158464f705fed18' + 'da849bae527a7a5c257301a99ac3fb5ec2ded48103ec114552ca7d2a24b12e49' + '9d26b72bb28611a60a6b9f942b8d8cfe47b59f926be89af9709b5912668344d8' + '86a17c9ba172481318d5fd51c3aadfdcad9e5d52ed7478379723ce1784061930' + '942ce5e8d1a0770543b683dcc388bae7619a24eb9741c1cd678ed3df97c01406' + 'e7f2d95b3b4b6b5d711f926f8a3b7b0163b4d9e40b40489bcbd1316806e47499' + '73e7483fdc4b12ab4225a4cb13bbe7da71b07b9e69b17e3a6a4c63cb5e2287c8' + 'e692e7b97efdd79f6e92fbdaed60f7a71bfd23a82c5561b160b88a7aa50c8461' + '672498957049fd301f9c9c1dc9fa49430e5e6d3c3f1f3cdce80df3af7d425d08' + 'e633ab4690db7d89d8a325bbdff73253cb4e3994c4cc5daa0c81205576bc1d09' + 'de7f4a890cf994e1c283251ac5ac6b0aedb29104d708e5e7a77702ac2055dec7' + '61ec59007f66ac5bacc0aa095d1f2ccbc977a687038e161a463d1727223d5a90' + '62a3655ea88b3dfff5243666a4e90d3f0eef6370a7889affb849e178ba4a82b0' + 'a60d145a8874b57a944c6775fdf500d03dd1ce73c24357b00d3de37b14620179' + '876788303553fe773e64917f76f0208f5e8adf7b91d4af24aa9d6a68a147d646' + 'e128576d72981e402ff106bb481108ab6d5ba941ab1b0f5f53e96a7831fc1d15') pkgver() { - date +%Y%m%d + date +%Y%m%d } -_shebang='s|#!/sbin/runscript|#!/usr/bin/openrc-run|' -_runpath='s|/var/run|/run|g' -_binpath='s|/usr/sbin|/usr/bin|g' +_inst_initd(){ + install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1 -package_acpid-openrc() { - pkgdesc="OpenRC acpid init script" - depends=('openrc-core' 'acpid') - backup=('etc/conf.d/acpid') - install=acpid.install + sed -e 's|#!/sbin/runscript|#!/usr/bin/openrc-run|' \ + -e 's|/var/run|/run|g' \ + -e 's|/usr/sbin|/usr/bin|g' \ + -i ${pkgdir}/etc/init.d/$1 +} - install -Dm755 "${srcdir}/${_Cacpi}" "${pkgdir}/etc/conf.d/acpid" - install -Dm755 "${srcdir}/${_Iacpi}" "${pkgdir}/etc/init.d/acpid" +_inst_confd(){ + install -Dm755 ${srcdir}/$1.confd ${pkgdir}/etc/conf.d/$1 +} + +package_acpid-openrc() { + pkgdesc="OpenRC acpid init script" + depends=('openrc-core' 'acpid') + backup=('etc/conf.d/acpid') + install=acpid.install - sed -e "${_shebang}" -e "${_binpath}" -i "${pkgdir}/etc/init.d/acpid" + _inst_confd 'acpid' + _inst_initd 'acpid' } package_alsa-utils-openrc() { - pkgdesc="OpenRC alsa-utils init script" - depends=('openrc-core' 'alsa-utils') - backup=('etc/conf.d/alsasound') - install=alsa-utils.install + pkgdesc="OpenRC alsa-utils init script" + depends=('openrc-core' 'alsa-utils') + backup=('etc/conf.d/alsasound') + install=alsa-utils.install - install -Dm755 "${srcdir}/${_Calsa}" "${pkgdir}/etc/conf.d/alsasound" - install -Dm755 "${srcdir}/${_Ialsa}" "${pkgdir}/etc/init.d/alsasound" - - sed -e "${_shebang}" -i "${pkgdir}/etc/init.d/alsasound" + _inst_confd 'alsasound' + _inst_initd 'alsasound' } package_avahi-openrc() { - pkgdesc="OpenRC avahi init script" - depends=('avahi' 'dbus-openrc') - install=avahi.install + pkgdesc="OpenRC avahi init script" + depends=('avahi' 'dbus-openrc') + install=avahi.install - install -Dm755 "${srcdir}/avahi-daemon" "${pkgdir}/etc/init.d/avahi-daemon" - install -Dm755 "${srcdir}/avahi-dnsconfd" "${pkgdir}/etc/init.d/avahi-dnsconfd" + _inst_initd 'avahi-daemon' + _inst_initd 'avahi-dnsconfd' } package_consolekit-openrc() { - pkgdesc="OpenRC consolekit init script" - depends=('consolekit' 'dbus-openrc') - install=consolekit.install - - install -Dm755 "$srcdir/${_Ick}" "$pkgdir/etc/init.d/consolekit" + pkgdesc="OpenRC consolekit init script" + depends=('consolekit' 'dbus-openrc') + install=consolekit.install - sed -e "${_shebang}" -e "${_runpath}" -e "${_binpath}" -i "${pkgdir}/etc/init.d/consolekit" + _inst_initd 'consolekit' } package_displaymanager-openrc() { - pkgdesc="OpenRC dm init script" - depends=('openrc-core' 'xorg-server' 'xorg-xinit') - optdepends=('consolekit-openrc: consolekit initscript' - 'dbus-openrc: dbus initscript') - backup=('etc/conf.d/xdm') - install=displaymanager.install - - install -Dm755 "${srcdir}/${_Cxdm}" "${pkgdir}/etc/conf.d/xdm" - install -Dm755 "${srcdir}/${_Ixdm1}" "${pkgdir}/etc/init.d/xdm" - install -Dm755 "${srcdir}/${_Ixdm2}" "${pkgdir}/etc/init.d/xdm-setup" - install -Dm755 "${srcdir}/${_Sxdm}" "${pkgdir}/etc/X11/startDM.sh" - - local _p1='s|/etc/profile.env|/etc/profile|g' \ - _p2='s|{ROOTPATH}|{PATH}|g' - sed -e "${_shebang}" -e "${_binpath}" -e "${_runpath}" -e "${_p1}" -e "${_p2}" -i "${pkgdir}/etc/init.d/xdm" - sed -e "${_shebang}" -i "${pkgdir}/etc/init.d/xdm-setup" + pkgdesc="OpenRC dm init script" + depends=('openrc-core' 'xorg-server' 'xorg-xinit') + optdepends=('consolekit-openrc: consolekit initscript' + 'dbus-openrc: dbus initscript') + backup=('etc/conf.d/xdm') + install=displaymanager.install + + _inst_confd 'xdm' + _inst_initd 'xdm' + _inst_initd 'xdm-setup' + + install -Dm755 "${srcdir}/startDM.sh" "${pkgdir}/etc/X11/startDM.sh" + + sed -e 's|/etc/profile.env|/etc/profile|g' \ + -e 's|{ROOTPATH}|{PATH}|g' \ + -i "${pkgdir}/etc/init.d/xdm" } package_gpm-openrc() { - pkgdesc="OpenRC gpm init script" - depends=('openrc-core' 'gpm') - backup=('etc/conf.d/gpm') - install=gpm.install - - install -Dm755 "${srcdir}/${_Cgpm}" "${pkgdir}/etc/conf.d/gpm" - install -Dm755 "${srcdir}/${_Igpm}" "${pkgdir}/etc/init.d/gpm" + pkgdesc="OpenRC gpm init script" + depends=('openrc-core' 'gpm') + backup=('etc/conf.d/gpm') + install=gpm.install - sed -e "${_shebang}" -e "${_binpath}" -e "${_runpath}" -i "${pkgdir}/etc/init.d/gpm" + _inst_confd 'gpm' + _inst_initd 'gpm' } package_bluez-openrc() { - pkgdesc="OpenRC bluez init script" - groups=('openrc' 'openrc-mobile') - depends=('bluez' 'dbus-openrc') - backup=('etc/conf.d/rfcomm') - install=bluez.install - - install -Dm755 "${srcdir}/${_Cblue}" "${pkgdir}/etc/conf.d/rfcomm" - install -Dm755 "${srcdir}/${_Iblue1}" "${pkgdir}/etc/init.d/rfcomm" - install -Dm755 "${srcdir}/${_Iblue2}" "${pkgdir}/etc/init.d/bluetooth" - - local _p1='s|/usr/sbin|/usr/lib/bluetooth|g' _p2='s/libexec/lib/' - sed -e "${_shebang}" -e "${_p1}" -e "${_p2}" -i "${pkgdir}/etc/init.d/bluetooth" - sed -e "${_shebang}" -e "${_binpath}" -i "${pkgdir}/etc/init.d/rfcomm" + pkgdesc="OpenRC bluez init script" + groups=('openrc-mobile') + depends=('bluez' 'dbus-openrc') + backup=('etc/conf.d/rfcomm') + install=bluez.install + + _inst_confd 'rfcomm' + _inst_initd 'rfcomm' + _inst_initd 'bluetooth' + + sed -e 's|/usr/sbin|/usr/lib/bluetooth|g' \ + -e 's/libexec/lib/' \ + -i "${pkgdir}/etc/init.d/bluetooth" } package_wpa_supplicant-openrc() { - pkgdesc="OpenRC wpa_supplicant init script" - groups=('openrc' 'openrc-mobile') - depends=('openrc-core' 'wpa_supplicant') - backup=('etc/conf.d/wpa_supplicant') - install=wpa_supplicant.install - - install -Dm755 "${srcdir}/${_Cwpa}" "${pkgdir}/etc/conf.d/wpa_supplicant" - install -Dm755 "${srcdir}/${_Iwpa}" "${pkgdir}/etc/init.d/wpa_supplicant" - install -Dm755 "${srcdir}/${_Swpa}" "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh" - - sed -e "${_shebang}" -e "${_binpath}" -e "${_runpath}" -i "${pkgdir}/etc/init.d/wpa_supplicant" - if [[ -f /etc/os-release ]];then - . /etc/os-release - sed -e "s|gentoo-release|${ID}-release|" -i "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh" - else - sed -e 's|gentoo-release|arch-release|' -i "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh" - fi + pkgdesc="OpenRC wpa_supplicant init script" + groups=('openrc-mobile') + depends=('openrc-core' 'wpa_supplicant') + backup=('etc/conf.d/wpa_supplicant') + install=wpa_supplicant.install + + _inst_confd 'wpa_supplicant' + _inst_initd 'wpa_supplicant' + + install -Dm755 "${srcdir}/wpa_cli.sh" "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh" + + if [[ -f /etc/os-release ]];then + . /etc/os-release + sed -e "s|gentoo-release|${ID}-release|" -i "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh" + else + sed -e 's|gentoo-release|arch-release|' -i "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh" + fi } - -sha256sums=('3755d4eb8bb64a1304e5defedb949305ac550565da36fe4f94d5f31beee821ba' - '980468e6bf96c7677898330cadbcff165b4d15f1197cd544548bd0f8c376983d' - 'd1c55400b701a72dcb8bb85e016b5013fa3eb6a2766ffc20dae278d0ee4c1a43' - '5fdcb0212bf8a4be74f410534534fdda6dd8d57df0d2a6c4a158464f705fed18' - 'da849bae527a7a5c257301a99ac3fb5ec2ded48103ec114552ca7d2a24b12e49' - '9d26b72bb28611a60a6b9f942b8d8cfe47b59f926be89af9709b5912668344d8' - '86a17c9ba172481318d5fd51c3aadfdcad9e5d52ed7478379723ce1784061930' - '942ce5e8d1a0770543b683dcc388bae7619a24eb9741c1cd678ed3df97c01406' - 'e7f2d95b3b4b6b5d711f926f8a3b7b0163b4d9e40b40489bcbd1316806e47499' - '73e7483fdc4b12ab4225a4cb13bbe7da71b07b9e69b17e3a6a4c63cb5e2287c8' - 'e692e7b97efdd79f6e92fbdaed60f7a71bfd23a82c5561b160b88a7aa50c8461' - '876788303553fe773e64917f76f0208f5e8adf7b91d4af24aa9d6a68a147d646' - 'e128576d72981e402ff106bb481108ab6d5ba941ab1b0f5f53e96a7831fc1d15' - '672498957049fd301f9c9c1dc9fa49430e5e6d3c3f1f3cdce80df3af7d425d08' - 'e633ab4690db7d89d8a325bbdff73253cb4e3994c4cc5daa0c81205576bc1d09' - 'de7f4a890cf994e1c283251ac5ac6b0aedb29104d708e5e7a77702ac2055dec7' - '61ec59007f66ac5bacc0aa095d1f2ccbc977a687038e161a463d1727223d5a90' - '62a3655ea88b3dfff5243666a4e90d3f0eef6370a7889affb849e178ba4a82b0' - 'a60d145a8874b57a944c6775fdf500d03dd1ce73c24357b00d3de37b14620179') diff --git a/pcr/openrc-desktop/acpid-2.0.16-conf.d b/pcr/openrc-desktop/acpid-2.0.16-conf.d deleted file mode 100644 index 9aadb4cd8..000000000 --- a/pcr/openrc-desktop/acpid-2.0.16-conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# /etc/conf.d/acpid: config file for /etc/init.d/acpid - -# Options to pass to the acpid daemon. -# See the acpid(8) man page for more info. - -ACPID_ARGS="" diff --git a/pcr/openrc-desktop/acpid-2.0.16-init.d b/pcr/openrc-desktop/acpid-2.0.16-init.d deleted file mode 100644 index 412a265fc..000000000 --- a/pcr/openrc-desktop/acpid-2.0.16-init.d +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/files/acpid-2.0.16-init.d,v 1.1 2012/05/19 09:53:59 ssuominen Exp $ - -extra_started_commands="reload" -command="/usr/sbin/acpid" -command_args="${ACPID_ARGS}" -start_stop_daemon_args="--quiet" -description="Daemon for Advanced Configuration and Power Interface" - -depend() { - need localmount - use logger -} - -reload() { - ebegin "Reloading acpid configuration" - start-stop-daemon --exec $command --signal HUP - eend $? -} diff --git a/pcr/openrc-desktop/alsasound.confd-r4 b/pcr/openrc-desktop/alsasound.confd-r4 deleted file mode 100644 index 6fec8f593..000000000 --- a/pcr/openrc-desktop/alsasound.confd-r4 +++ /dev/null @@ -1,15 +0,0 @@ -# RESTORE_ON_START: -# Do you want to restore your mixer settings? If not, your cards will be -# muted. -# no - Do not restore state -# yes - Restore state - -RESTORE_ON_START="yes" - -# SAVE_ON_STOP: -# Do you want to save changes made to your mixer volumes when alsasound -# stops? -# no - Do not save state -# yes - Save state - -SAVE_ON_STOP="yes" diff --git a/pcr/openrc-desktop/alsasound.initd-r6 b/pcr/openrc-desktop/alsasound.initd-r6 deleted file mode 100644 index 2eddfd308..000000000 --- a/pcr/openrc-desktop/alsasound.initd-r6 +++ /dev/null @@ -1,88 +0,0 @@ -#!/sbin/runscript -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd-r6,v 1.1 2014/06/23 21:34:42 ssuominen Exp $ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -alsastatedir=/var/lib/alsa -alsascrdir=/etc/alsa.d -alsahomedir=/var/run/alsasound - -extra_commands="save restore" - -depend() { - need localmount - after bootmisc modules isapnp coldplug hotplug -} - -restore() { - ebegin "Restoring Mixer Levels" - - checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1 - - if [ ! -r "${alsastatedir}/asound.state" ] ; then - ewarn "No mixer config in ${alsastatedir}/asound.state, you have to unmute your card!" - eend 0 - return 0 - fi - - local cards="$(sed -n -e 's/ *\([[:digit:]]*\) .*/\1/p' /proc/asound/cards)" - local CARDNUM - for cardnum in ${cards}; do - [ -e /dev/snd/controlC${cardnum} ] || sleep 2 - [ -e /dev/snd/controlC${cardnum} ] || sleep 2 - [ -e /dev/snd/controlC${cardnum} ] || sleep 2 - [ -e /dev/snd/controlC${cardnum} ] || sleep 2 - alsactl -E HOME="${alsahomedir}" -I -f "${alsastatedir}/asound.state" restore ${cardnum} \ - || ewarn "Errors while restoring defaults, ignoring" - done - - for ossfile in "${alsastatedir}"/oss/card*_pcm* ; do - [ -e "${ossfile}" ] || continue - # We use cat because I'm not sure if cp works properly on /proc - local procfile=${ossfile##${alsastatedir}/oss} - procfile="$(echo "${procfile}" | sed -e 's,_,/,g')" - if [ -e /proc/asound/"${procfile}"/oss ] ; then - cat "${ossfile}" > /proc/asound/"${procfile}"/oss - fi - done - - eend 0 -} - -save() { - ebegin "Storing ALSA Mixer Levels" - - checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1 - - mkdir -p "${alsastatedir}" - if ! alsactl -E HOME="${alsahomedir}" -f "${alsastatedir}/asound.state" store; then - eerror "Error saving levels." - eend 1 - return 1 - fi - - for ossfile in /proc/asound/card*/pcm*/oss; do - [ -e "${ossfile}" ] || continue - local device=${ossfile##/proc/asound/} ; device=${device%%/oss} - device="$(echo "${device}" | sed -e 's,/,_,g')" - mkdir -p "${alsastatedir}/oss/" - cp "${ossfile}" "${alsastatedir}/oss/${device}" - done - - eend 0 -} - -start() { - if [ "${RESTORE_ON_START}" = "yes" ]; then - restore - fi - - return 0 -} - -stop() { - if [ "${SAVE_ON_STOP}" = "yes" ]; then - save - fi - return 0 -} diff --git a/pcr/openrc-desktop/avahi-daemon b/pcr/openrc-desktop/avahi-daemon.initd index 3db552903..3db552903 100644 --- a/pcr/openrc-desktop/avahi-daemon +++ b/pcr/openrc-desktop/avahi-daemon.initd diff --git a/pcr/openrc-desktop/avahi-dnsconfd b/pcr/openrc-desktop/avahi-dnsconfd.initd index 1389a2889..1389a2889 100644 --- a/pcr/openrc-desktop/avahi-dnsconfd +++ b/pcr/openrc-desktop/avahi-dnsconfd.initd diff --git a/pcr/openrc-desktop/bluetooth-init.d-r3 b/pcr/openrc-desktop/bluetooth-init.d-r3 deleted file mode 100644 index f97fdb2c7..000000000 --- a/pcr/openrc-desktop/bluetooth-init.d-r3 +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/bluetooth-init.d-r3,v 1.2 2014/01/09 13:24:42 joker Exp $ - -depend() { - after coldplug - need dbus localmount hostname -} - -start() { - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --background --exec /usr/libexec/bluetooth/bluetoothd - eend $? -} - -stop() { - ebegin "Shutting down ${SVCNAME}" - start-stop-daemon --stop --quiet --exec /usr/libexec/bluetooth/bluetoothd - eend $? -} diff --git a/pcr/openrc-desktop/consolekit-0.2.rc b/pcr/openrc-desktop/consolekit-0.2.rc deleted file mode 100644 index b20226767..000000000 --- a/pcr/openrc-desktop/consolekit-0.2.rc +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/files/consolekit-0.2.rc,v 1.1 2011/10/20 19:14:47 axs Exp $ - -depend() { - need dbus - use logger -} - -start() { - ebegin "Starting ConsoleKit daemon" - - checkpath -q -d -m 0755 /var/run/ConsoleKit - - start-stop-daemon --start -q \ - --pidfile /var/run/ConsoleKit/pid \ - --exec /usr/sbin/console-kit-daemon -- - eend $? -} - -stop() { - ebegin "Stopping ConsoleKit daemon" - start-stop-daemon --stop -q --pidfile /var/run/ConsoleKit/pid - eend $? -} diff --git a/pcr/openrc-desktop/gpm.conf.d b/pcr/openrc-desktop/gpm.conf.d deleted file mode 100644 index f21c25755..000000000 --- a/pcr/openrc-desktop/gpm.conf.d +++ /dev/null @@ -1,23 +0,0 @@ -# /etc/init.d/gpm - -# Please uncomment the type of mouse you have and the appropriate MOUSEDEV entry - -MOUSE=ps2 -#MOUSE=imps2 -#MOUSEDEV=/dev/psaux -MOUSEDEV=/dev/input/mice - -# Extra settings - -#RESPONSIVENESS= -#REPEAT_TYPE=raw - -# Please uncomment this line if you want gpm to understand charsets used -# in URLs and names with ~ or : in them, etc. This is a good idea to turn on! - -#APPEND="-l \"a-zA-Z0-9_.:~/\300-\326\330-\366\370-\377\"" - -# Various other options, see gpm(8) manpage for more. - -#APPEND="-g 1 -A60" -#APPEND="-l \"a-zA-Z0-9_.:~/\300-\326\330-\366\370-\377\" -g 1 -A60" diff --git a/pcr/openrc-desktop/gpm.rc6-2 b/pcr/openrc-desktop/gpm.rc6-2 deleted file mode 100644 index 1e0aaf3e1..000000000 --- a/pcr/openrc-desktop/gpm.rc6-2 +++ /dev/null @@ -1,29 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/files/gpm.rc6-2,v 1.2 2012/10/28 11:35:56 vapier Exp $ - -#NB: Config is in /etc/conf.d/gpm - -command=/usr/sbin/gpm -command_args=" - -m ${MOUSEDEV} - -t ${MOUSE} - ${RESPONSIVENESS:+ -r ${RESPONSIVENESS}} - ${REPEAT_TYPE:+ -R${REPEAT_TYPE}} - ${APPEND} -" - -pidfile=/var/run/gpm.pid - -depend() { - need localmount - use hotplug logger -} - -start_pre() { - if [ -z "${MOUSEDEV}" ] || [ -z "${MOUSE}" ] ; then - eerror "You need to setup MOUSEDEV and MOUSE in /etc/conf.d/gpm first" - return 1 - fi -} diff --git a/pcr/openrc-desktop/rfcomm-conf.d b/pcr/openrc-desktop/rfcomm-conf.d deleted file mode 100644 index d87acdb28..000000000 --- a/pcr/openrc-desktop/rfcomm-conf.d +++ /dev/null @@ -1,5 +0,0 @@ -# Bind rfcomm devices (allowed values are "true" and "false") -RFCOMM_ENABLE=true - -# Config file for rfcomm -RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" diff --git a/pcr/openrc-desktop/rfcomm-init.d-r2 b/pcr/openrc-desktop/rfcomm-init.d-r2 deleted file mode 100644 index c56405559..000000000 --- a/pcr/openrc-desktop/rfcomm-init.d-r2 +++ /dev/null @@ -1,35 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/rfcomm-init.d-r2,v 1.1 2014/06/26 17:18:43 alonbl Exp $ - -depend() { - need bluetooth -} - -checkconfig() { - if [ -z "${ADDRESS}" ]; then - eerror "ADDRESS must be set" - return 1 - fi - - return 0 -} - -start() { - local DEVICE=${RC_SVCNAME#*.} - - checkconfig || return 1 - - ebegin "Starting ${RC_SVCNAME}" - rfcomm bind "${DEVICE}" "${ADDRESS}" ${CHANNEL} - eend $? -} - -stop() { - local DEVICE=${RC_SVCNAME#*.} - - ebegin "Shutting down ${RC_SVCNAME}" - rfcomm release "${DEVICE}" - eend $? -} diff --git a/pcr/openrc-desktop/startDM.sh b/pcr/openrc-desktop/startDM.sh deleted file mode 100644 index ebb797040..000000000 --- a/pcr/openrc-desktop/startDM.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/startDM.sh,v 1.5 2011/01/22 15:35:49 lxnay Exp $ - -# We need to source /etc/profile for stuff like $LANG to work -# bug #10190. -. /etc/profile - -. /etc/init.d/functions.sh - -# baselayout-1 compat -if ! type get_options >/dev/null 2>/dev/null ; then - [ -r "${svclib}"/sh/rc-services.sh ] && . "${svclib}"/sh/rc-services.sh -fi - -# Great new Gnome2 feature, AA -# We enable this by default -export GDK_USE_XFT=1 - -export SVCNAME=xdm -EXEC="$(get_options service)" -NAME="$(get_options name)" -PIDFILE="$(get_options pidfile)" -START_STOP_ARGS="$(get_options start_stop_args)" - -start-stop-daemon --start --exec ${EXEC} \ -${NAME:+--name} ${NAME} ${PIDFILE:+--pidfile} ${PIDFILE} ${START_STOP_ARGS} || \ -eerror "ERROR: could not start the Display Manager" - -# vim:ts=4 diff --git a/pcr/openrc-desktop/wpa_cli.sh b/pcr/openrc-desktop/wpa_cli.sh deleted file mode 100644 index 4fd0d2cda..000000000 --- a/pcr/openrc-desktop/wpa_cli.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -# Copyright 1999-2011 Gentoo Foundation -# Written by Roy Marples <uberlord@gentoo.org> -# Distributed under the terms of the GNU General Public License v2 -# Alternatively, this file may be distributed under the terms of the BSD License -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_cli.sh,v 1.3 2011/07/08 07:06:21 gurligebis Exp $ - -if [ -z "$1" -o -z "$2" ]; then - logger -t wpa_cli "Insufficient parameters" - exit 1 -fi - -INTERFACE="$1" -ACTION="$2" - -# Note, the below action must NOT mark the interface down via ifconfig, ip or -# similar. Addresses can be removed, changed and daemons can be stopped, but -# the interface must remain up for wpa_supplicant to work. - -if [ -f /etc/gentoo-release ]; then - EXEC="/etc/init.d/net.${INTERFACE} --quiet" -else - logger -t wpa_cli "I don't know what to do with this distro!" - exit 1 -fi - -case ${ACTION} in - CONNECTED) - EXEC="${EXEC} start" - ;; - DISCONNECTED) - # Deactivated, since stopping /etc/init.d/net.wlanX - # stops the network completly. - EXEC="false ${EXEC} stop" - ;; - *) - logger -t wpa_cli "Unknown action ${ACTION}" - exit 1 - ;; -esac - -# ${EXEC} can use ${IN_BACKGROUND} so that it knows that the user isn't -# stopping the interface and a background process - like wpa_cli - is. -export IN_BACKGROUND=true - -logger -t wpa_cli "interface ${INTERFACE} ${ACTION}" -${EXEC} || logger -t wpa_cli "executing '${EXEC}' failed" diff --git a/pcr/openrc-desktop/wpa_supplicant-conf.d b/pcr/openrc-desktop/wpa_supplicant-conf.d deleted file mode 100644 index 104b9dc5d..000000000 --- a/pcr/openrc-desktop/wpa_supplicant-conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# conf.d file for wpa_supplicant -# -# Please check man 8 wpa_supplicant for more information about the options -# wpa_supplicant accepts. -# -wpa_supplicant_args="" diff --git a/pcr/openrc-desktop/wpa_supplicant-init.d b/pcr/openrc-desktop/wpa_supplicant-init.d deleted file mode 100644 index 8429a3733..000000000 --- a/pcr/openrc-desktop/wpa_supplicant-init.d +++ /dev/null @@ -1,70 +0,0 @@ -#!/sbin/runscript -# Copyright (c) 2009 Roy Marples <roy@marples.name> -# All rights reserved. Released under the 2-clause BSD license. - -command=/usr/sbin/wpa_supplicant -: ${wpa_supplicant_conf:=/etc/wpa_supplicant/wpa_supplicant.conf} -wpa_supplicant_if=${wpa_supplicant_if:+-i}$wpa_supplicant_if -command_args="$wpa_supplicant_args -B -c$wpa_supplicant_conf $wpa_supplicant_if" -name="WPA Supplicant Daemon" - -depend() -{ - need localmount - use logger - after bootmisc modules - before dns dhcpcd net - keyword -shutdown -} - -find_wireless() -{ - local iface= - - case "$RC_UNAME" in - Linux) - for iface in /sys/class/net/*; do - if [ -e "$iface"/wireless -o \ - -e "$iface"/phy80211 ] - then - echo "${iface##*/}" - return 0 - fi - done - ;; - *) - for iface in /dev/net/* $(ifconfig -l 2>/dev/null); do - if ifconfig "${iface##*/}" 2>/dev/null | \ - grep -q "[ ]*ssid " - then - echo "${iface##*/}" - return 0 - fi - done - ;; - esac - - return 1 -} - -append_wireless() -{ - local iface= i= - - iface=$(find_wireless) - if [ -n "$iface" ]; then - for i in $iface; do - command_args="$command_args -i$i" - done - else - eerror "Could not find a wireless interface" - fi -} - -start_pre() -{ - case " $command_args" in - *" -i"*) ;; - *) append_wireless;; - esac -} diff --git a/pcr/openrc-desktop/xdm-setup.initd-1 b/pcr/openrc-desktop/xdm-setup.initd-1 deleted file mode 100644 index 365664e66..000000000 --- a/pcr/openrc-desktop/xdm-setup.initd-1 +++ /dev/null @@ -1,14 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm-setup.initd-1,v 1.1 2010/04/13 10:07:39 scarabeus Exp $ - -depend() { - need localmount -} - -start() { - if get_bootparam "nox" ; then - touch /etc/.noxdm - fi -} diff --git a/pcr/openrc-desktop/xdm.confd-4 b/pcr/openrc-desktop/xdm.confd-4 deleted file mode 100644 index c82fece01..000000000 --- a/pcr/openrc-desktop/xdm.confd-4 +++ /dev/null @@ -1,10 +0,0 @@ -# We always try and start X on a static VT. The various DMs normally default -# to using VT7. If you wish to use the xdm init script, then you should ensure -# that the VT checked is the same VT your DM wants to use. We do this check to -# ensure that you haven't accidentally configured something to run on the VT -# in your /etc/inittab file so that you don't get a dead keyboard. -CHECKVT=7 - -# What display manager do you use ? [ xdm | gdm | kdm | gpe | entrance ] -# NOTE: If this is set in /etc/rc.conf, that setting will override this one. -DISPLAYMANAGER="xdm" diff --git a/pcr/openrc-desktop/xdm.initd-11 b/pcr/openrc-desktop/xdm.initd-11 deleted file mode 100644 index 2f7b47cb2..000000000 --- a/pcr/openrc-desktop/xdm.initd-11 +++ /dev/null @@ -1,231 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-11,v 1.1 2014/04/14 16:19:25 chithanh Exp $ - -# This is here to serve as a note to myself, and future developers. -# -# Any Display manager (gdm,kdm,xdm) has the following problem: if -# it is started before any getty, and no vt is specified, it will -# usually run on vt2. When the getty on vt2 then starts, and the -# DM is already started, the getty will take control of the keyboard, -# leaving us with a "dead" keyboard. -# -# Resolution: add the following line to /etc/inittab -# -# x:a:once:/etc/X11/startDM.sh -# -# and have /etc/X11/startDM.sh start the DM in daemon mode if -# a lock is present (with the info of what DM should be started), -# else just fall through. -# -# How this basically works, is the "a" runlevel is a additional -# runlevel that you can use to fork processes with init, but the -# runlevel never gets changed to this runlevel. Along with the "a" -# runlevel, the "once" key word means that startDM.sh will only be -# run when we specify it to run, thus eliminating respawning -# startDM.sh when "xdm" is not added to the default runlevel, as was -# done previously. -# -# This script then just calls "telinit a", and init will run -# /etc/X11/startDM.sh after the current runlevel completes (this -# script should only be added to the actual runlevel the user is -# using). -# -# Martin Schlemmer -# aka Azarah -# 04 March 2002 - -depend() { - need localmount xdm-setup - - # this should start as early as possible - # we can't do 'before *' as that breaks it - # (#139824) Start after ypbind and autofs for network authentication - # (#145219 #180163) Could use lirc mouse as input device - # (#70689 comment #92) Start after consolefont to avoid display corruption - # (#291269) Start after quota, since some dm need readable home - # (#390609) gdm-3 will fail when dbus is not running - # (#366753) starting keymaps after X causes problems - after bootmisc consolefont modules netmount - after readahead-list ypbind autofs openvpn gpm lircmd - after quota keymaps - before alsasound - - # Start before X - use consolekit dbus xfs -} - -setup_dm() { - local MY_XDM - - MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]') - - # Load our root path from profile.env - # Needed for kdm - PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}") - - NAME= - case "${MY_XDM}" in - kdm|kde) - EXE=/usr/bin/kdm - PIDFILE=/run/kdm.pid - ;; - entrance*) - EXE=/usr/sbin/entrance - PIDFILE=/run/entrance.pid - ;; - gdm|gnome) - # gdm-3 and above has different paths - if [ -f /usr/sbin/gdm ]; then - EXE=/usr/sbin/gdm - PIDFILE=/run/gdm/gdm.pid - START_STOP_ARGS="--background" - AUTOCLEAN_CGROUP="yes" - else - EXE=/usr/bin/gdm - PIDFILE=/run/gdm.pid - fi - [ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary - ;; - wdm) - EXE=/usr/bin/wdm - PIDFILE= - ;; - gpe) - EXE=/usr/bin/gpe-dm - PIDFILE=/run/gpe-dm.pid - ;; - lxdm) - EXE=/usr/sbin/lxdm-binary - PIDFILE=/run/lxdm.pid - START_STOP_ARGS="--background" - ;; - lightdm) - EXE=/usr/sbin/lightdm - PIDFILE=/run/lightdm.pid - START_STOP_ARGS="--background" - ;; - sddm) - EXE="/usr/bin/sddm" - START_STOP_ARGS="-m --background" - PIDFILE=/run/sddm.pid - ;; - *) - # first find out if there is such executable - EXE="$(command -v ${MY_XDM} 2>/dev/null)" - PIDFILE="/run/${MY_XDM}.pid" - - # warn user that he is doing sick things if the exe was not found - if [ -z "${EXE}" ]; then - echo "ERROR: Your XDM value is invalid." - echo " No ${MY_XDM} executable could be found on your system." - fi - ;; - esac - - if ! [ -x "${EXE}" ]; then - EXE=/usr/bin/xdm - PIDFILE=/run/xdm.pid - if ! [ -x "/usr/bin/xdm" ]; then - echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm," - echo " or install x11-apps/xdm package" - eend 255 - fi - fi -} - -# Check to see if something is defined on our VT -vtstatic() { - if [ -e /etc/inittab ] ; then - grep -Eq "^[^#]+.*\<tty$1\>" /etc/inittab - elif [ -e /etc/ttys ] ; then - grep -q "^ttyv$(($1 - 1))" /etc/ttys - else - return 1 - fi -} - -start() { - local EXE NAME PIDFILE AUTOCLEAN_CGROUP - setup_dm - - if [ -f /etc/.noxdm ]; then - einfo "Skipping ${EXE##*/}, /etc/.noxdm found or \"nox\" bootparam passed." - rm /etc/.noxdm - return 0 - fi - - ebegin "Setting up ${EXE##*/}" - - # save the prefered DM - save_options "service" "${EXE}" - save_options "name" "${NAME}" - save_options "pidfile" "${PIDFILE}" - save_options "start_stop_args" "${START_STOP_ARGS}" - save_options "autoclean_cgroup" "${AUTOCLEAN_CGROUP:-no}" - - if [ -n "${CHECKVT-y}" ] ; then - if vtstatic "${CHECKVT:-7}" ; then - if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ]; then - ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later" - telinit a >/dev/null 2>&1 - return 0 - else - eerror "Something is already defined on VT ${CHECKVT:-7}, not starting" - return 1 - fi - fi - fi - - /etc/X11/startDM.sh - eend 0 -} - -stop() { - local curvt retval - - retval=0 - if [ -t 0 ]; then - if type fgconsole >/dev/null 2>&1; then - curvt=$(fgconsole 2>/dev/null) - else - curvt=$(tty) - case "${curvt}" in - /dev/ttyv[0-9]*) curvt=${curvt#/dev/ttyv} ;; - *) curvt= ;; - esac - fi - fi - local myexe myname mypidfile myservice - myexe=$(get_options "service") - myname=$(get_options "name") - mypidfile=$(get_options "pidfile") - myservice=${myexe##*/} - yesno "${rc_cgroup_cleanup:-no}" || rc_cgroup_cleanup=$(get_options "autoclean_cgroup") - - [ -z "${myexe}" ] && return 0 - - ebegin "Stopping ${myservice}" - - if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then - start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \ - ${mypidfile:+--pidfile} ${mypidfile} \ - ${myname:+--name} ${myname} - retval=${?} - fi - - # switch back to original vt - if [ -n "${curvt}" ]; then - if type chvt >/dev/null 2>&1; then - chvt "${curvt}" - else - vidcontrol -s "$((curvt + 1))" - fi - fi - - eend ${retval} "Error stopping ${myservice}" - return ${retval} -} - -# vim: set ts=4 : diff --git a/pcr/openrc-misc/10-openrc-status-r4 b/pcr/openrc-misc/10-openrc-status-r4 deleted file mode 100644 index e195ccc19..000000000 --- a/pcr/openrc-misc/10-openrc-status-r4 +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# Copyright (c) 2012 Alexandre Rostovtsev -# Released under the 2-clause BSD license. - -# Ensures that the NetworkManager OpenRC service is marked as started and -# providing net only when it has a successful connection. - -if [ ! -e "/run/openrc/softlevel" ]; then - # OpenRC is not running - exit 0 -fi - -# Ensure rc-service is in PATH -PATH="${PATH}:@EPREFIX@/sbin:@EPREFIX@/usr/sbin" - -# Exit if the NetworkManager OpenRC service is not running -rc-service NetworkManager status 2>&1 | grep -Eq "status: (starting|started|inactive|stopping)" || exit 0 - -# Call rc-service in background mode so that the start/stop functions update -# NetworkManager service status to started or inactive instead of actually -# starting or stopping the daemon -export IN_BACKGROUND=YES - -case "$2" in - up) nm-online -t 0 -x && - ! rc-service NetworkManager status 2>&1 | grep -q started && - exec rc-service NetworkManager start ;; - down) nm-online -t 0 -x || - rc-service NetworkManager status 2>&1 | grep -q stopped || - exec rc-service NetworkManager stop ;; - pre-sleep) rc-service NetworkManager status 2>&1 | grep -q stopped || - exec rc-service NetworkManager stop ;; -esac -exit 0 -# vim: set ts=4: diff --git a/pcr/openrc-misc/PKGBUILD b/pcr/openrc-misc/PKGBUILD index 0b97a638d..77c870bda 100644 --- a/pcr/openrc-misc/PKGBUILD +++ b/pcr/openrc-misc/PKGBUILD @@ -1,509 +1,469 @@ -# Maintainer : freaj <freaj@riseup.net> -# Maintainer (Manjaro): artoo <artoo@manjaro.org> - -# file vars for easy update -_Ifrcon=fcron.init.3 -_Crsysl=rsyslog.confd -_Irsysl=rsyslog.initd -_Csane=saned.confd -_Isane=saned.initd -_Ifuse=fuse.init -_Cmeta=metalog.confd -_Imeta=metalog.initd -_Csyslog=syslog-ng.confd -_Isyslog=syslog-ng.rc6 -_Clirc1=lircd.conf.4 -_Clirc2=irexec-confd -_Ilirc1=lircd-0.8.6-r2 -_Ilirc2=irexec-initd-0.8.6-r2 -_Ilirc3=lircmd -#_Csens=sensord-conf.d -_Isens1=sensord-4-init.d -_Isens2=fancontrol-init.d-2 -_Isens3=lm_sensors-3-init.d -_Ccpu=conf.d-r2 -_Icpu=init.d-r4 -_Cntp1=ntpd.confd -_Cntp2=ntp-client.confd -_Cntp3=sntp.confd -_Intp1=ntpd.rc-r1 -_Intp2=ntp-client.rc -_Intp3=sntp.rc -_Icups=cupsd.init.d-r1 -_Ccon=connman.confd -_Icon=connman.initd2 -_Chaveg=haveged-conf.d -_Ihaveg=haveged-init.d.3 -_Csalt_mtr=master-confd-1 -_Isalt_mtr=master-initd-3 -_Csalt_min=minion-confd-1 -_Isalt_min=minion-initd-3 -_Csalt_sync=syndic-confd-1 -_Isalt_sync=syndic-initd-3 -_Impd=mpd2.init -_Chdparm=hdparm-conf.d.3 -_Ihdparm=hdparm-init-8 -_Cbit=bitlbee.confd -_Ibit=bitlbee.initd -_Itherm=thermald.initd -_Ixe=xe-daemon.initd -_Izfs=zfs.initd -_IClam=clamd.initd-r6 -_CClam=clamd.conf-r1 -_CNM=conf.d.NetworkManager -_INM=init.d.NetworkManager -_SNM=10-openrc-status-r4 +# Maintainer (Arch): artoo <artoo@manjaro.org> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> _gentoo_uri="http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86" pkgbase=openrc-misc pkgname=('cpupower-openrc' - 'connman-openrc' - 'fcron-openrc' - 'fuse-openrc' - 'metalog-openrc' - 'rsyslog-openrc' - 'sane-openrc' - 'syslog-ng-openrc' - 'lirc-utils-openrc' - 'lm_sensors-openrc' - 'ntp-openrc' - 'cups-openrc' - 'haveged-openrc' - 'salt-openrc' - 'mpd-openrc' - 'hdparm-openrc' - 'bitlbee-openrc' - 'thermald-openrc' - 'xe-guest-utilities-openrc' - 'zfs-openrc' - 'clamav-openrc' - 'networkmanager-openrc') -pkgver=20150330 + 'connman-openrc' + 'fcron-openrc' + 'fuse-openrc' + 'metalog-openrc' + 'rsyslog-openrc' + 'sane-openrc' + 'syslog-ng-openrc' + 'lirc-utils-openrc' + 'lm_sensors-openrc' + 'ntp-openrc' + 'cups-openrc' + 'haveged-openrc' + 'salt-openrc' + 'mpd-openrc' + 'hdparm-openrc' + 'bitlbee-openrc' + 'thermald-openrc' + 'xe-guest-utilities-openrc' + 'zfs-openrc' + 'clamav-openrc' + 'networkmanager-openrc' + 'at-openrc' + 'libvirt-openrc') +pkgver=20150828 pkgrel=1 pkgdesc="OpenRC init scripts" arch=('any') url="https://github.com/manjaro/packages-openrc" license=('GPL2') -groups=('openrc' 'openrc-misc') +groups=('openrc-misc') conflicts=('openrc' - 'openrc-git' - 'openrc-arch-services-git' - 'initscripts' - 'systemd-sysvcompat') -source=("${_gentoo_uri}/sys-process/fcron/files/${_Ifrcon}" - "${_gentoo_uri}/app-admin/rsyslog/files/8-stable/${_Crsysl}" - "${_gentoo_uri}/app-admin/rsyslog/files/8-stable/${_Irsysl}" - "${_gentoo_uri}/media-gfx/sane-backends/files/${_Csane}" - "${_gentoo_uri}/media-gfx/sane-backends/files/${_Isane}" - "${_gentoo_uri}/sys-fs/fuse/files/${_Ifuse}" - "${_gentoo_uri}/app-admin/metalog/files/${_Cmeta}" - "${_gentoo_uri}/app-admin/metalog/files/${_Imeta}" - "${_gentoo_uri}/app-admin/syslog-ng/files/3.6/${_Csyslog}" - "${_gentoo_uri}/app-admin/syslog-ng/files/3.6/${_Isyslog}" - "${_gentoo_uri}/app-misc/lirc/files/${_Clirc1}" - "${_gentoo_uri}/app-misc/lirc/files/${_Clirc2}" - "${_gentoo_uri}/app-misc/lirc/files/${_Ilirc1}" - "${_gentoo_uri}/app-misc/lirc/files/${_Ilirc2}" - "${_gentoo_uri}/app-misc/lirc/files/${_Ilirc3}" - "${_gentoo_uri}/sys-power/cpupower/files/${_Ccpu}" - "${_gentoo_uri}/sys-power/cpupower/files/${_Icpu}" - #"${_gentoo_uri}/sys-apps/lm_sensors/files/${_Csens}" - "${_gentoo_uri}/sys-apps/lm_sensors/files/${_Isens1}" - "${_gentoo_uri}/sys-apps/lm_sensors/files/${_Isens2}" - "${_gentoo_uri}/sys-apps/lm_sensors/files/${_Isens3}" - "${_gentoo_uri}/net-misc/ntp/files/${_Cntp1}" - "${_gentoo_uri}/net-misc/ntp/files/${_Cntp2}" - "${_gentoo_uri}/net-misc/ntp/files/${_Cntp3}" - "${_gentoo_uri}/net-misc/ntp/files/${_Intp1}" - "${_gentoo_uri}/net-misc/ntp/files/${_Intp2}" - "${_gentoo_uri}/net-misc/ntp/files/${_Intp3}" - "${_gentoo_uri}/net-print/cups/files/${_Icups}" - "${_gentoo_uri}/net-misc/connman/files/${_Ccon}" - "${_gentoo_uri}/net-misc/connman/files/${_Icon}" - "${_gentoo_uri}/sys-apps/haveged/files/${_Chaveg}" - "${_gentoo_uri}/sys-apps/haveged/files/${_Ihaveg}" - "${_gentoo_uri}/app-admin/salt/files/${_Csalt_mtr}" - "${_gentoo_uri}/app-admin/salt/files/${_Isalt_mtr}" - "${_gentoo_uri}/app-admin/salt/files/${_Csalt_min}" - "${_gentoo_uri}/app-admin/salt/files/${_Isalt_min}" - "${_gentoo_uri}/app-admin/salt/files/${_Csalt_sync}" - "${_gentoo_uri}/app-admin/salt/files/${_Isalt_sync}" - "${_gentoo_uri}/media-sound/mpd/files/${_Impd}" - "${_gentoo_uri}/sys-apps/hdparm/files/${_Chdparm}" - "${_gentoo_uri}/sys-apps/hdparm/files/${_Ihdparm}" - "${_gentoo_uri}/net-im/bitlbee/files/${_Cbit}" - "${_gentoo_uri}/net-im/bitlbee/files/${_Ibit}" - "${_gentoo_uri}/app-emulation/xe-guest-utilities/files/${_Ixe}" - "${_Izfs}" - "${_Itherm}" - "${_gentoo_uri}/app-antivirus/clamav/files/${_CClam}" - "${_gentoo_uri}/app-antivirus/clamav/files/${_IClam}" - "${_gentoo_uri}/net-misc/networkmanager/files/${_CNM}" - "${_gentoo_uri}/net-misc/networkmanager/files/${_INM}" - "${_gentoo_uri}/net-misc/networkmanager/files/${_SNM}") + 'openrc-git' + 'openrc-arch-services-git' + 'initscripts' + 'systemd-sysvcompat') +source=("fcron.initd::${_gentoo_uri}/sys-process/fcron/files/fcron.init.3" + "rsyslog.confd::${_gentoo_uri}/app-admin/rsyslog/files/8-stable/rsyslog.confd" + "rsyslog.initd::${_gentoo_uri}/app-admin/rsyslog/files/8-stable/rsyslog.initd" + "saned.confd::${_gentoo_uri}/media-gfx/sane-backends/files/saned.confd" + "saned.initd::${_gentoo_uri}/media-gfx/sane-backends/files/saned.initd" + "fuse.initd::${_gentoo_uri}/sys-fs/fuse/files/fuse.init" + "metalog.confd::${_gentoo_uri}/app-admin/metalog/files/metalog.confd" + "metalog.initd::${_gentoo_uri}/app-admin/metalog/files/metalog.initd" + "syslog-ng.confd::${_gentoo_uri}/app-admin/syslog-ng/files/3.6/syslog-ng.confd" + "syslog-ng.initd::${_gentoo_uri}/app-admin/syslog-ng/files/3.6/syslog-ng.rc6" + "lircd.confd::${_gentoo_uri}/app-misc/lirc/files/lircd.conf.4" + "irexec.confd::${_gentoo_uri}/app-misc/lirc/files/irexec-confd" + "lircd.initd::${_gentoo_uri}/app-misc/lirc/files/lircd-0.8.6-r2" + "irexec.initd::${_gentoo_uri}/app-misc/lirc/files/irexec-initd-0.8.6-r2" + "lircmd.initd::${_gentoo_uri}/app-misc/lirc/files/lircmd" + "cpupower.confd::${_gentoo_uri}/sys-power/cpupower/files/conf.d-r2" + "cpupower.initd::${_gentoo_uri}/sys-power/cpupower/files/init.d-r4" + #"sensord.confd::${_gentoo_uri}/sys-apps/lm_sensors/files/sensord-conf.d" + "sensord.initd::${_gentoo_uri}/sys-apps/lm_sensors/files/sensord-4-init.d" + "fancontrol.initd::${_gentoo_uri}/sys-apps/lm_sensors/files/fancontrol-init.d-2" + "lm_sensors.initd::${_gentoo_uri}/sys-apps/lm_sensors/files/lm_sensors-3-init.d" + "ntpd.confd::${_gentoo_uri}/net-misc/ntp/files/ntpd.confd" + "ntp-client.confd::${_gentoo_uri}/net-misc/ntp/files/ntp-client.confd" + "sntp.confd::${_gentoo_uri}/net-misc/ntp/files/sntp.confd" + "ntpd.initd::${_gentoo_uri}/net-misc/ntp/files/ntpd.rc-r1" + "ntp-client.initd::${_gentoo_uri}/net-misc/ntp/files/ntp-client.rc" + "sntp.initd::${_gentoo_uri}/net-misc/ntp/files/sntp.rc" + "cupsd.initd::${_gentoo_uri}/net-print/cups/files/cupsd.init.d-r1" + "connman.confd::${_gentoo_uri}/net-misc/connman/files/connman.confd" + "connman.initd::${_gentoo_uri}/net-misc/connman/files/connman.initd2" + "haveged.confd::${_gentoo_uri}/sys-apps/haveged/files/haveged-conf.d" + "haveged.initd::${_gentoo_uri}/sys-apps/haveged/files/haveged-init.d.3" + "salt-master.confd::${_gentoo_uri}/app-admin/salt/files/master-confd-1" + "salt-master.initd::${_gentoo_uri}/app-admin/salt/files/master-initd-4" + "salt-minion.confd::${_gentoo_uri}/app-admin/salt/files/minion-confd-1" + "salt-minion.initd::${_gentoo_uri}/app-admin/salt/files/minion-initd-4" + "salt-syncdic.confd::${_gentoo_uri}/app-admin/salt/files/syndic-confd-1" + "salt-syncdic.initd::${_gentoo_uri}/app-admin/salt/files/syndic-initd-4" + "salt-api.confd::${_gentoo_uri}/app-admin/salt/files/api-confd-1" + "salt-api.initd::${_gentoo_uri}/app-admin/salt/files/api-initd-4" + "mpd.initd::${_gentoo_uri}/media-sound/mpd/files/mpd2.init" + "hdparm.confd::${_gentoo_uri}/sys-apps/hdparm/files/hdparm-conf.d.3" + "hdparm.initd::${_gentoo_uri}/sys-apps/hdparm/files/hdparm-init-8" + "bitlbee.confd::${_gentoo_uri}/net-im/bitlbee/files/bitlbee.confd" + "bitlbee.initd::${_gentoo_uri}/net-im/bitlbee/files/bitlbee.initd" + "xe-daemon.initd::${_gentoo_uri}/app-emulation/xe-guest-utilities/files/xe-daemon.initd" + "clamd.confd::${_gentoo_uri}/app-antivirus/clamav/files/clamd.conf-r1" + "clamd.initd::${_gentoo_uri}/app-antivirus/clamav/files/clamd.initd-r6" + "NetworkManager.confd::${_gentoo_uri}/net-misc/networkmanager/files/conf.d.NetworkManager" + "NetworkManager.initd::${_gentoo_uri}/net-misc/networkmanager/files/init.d.NetworkManager" + "10-openrc-status::${_gentoo_uri}/net-misc/networkmanager/files/10-openrc-status-r4" + "atd.confd::${_gentoo_uri}/sys-process/at/files/atd.confd" + "atd.initd::${_gentoo_uri}/sys-process/at/files/atd.rc8" + "libvirtd.confd::${_gentoo_uri}/app-emulation/libvirt/files/libvirtd.confd-r4" + "libvirtd.initd::${_gentoo_uri}/app-emulation/libvirt/files/libvirtd.init-r14" + "virtlockd.initd::${_gentoo_uri}/app-emulation/libvirt/files/virtlockd.init-r1" + "zfs.initd" + "thermald.initd") +sha256sums=('ceada7a1c9e8b62cff506bc94a1813706c7de1ed23daf9c3450ad549df4fafb7' + 'f0b15a0334f6177a6cf23cb9b169302c75745dc30857f24a7d11892feb6b1ee4' + '204c66d2b7d4d20115acc7499708cf538538fe1c100281ad55f909508041fb19' + '197e44ba1f438a18f5f7d9f5858feb19c1ece4286d82a5e63caf9be5b964aa76' + '4dd4e7fa07bf2ab2d4f5753156f5df0ad2277523f6755b0eab3d2db3480989e2' + '22a22c914d2a4f0fb5fc8495f4b7efcd1819efde548c9033ca612c181cd29eda' + 'ec9f05b386a06a4b2d5398cc0c33f34eba3f5e74ad46ae203d682f8ebc593f99' + '906c31e0817517dc6c141a7a10565140ea272d3c958a065f520a0ecb6f81912f' + 'b29325498ee3b1f3d63672efcd1e93f0745eecdb9f4bb05fed82a2f085399484' + 'aa027dac0d145bc342728864cd432a0cf3c25dd6cb66880e7b70df1a9d5a66cf' + 'd36ff77fa193a065d25e373723e03f1a9471205151b82c73a6574cce4f095962' + 'c404ad3b624004cab25bd3a89593cdeb0abbc25771d6e52caf2f37cb4f7b2b79' + '1b1f2970cc81a6053fcb6c0ead786436b6423c67170087dde283e54f32ae16e5' + '5e5a31fbd93294a6e210499a880fcab371b23706824c9d60d827b0187d7bade4' + 'd47f22a33a83c14a4a0c333d6a445c40e550c491899fb0c6d323e23fe1eac7b7' + '9ab6f022d2b2948660decf5e383984e6ddb9e9e5e6e2761c3031378ddd87e947' + '25f2a1665c88dc5227698bdedc2098d6e37d12d8b966f00e2a180c95a33cc8b4' + '4bd482a54decc5a51aee60e19ae31b0182d5857b112754247f04c0829b159b07' + '36d489296c31736f8015b0ce27052b3f1555b7fe6335120c0477b044b8e4fb8d' + '9b018f9f7a0975988387858823fe59a5cd8af6413d8c3170db0e24aac6021ec3' + '40803821f498267f6567436eedc18201b5ae4b5390d6872fb15a94200c2ac06f' + 'c7dc517cdb5ee10e2a07ccea15ec47ba0b7aff8ac1469204c8d7faf71bcae2c5' + '97282007801cb9c0e3b431e2930dec3bb8ce8869f63f7e02d903846e96734684' + '22a4b5e4c934ea8ba66764441b0bb60d31d23c147c8b64a4a035947327bfc3ec' + '2e4a42dd64b7c6dacfcfefdab8dc1e7c45d7a0966ef8b928583d18393362c719' + '8fbd405ad951e7ad046e4408abb98f4066077113187198767d52f28d7228bae4' + '4705b68372090ee7db69da1ad35131551ed1ba99032db2486ff6c31d2170ce6b' + '767a160c1b3392f0a12d3908a937548a2f604a9a121e744c309ee6f478420b02' + 'f0a561f124cac3791fba6ee7ef5bc3ea46bd7535edf9e864689b0d9cfa65d332' + '3b53f4aabf937766b5aa806561e9b97ab2be49ac25d76ae97f4fca4ab7a42e33' + '365e9cbde2564a0430d8d1c0f8bc367db2bb32937ebf61649196f0e6a1ab5363' + '9f3f47a7af4d349a7c525455616139b5019d3b7d0290398ba8c50ab91a62d089' + '239071e57c37c9d5d9ca1f5b54155b9a9c31e06f32f01387ebfb2d0c6f51f61a' + '286148f5391d42c04a62a13cc125fa2130b5821e50da913c5a20d3a913e5f2d1' + 'd1ff82d1f4db8b2bfc640c1cad3e2bfb525dd8ef2225cb4dc1018cf9021a2a34' + '286148f5391d42c04a62a13cc125fa2130b5821e50da913c5a20d3a913e5f2d1' + '7c3fe247d36f47e998e70e0715e6dc58df54e9b9bd5cead577884bb74461809e' + '9f3f47a7af4d349a7c525455616139b5019d3b7d0290398ba8c50ab91a62d089' + '78940f949714d654a80426871f4679b44466ae38e87a4d681f3f0ad353f7d607' + '3591473024005cdb15f13809c7675fbb964dc1b13e7658a01e12e34c7e751897' + '37c95ff723fa578e9039613d09dbf790d99113a318c065422986c744519214e9' + '434beee81ba04c96fcd03e6b37a4578c2c25af2c1007368469c48dd37523d56e' + '105afc0382fc5adc03ed644dba4e78817015a55432349f259a286ac3c1b06628' + '2eaef8071b34c1a3d55271d283b31e25e081791e48a6a55eb394912e4954ba48' + '24cbcf298b869e4451b08aeba0e3e4948aa7faaac649f18e8f600ae5fb86a8fb' + '28ebd47810b0568fc7692218867d6804a1df70290681462f5555e230ca817732' + 'c00bb921afe65e31a9ac4bbcfc97e4c9afa7ad77604c2dcb7eedc152fec5bbd8' + '4594573f01fe5e04b6dde4525796acf909158591bdcefd662ec23fe0d1c3e1bd' + '5f368362ef5c6deed538f20dc582d6da3c86871bd42297fa78536c0312021843' + 'f8ed424818b866a0bf882c569f4484e8b1485ce7ac8c472f060fd877f2dcfe65' + '92350108a385cc66dffab8c9fc9cc1c85ca1abf36d0ffb007a4e1e55291e0179' + '0f7c55e125d9d16f30fd9d2335485cac0b64a9452128d564e9318290703d8229' + 'c2ca5d9a2d4ed433e91bd215c2ca678109cc981072897a497955e36760dc3b9f' + 'ed8514d347d3a8a0b243cfc25a85dedb1e595f1e29e874bcadd14ef5f5d03e58' + 'd156cf6a2b00d8d81529e63231fd49b2599838f6c79740fed6c443840e57ece8' + '7321272190ea9846ab7e19b034649c1cd711d4f94a6bdcaaaec2f683bb822e7d' + '4bbb4e610d2d6bb22d83aa2980dca052a23b90fa6985c8245601b716dec986f4') pkgver() { - date +%Y%m%d + date +%Y%m%d } -_shebang='s|#!/sbin/runscript|#!/usr/bin/openrc-run|' -_runpath='s|/var/run|/run|g' -_binpath='s|/usr/sbin|/usr/bin|g' +_inst_initd(){ + install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1 + sed -e 's|#!/sbin/runscript|#!/usr/bin/openrc-run|' \ + -e 's|/var/run|/run|g' \ + -e 's|/usr/sbin|/usr/bin|g' \ + -i ${pkgdir}/etc/init.d/$1 +} + +_inst_confd(){ + install -Dm755 ${srcdir}/$1.confd ${pkgdir}/etc/conf.d/$1 +} package_bitlbee-openrc() { - pkgdesc="OpenRC bitlbee init script" - depends=('openrc-core' 'bitlbee') - backup=('etc/conf.d/bitlbee') - install=bitlbee.install - - install -Dm755 "${srcdir}/${_Cbit}" "${pkgdir}/etc/conf.d/bitlbee" - install -Dm755 "${srcdir}/${_Ibit}" "${pkgdir}/etc/init.d/bitlbee" - local _p1='s|need logger net|need net\n use logger|' - sed -e "${_shebang}" -e "${_binpath}" -e "${_runpath}" -e "${_p1}" -e "${_p2}" -i "${pkgdir}/etc/init.d/bitlbee" + pkgdesc="OpenRC bitlbee init script" + depends=('openrc-core' 'bitlbee') + backup=('etc/conf.d/bitlbee') + install=bitlbee.install + + _inst_confd 'bitlbee' + _inst_initd 'bitlbee' + + sed -e 's|need logger net|need net\n use logger|' \ + -i "${pkgdir}/etc/init.d/bitlbee" } package_cpupower-openrc() { - pkgdesc="OpenRC cpupower init script" - depends=('openrc-core' 'cpupower') - backup=('etc/conf.d/cpupower') - install=cpupower.install - - install -Dm755 "${srcdir}/${_Ccpu}" "${pkgdir}/etc/conf.d/cpupower" - install -Dm755 "${srcdir}/${_Icpu}" "${pkgdir}/etc/init.d/cpupower" + pkgdesc="OpenRC cpupower init script" + depends=('openrc-core' 'cpupower') + backup=('etc/conf.d/cpupower') + install=cpupower.install - sed -e "${_shebang}" -i "${pkgdir}/etc/init.d/cpupower" + _inst_confd 'cpupower' + _inst_initd 'cpupower' } package_connman-openrc() { - pkgdesc="OpenRC connman init script" - depends=('openrc-core' 'connman') - backup=('etc/conf.d/connman') - install=connman.install + pkgdesc="OpenRC connman init script" + depends=('openrc-core' 'connman') + backup=('etc/conf.d/connman') + install=connman.install - install -Dm755 "${srcdir}/${_Ccon}" "${pkgdir}/etc/conf.d/connman" - install -Dm755 "${srcdir}/${_Icon}" "${pkgdir}/etc/init.d/connman" - - sed -e "${_shebang}" -e "${_binpath}" -i "${pkgdir}/etc/init.d/connman" + _inst_confd 'connman' + _inst_initd 'connman' } package_cups-openrc() { - pkgdesc="OpenRC cups init script" - depends=('cups' 'dbus-openrc') - optdepends=('avahi-openrc: avahi initscripts') - install=cups.install + pkgdesc="OpenRC cups init script" + depends=('cups' 'dbus-openrc') + optdepends=('avahi-openrc: avahi initscripts') + install=cups.install - install -Dm755 "${srcdir}/${_Icups}" "${pkgdir}/etc/init.d/cupsd" + _inst_initd 'cupsd' - local _p1='s|lp:lpadmin|daemon:sys|' \ - _p2='s|@neededservices@|need dbus avahi-daemon|' - sed -e "${_shebang}" -e "${_binpath}" -e "${_p1}" -e "${_p2}" -i "${pkgdir}/etc/init.d/cupsd" + sed -e 's|lp:lpadmin|daemon:sys|' \ + -e 's|@neededservices@|need dbus avahi-daemon|' \ + -i "${pkgdir}/etc/init.d/cupsd" } package_fcron-openrc() { - pkgdesc="OpenRC fcron init script" - depends=('openrc-core' 'fcron') - groups=('openrc-misc') - provides=('openrc-cron') - conflicts=('cronie' - 'cronie-openrc' - 'openrc' - 'openrc-git' - 'openrc-arch-services-git' - 'initscripts' - 'systemd-sysvcompat') - install=fcron.install - - install -Dm755 "${srcdir}/${_Ifrcon}" "${pkgdir}/etc/init.d/fcron" - - local _p1='s|/usr/libexec|/usr/bin|g' - sed -e "${_shebang}" -e "${_runpath}" -e "${_p1}" -i "${pkgdir}/etc/init.d/fcron" + pkgdesc="OpenRC fcron init script" + depends=('openrc-core' 'fcron') + groups=('openrc-misc') + provides=('openrc-cron') + conflicts=('cronie' + 'cronie-openrc' + 'openrc' + 'openrc-git' + 'openrc-arch-services-git' + 'initscripts' + 'systemd-sysvcompat') + install=fcron.install + + _inst_initd 'fcron' + + sed -e 's|/usr/libexec|/usr/bin|g' \ + -i "${pkgdir}/etc/init.d/fcron" } package_ntp-openrc() { - pkgdesc="OpenRC ntp init script" - depends=('openrc-core' 'ntp') - optdepends=('bind-openrc: bind initscript') - provides=('openrc-timed') - conflicts=('openntpd' - 'openntpd-openrc' - 'openrc' - 'openrc-git' - 'openrc-arch-services-git' - 'initscripts' - 'systemd-sysvcompat') - backup=('etc/conf.d/ntpd' - 'etc/conf.d/ntp-client' - 'etc/init.d/sntp') - install=ntp.install - - install -Dm755 "${srcdir}/${_Cntp1}" "${pkgdir}/etc/conf.d/ntpd" - install -Dm755 "${srcdir}/${_Intp1}" "${pkgdir}/etc/init.d/ntpd" - install -Dm755 "${srcdir}/${_Cntp2}" "${pkgdir}/etc/conf.d/ntp-client" - install -Dm755 "${srcdir}/${_Intp2}" "${pkgdir}/etc/init.d/ntp-client" - install -Dm755 "${srcdir}/${_Cntp3}" "${pkgdir}/etc/conf.d/sntp" - install -Dm755 "${srcdir}/${_Intp3}" "${pkgdir}/etc/init.d/sntp" - - for f in ${pkgdir}/etc/init.d/*;do - sed -e "${_shebang}" -e "${_binpath}" -e "${_runpath}" -i $f - done + pkgdesc="OpenRC ntp init script" + depends=('openrc-core' 'ntp') + optdepends=('bind-openrc: bind initscript') + provides=('openrc-timed') + conflicts=('openntpd' + 'openntpd-openrc' + 'openrc' + 'openrc-git' + 'openrc-arch-services-git' + 'initscripts' + 'systemd-sysvcompat') + backup=('etc/conf.d/ntpd' + 'etc/conf.d/ntp-client' + 'etc/init.d/sntp') + install=ntp.install + + _inst_confd 'ntpd' + _inst_initd 'ntpd' + + _inst_confd 'ntp-client' + _inst_initd 'ntp-client' + + _inst_confd 'sntp' + _inst_initd 'sntp' } package_rsyslog-openrc() { - pkgdesc="OpenRC rsyslog init script" - depends=('openrc-core' 'rsyslog') - backup=('etc/conf.d/rsyslog') - install=rsyslog.install - - install -Dm755 "${srcdir}/${_Crsysl}" "${pkgdir}/etc/conf.d/rsyslog" - install -Dm755 "${srcdir}/${_Irsysl}" "${pkgdir}/etc/init.d/rsyslog" + pkgdesc="OpenRC rsyslog init script" + depends=('openrc-core' 'rsyslog') + backup=('etc/conf.d/rsyslog') + install=rsyslog.install - sed -e "${_shebang}" -e "${_binpath}" -e "${_runpath}" -i "${pkgdir}/etc/init.d/rsyslog" + _inst_confd 'rsyslog' + _inst_initd 'rsyslog' } package_sane-openrc() { - pkgdesc="OpenRC sane init script" - depends=('openrc-core' 'sane') - backup=('etc/conf.d/saned') - install=sane.install - - install -Dm755 "${srcdir}/${_Csane}" "${pkgdir}/etc/conf.d/saned" - install -Dm755 "${srcdir}/${_Isane}" "${pkgdir}/etc/init.d/saned" - local _p1='s|/run/saned/saned.pid|/run/saned.pid|' - sed -e "${_shebang}" -e "${_runpath}" -e "${_binpath}" -e ${_p1} -i ${pkgdir}/etc/init.d/saned + pkgdesc="OpenRC sane init script" + depends=('openrc-core' 'sane') + backup=('etc/conf.d/saned') + install=sane.install + + _inst_confd 'saned' + _inst_initd 'saned' + + sed -e 's|/run/saned/saned.pid|/run/saned.pid|' \ + -i ${pkgdir}/etc/init.d/saned } package_fuse-openrc(){ - pkgdesc="OpenRC fuse init script" - depends=('openrc-core' 'fuse') - install=fuse.install + pkgdesc="OpenRC fuse init script" + depends=('openrc-core' 'fuse') + install=fuse.install - install -Dm755 "${srcdir}/${_Ifuse}" "${pkgdir}/etc/init.d/fuse" - sed -e "${_shebang}" -i "${pkgdir}/etc/init.d/fuse" + _inst_initd 'fuse' } package_metalog-openrc() { - pkgdesc="OpenRC metalog init script" - depends=('openrc-core' 'metalog') - backup=('etc/conf.d/metalog') - install=metalog.install - - install -Dm755 "${srcdir}/${_Cmeta}" "${pkgdir}/etc/conf.d/metalog" - install -Dm755 "${srcdir}/${_Imeta}" "${pkgdir}/etc/init.d/metalog" + pkgdesc="OpenRC metalog init script" + depends=('openrc-core' 'metalog') + backup=('etc/conf.d/metalog') + install=metalog.install - sed -e "${_shebang}" -e "${_binpath}" -e "${_runpath}" -i "${pkgdir}/etc/init.d/metalog" + _inst_confd 'metalog' + _inst_initd 'metalog' } package_syslog-ng-openrc() { - pkgdesc="OpenRC syslog-ng init script" - depends=('openrc-core' 'syslog-ng') - backup=('etc/conf.d/syslog-ng') - install=syslog-ng.install + pkgdesc="OpenRC syslog-ng init script" + depends=('openrc-core' 'syslog-ng') + backup=('etc/conf.d/syslog-ng') + install=syslog-ng.install - install -Dm755 "${srcdir}/${_Csyslog}" "${pkgdir}/etc/conf.d/syslog-ng" - install -Dm755 "${srcdir}/${_Isyslog}" "${pkgdir}/etc/init.d/syslog-ng" - - sed -e "${_shebang}" -e "${_binpath}" -e "${_runpath}" -i "${pkgdir}/etc/init.d/syslog-ng" + _inst_confd 'syslog-ng' + _inst_initd 'syslog-ng' } package_lm_sensors-openrc() { - pkgdesc="OpenRC lm_sensors init script" - depends=('openrc-core' 'lm_sensors') - #backup=('etc/conf.d/sensord') - install=lm_sensors.install - - #install -Dm755 "${srcdir}/${_Csens}" "${pkgdir}/etc/conf.d/sensord" - install -Dm755 "${srcdir}/${_Isens1}" "${pkgdir}/etc/init.d/sensord" - install -Dm755 "${srcdir}/${_Isens2}" "${pkgdir}/etc/init.d/fancontrol" - install -Dm755 "${srcdir}/${_Isens3}" "${pkgdir}/etc/init.d/lm_sensors" - - for f in ${pkgdir}/etc/init.d/*; do - sed -e "${_shebang}" -e "${_binpath}" -e "${_runpath}" -i $f - done + pkgdesc="OpenRC lm_sensors init script" + depends=('openrc-core' 'lm_sensors') + #backup=('etc/conf.d/sensord') + install=lm_sensors.install + + _inst_initd 'sensord' + _inst_initd 'fancontrol' + _inst_initd 'lm_sensors' } package_lirc-utils-openrc() { - pkgdesc="OpenRC lirc-utils init script" - depends=('openrc-core' 'lirc-utils') - backup=('etc/conf.d/lircd' - 'etc/conf.d/irexec') - install=lirc-utils.install - - install -Dm755 "${srcdir}/${_Clirc1}" "${pkgdir}/etc/conf.d/lircd" - install -Dm755 "${srcdir}/${_Ilirc1}" "${pkgdir}/etc/init.d/lircd" + pkgdesc="OpenRC lirc-utils init script" + depends=('openrc-core' 'lirc-utils') + backup=('etc/conf.d/lircd' + 'etc/conf.d/irexec') + install=lirc-utils.install - install -Dm755 "${srcdir}/${_Clirc2}" "${pkgdir}/etc/conf.d/irexec" - install -Dm755 "${srcdir}/${_Ilirc2}" "${pkgdir}/etc/init.d/irexec" + _inst_confd 'lircd' + _inst_initd 'lircd' - install -Dm755 "${srcdir}/${_Ilirc3}" "${pkgdir}/etc/init.d/lircmd" + _inst_confd 'irexec' + _inst_initd 'irexec' - for f in ${pkgdir}/etc/init.d/*;do - sed -e "${_shebang}" -e "${_binpath}" -e "${_runpath}" -i $f - done + _inst_initd 'lircmd' } package_haveged-openrc() { - pkgdesc="OpenRC haveged init script" - depends=('openrc-core' 'haveged') - backup=('etc/conf.d/haveged') - install=haveged.install + pkgdesc="OpenRC haveged init script" + depends=('openrc-core' 'haveged') + backup=('etc/conf.d/haveged') + install=haveged.install - install -Dm755 "${srcdir}/${_Chaveg}" "${pkgdir}/etc/conf.d/haveged" - install -Dm755 "${srcdir}/${_Ihaveg}" "${pkgdir}/etc/init.d/haveged" - - sed -e "${_shebang}" -e "${_binpath}" -i "${pkgdir}/etc/init.d/haveged" + _inst_confd 'haveged' + _inst_initd 'haveged' } package_salt-openrc() { - pkgdesc="OpenRC salt init scripts" - depends=('openrc-core' 'salt') - backup=('etc/conf.d/salt-master' - 'etc/conf.d/salt-minion' - 'etc/conf.d/salt-syncdic') - install=salt.install - - install -Dm755 "${srcdir}/${_Csalt_mtr}" "${pkgdir}/etc/conf.d/salt-master" - install -Dm755 "${srcdir}/${_Isalt_mtr}" "${pkgdir}/etc/init.d/salt-master" + pkgdesc="OpenRC salt init scripts" + depends=('openrc-core' 'salt') + backup=('etc/conf.d/salt-master' + 'etc/conf.d/salt-minion' + 'etc/conf.d/salt-syncdic' + 'etc/conf.d/salt-api') + install=salt.install - install -Dm755 "${srcdir}/${_Csalt_min}" "${pkgdir}/etc/conf.d/salt-minion" - install -Dm755 "${srcdir}/${_Isalt_min}" "${pkgdir}/etc/init.d/salt-minion" + _inst_confd 'salt-master' + _inst_initd 'salt-master' - install -Dm755 "${srcdir}/${_Csalt_sync}" "${pkgdir}/etc/conf.d/salt-syncdic" - install -Dm755 "${srcdir}/${_Isalt_sync}" "${pkgdir}/etc/init.d/salt-syncdic" + _inst_confd 'salt-minion' + _inst_initd 'salt-minion' - for f in ${pkgdir}/etc/init.d/*;do - sed -e "${_shebang}" -e "${_runpath}" -i $f - done + _inst_confd 'salt-syncdic' + _inst_initd 'salt-syncdic' + _inst_confd 'salt-api' + _inst_initd 'salt-api' } package_mpd-openrc(){ - pkgdesc="OpenRC fuse init script" - depends=('openrc-core' 'mpd') - install=mpd.install + pkgdesc="OpenRC fuse init script" + depends=('openrc-core' 'mpd') + install=mpd.install - install -Dm755 "${srcdir}/${_Impd}" "${pkgdir}/etc/init.d/mpd" - sed -e "${_shebang}" -i "${pkgdir}/etc/init.d/mpd" + _inst_initd 'mpd' } package_hdparm-openrc() { - pkgdesc="OpenRC hdparm init script" - depends=('openrc-core' 'hdparm') - backup=('etc/conf.d/hdparm') - install=hdparm.install + pkgdesc="OpenRC hdparm init script" + depends=('openrc-core' 'hdparm') + backup=('etc/conf.d/hdparm') + install=hdparm.install - install -Dm755 "${srcdir}/${_Chdparm}" "${pkgdir}/etc/conf.d/hdparm" - install -Dm755 "${srcdir}/${_Ihdparm}" "${pkgdir}/etc/init.d/hdparm" - - sed -e "${_shebang}" -i "${pkgdir}/etc/init.d/hdparm" + _inst_confd 'hdparm' + _inst_initd 'hdparm' } package_thermald-openrc() { - pkgdesc="OpenRC thermald init script" - depends=('dbus-openrc' 'thermald') - install=thermald.install + pkgdesc="OpenRC thermald init script" + depends=('dbus-openrc' 'thermald') + install=thermald.install - install -Dm755 "${srcdir}/${_Itherm}" "${pkgdir}/etc/init.d/thermald" + _inst_initd 'thermald' } package_xe-guest-utilities-openrc() { - pkgdesc="OpenRC xe-guest-utilities init script" - depends=('openrc-core' 'xe-guest-utilities') - install=xe-guest-utilities.install - - install -Dm755 "${srcdir}/${_Ixe}" "${pkgdir}/etc/init.d/xe-daemon" - - sed -e ${_shebang} -e ${_runpath} -e ${_binpath} \ - -i ${pkgdir}/etc/init.d/xe-daemon + pkgdesc="OpenRC xe-guest-utilities init script" + depends=('openrc-core' 'xe-guest-utilities') + install=xe-guest-utilities.install + + _inst_initd 'xe-daemon' } package_zfs-openrc() { - pkgdesc="OpenRC zfs init script" - depends=('openrc-core' 'zfs-utils') - install=zfs.install + pkgdesc="OpenRC zfs init script" + depends=('openrc-core' 'zfs-utils') + install=zfs.install - install -Dm755 "${srcdir}/${_Izfs}" "${pkgdir}/etc/init.d/zfs" + _inst_initd 'zfs' } package_clamav-openrc() { - pkgdesc="OpenRC clamav init script" - depends=('openrc-core' 'clamav') - backup=('etc/conf.d/clamd') - install=clamav.install + pkgdesc="OpenRC clamav init script" + depends=('openrc-core' 'clamav') + backup=('etc/conf.d/clamd') + install=clamav.install - install -Dm755 "${srcdir}/${_CClam}" "${pkgdir}/etc/conf.d/clamd" - install -Dm755 "${srcdir}/${_IClam}" "${pkgdir}/etc/init.d/clamd" - - sed -e "${_shebang}" -e "${_binpath}" -i "${pkgdir}/etc/init.d/clamd" + _inst_confd 'clamd' + _inst_initd 'clamd' } package_networkmanager-openrc() { - pkgdesc="OpenRC networkmanager init script" - depends=('openrc-core' 'networkmanager-consolekit') - backup=('etc/conf.d/NetworkManager') - install=networkmanager.install + pkgdesc="OpenRC networkmanager init script" + depends=('openrc-core' 'networkmanager-consolekit') + backup=('etc/conf.d/NetworkManager') + install=networkmanager.install - install -Dm755 "${srcdir}/${_CNM}" "${pkgdir}/etc/conf.d/NetworkManager" - install -Dm755 "${srcdir}/${_INM}" "${pkgdir}/etc/init.d/NetworkManager" + _inst_confd 'NetworkManager' + _inst_initd 'NetworkManager' - install -Dm755 "${srcdir}/${_SNM}" "${pkgdir}/etc/NetworkManager/dispatcher.d/10-openrc-status" + install -Dm755 "${srcdir}/10-openrc-status" "${pkgdir}/etc/NetworkManager/dispatcher.d/10-openrc-status" - sed -e 's|@EPREFIX@/sbin|/usr/bin|' \ - -e 's|@EPREFIX@/usr/sbin|/usr/sbin|' \ - -e 's|#!/bin/sh|#!/usr/bin/sh|' \ - -i "${pkgdir}/etc/NetworkManager/dispatcher.d/10-openrc-status" + sed -e 's|@EPREFIX@/sbin|/usr/bin|' \ + -e 's|@EPREFIX@/usr/sbin|/usr/bin|' \ + -i "${pkgdir}/etc/NetworkManager/dispatcher.d/10-openrc-status" +} - sed -e "${_shebang}" -e "${_binpath}" -e "${_runpath}" -i "${pkgdir}/etc/init.d/NetworkManager" +package_at-openrc() { + pkgdesc="OpenRC at init script" + depends=('at') + backup=('etc/conf.d/atd') + install=at.install + + _inst_confd 'atd' + _inst_initd 'atd' + + sed -e "${_runpath}" \ + -i "${pkgdir}/etc/conf.d/atd" } -sha256sums=('ceada7a1c9e8b62cff506bc94a1813706c7de1ed23daf9c3450ad549df4fafb7' - 'f0b15a0334f6177a6cf23cb9b169302c75745dc30857f24a7d11892feb6b1ee4' - '204c66d2b7d4d20115acc7499708cf538538fe1c100281ad55f909508041fb19' - '197e44ba1f438a18f5f7d9f5858feb19c1ece4286d82a5e63caf9be5b964aa76' - '4dd4e7fa07bf2ab2d4f5753156f5df0ad2277523f6755b0eab3d2db3480989e2' - '22a22c914d2a4f0fb5fc8495f4b7efcd1819efde548c9033ca612c181cd29eda' - 'ec9f05b386a06a4b2d5398cc0c33f34eba3f5e74ad46ae203d682f8ebc593f99' - '906c31e0817517dc6c141a7a10565140ea272d3c958a065f520a0ecb6f81912f' - 'b29325498ee3b1f3d63672efcd1e93f0745eecdb9f4bb05fed82a2f085399484' - 'aa027dac0d145bc342728864cd432a0cf3c25dd6cb66880e7b70df1a9d5a66cf' - 'd36ff77fa193a065d25e373723e03f1a9471205151b82c73a6574cce4f095962' - 'c404ad3b624004cab25bd3a89593cdeb0abbc25771d6e52caf2f37cb4f7b2b79' - '1b1f2970cc81a6053fcb6c0ead786436b6423c67170087dde283e54f32ae16e5' - '5e5a31fbd93294a6e210499a880fcab371b23706824c9d60d827b0187d7bade4' - 'd47f22a33a83c14a4a0c333d6a445c40e550c491899fb0c6d323e23fe1eac7b7' - '9ab6f022d2b2948660decf5e383984e6ddb9e9e5e6e2761c3031378ddd87e947' - '25f2a1665c88dc5227698bdedc2098d6e37d12d8b966f00e2a180c95a33cc8b4' - '4bd482a54decc5a51aee60e19ae31b0182d5857b112754247f04c0829b159b07' - '36d489296c31736f8015b0ce27052b3f1555b7fe6335120c0477b044b8e4fb8d' - '9b018f9f7a0975988387858823fe59a5cd8af6413d8c3170db0e24aac6021ec3' - '40803821f498267f6567436eedc18201b5ae4b5390d6872fb15a94200c2ac06f' - 'c7dc517cdb5ee10e2a07ccea15ec47ba0b7aff8ac1469204c8d7faf71bcae2c5' - '97282007801cb9c0e3b431e2930dec3bb8ce8869f63f7e02d903846e96734684' - '22a4b5e4c934ea8ba66764441b0bb60d31d23c147c8b64a4a035947327bfc3ec' - '2e4a42dd64b7c6dacfcfefdab8dc1e7c45d7a0966ef8b928583d18393362c719' - '8fbd405ad951e7ad046e4408abb98f4066077113187198767d52f28d7228bae4' - '4705b68372090ee7db69da1ad35131551ed1ba99032db2486ff6c31d2170ce6b' - '767a160c1b3392f0a12d3908a937548a2f604a9a121e744c309ee6f478420b02' - 'f0a561f124cac3791fba6ee7ef5bc3ea46bd7535edf9e864689b0d9cfa65d332' - '3b53f4aabf937766b5aa806561e9b97ab2be49ac25d76ae97f4fca4ab7a42e33' - '365e9cbde2564a0430d8d1c0f8bc367db2bb32937ebf61649196f0e6a1ab5363' - '9f3f47a7af4d349a7c525455616139b5019d3b7d0290398ba8c50ab91a62d089' - 'c5eed64899811966220d04e4b9849ba77d2d111f34dc16f03960cf1ff5ec02da' - '286148f5391d42c04a62a13cc125fa2130b5821e50da913c5a20d3a913e5f2d1' - '06415d7f958210a4dd1490db5796b0d3c08392a81547f290776d9164dde786ae' - '286148f5391d42c04a62a13cc125fa2130b5821e50da913c5a20d3a913e5f2d1' - '2de9f69462bc3b575a69a150b6bba21a6e341477010d284cb77614e810a7bf8c' - '3591473024005cdb15f13809c7675fbb964dc1b13e7658a01e12e34c7e751897' - '37c95ff723fa578e9039613d09dbf790d99113a318c065422986c744519214e9' - '434beee81ba04c96fcd03e6b37a4578c2c25af2c1007368469c48dd37523d56e' - '105afc0382fc5adc03ed644dba4e78817015a55432349f259a286ac3c1b06628' - '2eaef8071b34c1a3d55271d283b31e25e081791e48a6a55eb394912e4954ba48' - '24cbcf298b869e4451b08aeba0e3e4948aa7faaac649f18e8f600ae5fb86a8fb' - '7321272190ea9846ab7e19b034649c1cd711d4f94a6bdcaaaec2f683bb822e7d' - '4bbb4e610d2d6bb22d83aa2980dca052a23b90fa6985c8245601b716dec986f4' - '28ebd47810b0568fc7692218867d6804a1df70290681462f5555e230ca817732' - 'c00bb921afe65e31a9ac4bbcfc97e4c9afa7ad77604c2dcb7eedc152fec5bbd8' - '4594573f01fe5e04b6dde4525796acf909158591bdcefd662ec23fe0d1c3e1bd' - '5f368362ef5c6deed538f20dc582d6da3c86871bd42297fa78536c0312021843' - 'f8ed424818b866a0bf882c569f4484e8b1485ce7ac8c472f060fd877f2dcfe65') +package_libvirt-openrc() { + pkgdesc="OpenRC libvirt init script" + depends=('libvirt') + backup=('etc/conf.d/libvirtd') + install=libvirt.install + + _inst_confd 'libvirtd' + _inst_initd 'libvirtd' + _inst_initd 'virtlockd' +} diff --git a/pcr/openrc-misc/at.install b/pcr/openrc-misc/at.install new file mode 100644 index 000000000..033059dd2 --- /dev/null +++ b/pcr/openrc-misc/at.install @@ -0,0 +1,16 @@ +_svc="atd" +_rlvl="default" + +post_install() { + _cmd="rc-update add ${_svc} ${_rlvl}" + echo " ==> run '${_cmd}'" +} + +post_upgrade() { + post_install "$1" +} + +post_remove() { + _cmd="rc-update del ${_svc} ${_rlvl}" + echo " ==> run '${_cmd}'" +} diff --git a/pcr/openrc-misc/bitlbee.confd b/pcr/openrc-misc/bitlbee.confd deleted file mode 100644 index c4003ce43..000000000 --- a/pcr/openrc-misc/bitlbee.confd +++ /dev/null @@ -1,2 +0,0 @@ -#Bitlbee options (see /usr/sbin/bitlbee -h) -BITLBEE_OPTS="-F" diff --git a/pcr/openrc-misc/bitlbee.initd b/pcr/openrc-misc/bitlbee.initd deleted file mode 100644 index 235b3744e..000000000 --- a/pcr/openrc-misc/bitlbee.initd +++ /dev/null @@ -1,28 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or -# later -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/files/bitlbee.initd,v 1.4 2013/01/08 14:25:21 cedk Exp $ - -DAEMON=/usr/sbin/bitlbee -PIDFILE=/var/run/bitlbee/bitlbee.pid - -depend() { - need logger net -} - -start () { - ebegin "Starting bitlbee" - checkpath -d -m 0755 -o bitlbee:bitlbee `dirname ${PIDFILE}` - start-stop-daemon --start --quiet \ - -u bitlbee:bitlbee --exec ${DAEMON} -- -P ${PIDFILE} \ - ${BITLBEE_OPTS} - eend $? -} - -stop() { - ebegin "Stopping bitlbee" - start-stop-daemon --stop --quiet --pidfile ${PIDFILE} - eend $? -} - diff --git a/pcr/openrc-misc/clamd.conf-r1 b/pcr/openrc-misc/clamd.conf-r1 deleted file mode 100644 index de95554ee..000000000 --- a/pcr/openrc-misc/clamd.conf-r1 +++ /dev/null @@ -1,7 +0,0 @@ -# Config file for /etc/init.d/clamd - -START_CLAMD=yes -START_FRESHCLAM=yes -CLAMD_NICELEVEL=3 -FRESHCLAM_NICELEVEL=19 -IONICE_LEVEL=2 diff --git a/pcr/openrc-misc/clamd.initd-r6 b/pcr/openrc-misc/clamd.initd-r6 deleted file mode 100644 index 276e07aa8..000000000 --- a/pcr/openrc-misc/clamd.initd-r6 +++ /dev/null @@ -1,129 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.initd-r6,v 1.1 2013/09/27 16:04:14 eras Exp $ - -daemon_clamd="/usr/sbin/clamd" -daemon_freshclam="/usr/bin/freshclam" -daemon_milter="/usr/sbin/clamav-milter" - -extra_commands="logfix" - -depend() { - use net - provide antivirus -} - -get_config() { - clamconf | sed 's/["=]//g' | \ - awk "{ - if(\$0==\"Config file: $1.conf\") S=1 - if(S==1&&\$0==\"\") { - print \"$3\" - exit - } - if(S==1&&\$1~\"^$2\$\") { - print \$2!=\"disabled\"?\$2:\"$3\" - exit - } - }" -} - -start() { - # populate variables and fix log file permissions - logfix - - if [ "${START_CLAMD}" = "yes" ]; then - checkpath --quiet --mode 755 \ - --owner "${clamd_user}":"${clamd_user}" \ - --directory `dirname ${clamd_socket}` - if [ -S "${clamd_socket}" ]; then - rm -f ${clamd_socket} - fi - ebegin "Starting clamd" - start-stop-daemon --start --quiet \ - --nicelevel ${CLAMD_NICELEVEL:-0} \ - --ionice ${IONICE_LEVEL:-0} \ - --exec ${daemon_clamd} - eend $? "Failed to start clamd" - fi - - if [ "${START_FRESHCLAM}" = "yes" ]; then - checkpath --quiet --mode 755 \ - --owner "${clamd_user}":"${clamd_user}" \ - --directory `dirname ${clamd_socket}` - ebegin "Starting freshclam" - start-stop-daemon --start --quiet \ - --nicelevel ${FRESHCLAM_NICELEVEL:-0} \ - --ionice ${IONICE_LEVEL:-0} \ - --exec ${daemon_freshclam} -- -d - retcode=$? - if [ ${retcode} = 1 ]; then - eend 0 - einfo "Virus databases are already up to date." - else - eend ${retcode} "Failed to start freshclam" - fi - fi - - if [ "${START_MILTER}" = "yes" ]; then - if [ -z "${MILTER_CONF_FILE}" ]; then - MILTER_CONF_FILE="/etc/clamav-milter.conf" - fi - - ebegin "Starting clamav-milter" - start-stop-daemon --start --quiet \ - --nicelevel ${MILTER_NICELEVEL:-0} \ - --ionice ${IONICE_LEVEL:-0} \ - --exec ${daemon_milter} -- -c ${MILTER_CONF_FILE} - eend $? "Failed to start clamav-milter" - fi -} - -stop() { - if [ "${START_CLAMD}" = "yes" ]; then - ebegin "Stopping clamd" - start-stop-daemon --stop --quiet --name clamd - eend $? "Failed to stop clamd" - fi - if [ "${START_FRESHCLAM}" = "yes" ]; then - ebegin "Stopping freshclam" - start-stop-daemon --stop --quiet --name freshclam - eend $? "Failed to stop freshclam" - fi - if [ "${START_MILTER}" = "yes" ]; then - ebegin "Stopping clamav-milter" - start-stop-daemon --stop --quiet --name clamav-milter - eend $? "Failed to stop clamav-milter" - fi -} - -logfix() { - clamd_socket=$(get_config clamd LocalSocket /run/clamav/clamd.sock) - clamd_user=$(get_config clamd User clamav) - freshclam_user=$(get_config freshclam DatabaseOwner clamav) - - if [ "${START_CLAMD}" = "yes" ]; then - # fix clamd log permissions - # (might be clobbered by logrotate or something) - local logfile=$(get_config clamd LogFile) - if [ -n "${logfile}" ]; then - checkpath --quiet \ - --owner "${clamd_user}":"${clamd_user}" \ - --mode 640 \ - --file ${logfile} - fi - fi - - if [ "${START_FRESHCLAM}" = "yes" ]; then - # fix freshclam log permissions - # (might be clobbered by logrotate or something) - local logfile=$(get_config freshclam UpdateLogFile) - if [ -n "${logfile}" ]; then - checkpath --quiet \ - --owner "${freshclam_user}":"${freshclam_user}" \ - --mode 640 \ - --file ${logfile} - fi - fi -} diff --git a/pcr/openrc-misc/conf.d-r2 b/pcr/openrc-misc/conf.d-r2 deleted file mode 100644 index 1e67ed04e..000000000 --- a/pcr/openrc-misc/conf.d-r2 +++ /dev/null @@ -1,36 +0,0 @@ -# /etc/conf.d/cpupower: config file for /etc/init.d/cpupower - -# Options when starting cpufreq (given to the `cpupower` program) -# Possible options are: -# -g --governor <GOV> (ie: ondemand, performance, or powersave) -# -d --min <FREQ> (ie: 1000MHz) -# -u --max <FREQ> (ie: 2000MHz) -# -f --freq <FREQ> (requires userspace governor, this *can not* be combined with -# with any other parameters). -# Frequencies can be passed in Hz, kHz (default), MHz, GHz, or THz by postfixing the -# value with the wanted unit name, without any space. -# (frequency in kHz =^ Hz * 0.001 =^ MHz * 1000 =^ GHz * 1000000). - -START_OPTS="--governor ondemand" - -# Options when stopping cpufreq (given to the `cpupower` program) -# This option can be used to change governer on stop. Leaving it empty will ensure -# the governer remains on the one provided above. -STOP_OPTS="" - -# Extra settings to write to sysfs cpufreq values. -# -# up_threshold: threshold for stepping up frequency, where the value represents -# the percentage of cpu load. -# -# down_threshold: threshold for stepping down frequency, where the value -# represents the percentage of cpu load. -# -# sampling_down_factor: determines how frequently the governor polls the cpu, a -# value greater than 1 improves performance by reducing the polling when the -# load is high. This tunable has no effect on behavior at lower CPU frequencies. -# -# ignore_nice_load: when set to '1' the processes that are run with a 'nice' -# value will not count in the usage calculation. - -#SYSFS_EXTRA="ondemand/ignore_nice_load=1 ondemand/up_threshold=75 ondemand/sampling_down_factor=10" diff --git a/pcr/openrc-misc/conf.d.NetworkManager b/pcr/openrc-misc/conf.d.NetworkManager deleted file mode 100644 index 4a9922965..000000000 --- a/pcr/openrc-misc/conf.d.NetworkManager +++ /dev/null @@ -1,4 +0,0 @@ -# If NetworkManager does not establish a connection within $INACTIVE_TIMEOUT -# seconds after starting, the service will be marked as inactive, and it will -# continue to wait for a connection in background mode. -INACTIVE_TIMEOUT=1 diff --git a/pcr/openrc-misc/connman.confd b/pcr/openrc-misc/connman.confd deleted file mode 100644 index 6d0c399e5..000000000 --- a/pcr/openrc-misc/connman.confd +++ /dev/null @@ -1,15 +0,0 @@ -# conf.d file for connman -# -# Please check connmand --help for more information. -# Useful options are: -# -c, --compat: enable NetworkManager compatibility mode. -# -W, --wifi=NAME: select wpa_supplicant wifi driver to use. -# This is useful if your wpa_supplicant is < 0.7 -# since connmand by default gives wpa_supplicant a -# comma separated list of values and < 0.7 does not -# understand or accept it. -# -i, --device=DEV: force use of given interface name. -# -I, --nodevice=DEV: force ignore of given interface name. -# -p, --plugin=NAME: specify plugins to load. -# -P, --noplugin=NAME: specify plugins not to load. -CONNMAN_OPTS="" diff --git a/pcr/openrc-misc/connman.initd2 b/pcr/openrc-misc/connman.initd2 deleted file mode 100644 index 6525df40f..000000000 --- a/pcr/openrc-misc/connman.initd2 +++ /dev/null @@ -1,23 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Purpose License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/files/connman.initd2,v 1.1 2013/03/14 12:51:31 chainsaw Exp $ - -depend() { - need dbus - provide net -} - -start() { - ebegin "Starting Connection Manager" - start-stop-daemon --start --quiet --exec /usr/sbin/connmand -- ${CONNMAN_OPTS} - eend $? -} - -stop() { - ebegin "Stopping Connection Manager" - start-stop-daemon --stop --quiet --exec /usr/sbin/connmand - eend $? -} - -# vim: set ft=gentoo-init-d ts=3 sw=3 et: diff --git a/pcr/openrc-misc/cupsd.init.d-r1 b/pcr/openrc-misc/cupsd.init.d-r1 deleted file mode 100644 index 2f2e9e2df..000000000 --- a/pcr/openrc-misc/cupsd.init.d-r1 +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/runscript - -depend() { - use net - @neededservices@ - before nfs - after logger -} - -start() { - ebegin "Starting cupsd" - - checkpath -q -d -m 0775 -o root:lp /var/cache/cups - checkpath -q -d -m 0775 -o root:lp /var/cache/cups/rss - checkpath -q -d -m 0755 -o root:lp /run/cups - checkpath -q -d -m 0511 -o lp:lpadmin /run/cups/certs - - start-stop-daemon --start --quiet --exec /usr/sbin/cupsd - eend $? -} - -stop() { - ebegin "Stopping cupsd" - start-stop-daemon --stop --quiet --exec /usr/sbin/cupsd - eend $? -} diff --git a/pcr/openrc-misc/fancontrol-init.d-2 b/pcr/openrc-misc/fancontrol-init.d-2 deleted file mode 100644 index 51857a1f7..000000000 --- a/pcr/openrc-misc/fancontrol-init.d-2 +++ /dev/null @@ -1,23 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/fancontrol-init.d-2,v 1.1 2012/12/28 00:00:03 flameeyes Exp $ - -CONFIG=/etc/fancontrol - -depend() { - need localmount - use lm_sensors -} - -command=/usr/sbin/fancontrol -command_arguments="${CONFIG}" -start_stop_daemon_args="--background" -pidfile=/var/run/fancontrol.pid - -start_pre() { - if [ ! -f ${CONFIG} ]; then - eerror "Configuration file ${CONFIG} not found" - return 1 - fi -} diff --git a/pcr/openrc-misc/fcron.init.3 b/pcr/openrc-misc/fcron.init.3 deleted file mode 100644 index 09c05c6d0..000000000 --- a/pcr/openrc-misc/fcron.init.3 +++ /dev/null @@ -1,58 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/files/fcron.init.3,v 1.1 2012/08/29 17:38:40 flameeyes Exp $ - -FCRON_INSTANCE=${SVCNAME##*.} - -configfile() { - if [ -n "${FCRON_INSTANCE}" -a "${SVCNAME}" != "fcron" ]; then - echo /etc/fcron/fcron.${FCRON_INSTANCE}.conf - else - echo /etc/fcron/fcron.conf - fi -} - -getconfig() { - # if there is no configuration file return the default value - if ! [ -f $(configfile) ]; then - echo $2 - return 0 - fi - - sed -n -e 's:^$1[ \t]*=[ \t]*::p' $(configfile) -} - -depend() { - config $(configfile) - - use logger - need clock hostname - # provide the cron service if we are the main instance - [ "${SVCNAME}" = "fcron" ] && provide cron -} - -command="/usr/libexec/fcron" -command_args="-c $(configfile)" -pidfile=$(getconfig pidfile /var/run/fcron.pid) -fcrontabs=$(getconfig fcrontabs /var/spool/fcron) - -extra_started_commands="reload" - -start_pre() { - if [ ! -e $(configfile) ]; then - eerror "You will need to create $(configfile) first" - eerror "There is a sample in /etc/fcron" - return 1 - fi - - if [ ! -d ${fcrontabs} ]; then - ebegin "Creating missing spooldir ${fcrontabs}" - ${command} --newspooldir ${fcrontabs} - eend $? - fi -} - -reload() { - kill -HUP `cat ${pidfile}` -} diff --git a/pcr/openrc-misc/fuse.init b/pcr/openrc-misc/fuse.init deleted file mode 100644 index 30b512e8d..000000000 --- a/pcr/openrc-misc/fuse.init +++ /dev/null @@ -1,35 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -MOUNTPOINT=/sys/fs/fuse/connections - -depend() { - need localmount -} - -start() { - - ebegin "Starting fuse" - if ! grep -qw fuse /proc/filesystems; then - modprobe fuse >/dev/null 2>&1 || eerror $? "Error loading fuse module" - fi - if grep -qw fusectl /proc/filesystems && \ - ! grep -qw $MOUNTPOINT /proc/mounts; then - mount -t fusectl none $MOUNTPOINT >/dev/null 2>&1 || \ - eerror $? "Error mounting control filesystem" - fi - eend ${?} - -} - -stop() { - - ebegin "Stopping fuse" - if grep -qw $MOUNTPOINT /proc/mounts; then - umount $MOUNTPOINT >/dev/null 2>&1 || \ - eerror $? "Error unmounting control filesystem" - fi - eend ${?} - -} diff --git a/pcr/openrc-misc/haveged-conf.d b/pcr/openrc-misc/haveged-conf.d deleted file mode 100644 index 3d9863c52..000000000 --- a/pcr/openrc-misc/haveged-conf.d +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/files/haveged-conf.d,v 1.1 2011/01/05 03:30:30 robbat2 Exp $ - -WATERMARK=1024 - -# -r0 is added always -HAVEGED_OPTS="-w ${WATERMARK} -v 1" - -# vim:ft=gentoo-conf-d: diff --git a/pcr/openrc-misc/haveged-init.d.3 b/pcr/openrc-misc/haveged-init.d.3 deleted file mode 100644 index d43447d11..000000000 --- a/pcr/openrc-misc/haveged-init.d.3 +++ /dev/null @@ -1,17 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/files/haveged-init.d.3,v 1.1 2013/01/25 16:58:06 flameeyes Exp $ - -pidfile=/run/${SVCNAME}.pid - -command="/usr/sbin/${SVCNAME}" -command_args="-r 0 ${HAVEGED_OPTS} -p ${pidfile}" - -depend() { - need localmount - use logger - provide entropy -} - -# vim:ft=gentoo-init-d: diff --git a/pcr/openrc-misc/hdparm-conf.d.3 b/pcr/openrc-misc/hdparm-conf.d.3 deleted file mode 100644 index a1ae626b3..000000000 --- a/pcr/openrc-misc/hdparm-conf.d.3 +++ /dev/null @@ -1,26 +0,0 @@ -# /etc/conf.d/hdparm: config file for /etc/init.d/hdparm - -# -# Note that options such as -y which force *immediate* power saving options -# should generally not be placed here. The hdparm init.d script may run at -# anytime with respect to other init.d scripts that do system wide drive -# scans (like the hald script), so they will merely get spun right back up. -# If you wish to use these options, please use the local.start init.d script -# instead so that you're guaranteed that it will run last. -# - -# You can either set hdparm arguments for each drive using hdX_args, -# discX_args, cdromX_args and genericX_args, e.g. -# -# hda_args="-d1 -X66" -# disc1_args="-d1" -# cdrom0_args="-d1" - -# or you can set options for all PATA drives -pata_all_args="-d1" - -# or you can set options for all SATA drives -sata_all_args="" - -# or, you can set hdparm options for all drives -all_args="" diff --git a/pcr/openrc-misc/hdparm-init-8 b/pcr/openrc-misc/hdparm-init-8 deleted file mode 100644 index 9a4200c82..000000000 --- a/pcr/openrc-misc/hdparm-init-8 +++ /dev/null @@ -1,61 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/files/hdparm-init-8,v 1.3 2012/04/29 00:30:18 vapier Exp $ - -depend() { - before bootmisc -} - -do_hdparm() { - local e= - eval e=\$${extra_args} - [ -z "${args}${all_args}${e}" ] && return 0 - - if [ -n "${args:=${all_args} ${e}}" ] ; then - local orgdevice=$(readlink -f "${device}") - if [ -b "${orgdevice}" ] ; then - ebegin "Running hdparm on ${device}" - hdparm ${args} "${device}" > /dev/null - eend $? - fi - fi -} - -scan_nondevfs() { - # non-devfs compatible system - local device - - for device in /dev/hd* /dev/sd* /dev/cdrom* ; do - [ -e "${device}" ] || continue - case "${device}" in - *[0-9]) continue ;; - /dev/hd*) extra_args="pata_all_args" ;; - /dev/sd*) extra_args="sata_all_args" ;; - *) extra_args="_no_xtra_args" ;; - esac - - # check that the block device really exists by - # opening it for reading - local errmsg= status= nomed=1 - errmsg=$(export LC_ALL=C ; : 2>&1 <"${device}") - status=$? - case ${errmsg} in - *": No medium found") nomed=0;; - esac - if [ -b "${device}" ] && [ "${status}" = "0" -o "${nomed}" = "0" ] ; then - local conf_var="${device##*/}_args" - eval args=\$${conf_var} - do_hdparm - fi - done -} - -start() { - if get_bootparam "nohdparm" ; then - ewarn "Skipping hdparm init as requested in kernel cmdline" - return 0 - fi - - scan_nondevfs -} diff --git a/pcr/openrc-misc/init.d-r4 b/pcr/openrc-misc/init.d-r4 deleted file mode 100644 index 789945b00..000000000 --- a/pcr/openrc-misc/init.d-r4 +++ /dev/null @@ -1,42 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/cpupower/files/init.d-r4,v 1.1 2013/12/25 11:46:32 ssuominen Exp $ - -CPUFREQ_SYSFS=/sys/devices/system/cpu/cpufreq - -change() { - local c ret=0 opts="$1" - if [ -n "$opts" ] ; then - ebegin "Running cpupower -c all frequency-set ${opts}" - cpupower -c all frequency-set ${opts} >/dev/null 2>&1 - : $(( ret += $? )) - eend ${ret} - - if [ -d ${CPUFREQ_SYSFS} ] && [ -n "${SYSFS_EXTRA}" ] ; then - c=1 - einfo "Setting extra options: ${SYSFS_EXTRA}" - if cd ${CPUFREQ_SYSFS} ; then - local o v - for o in ${SYSFS_EXTRA} ; do - v=${o#*=} - o=${o%%=*} - echo ${v} > ${o} || break - done - c=0 - fi - eend ${c} - : $(( ret += c )) - fi - fi - - return ${ret} -} - -start() { - change "${START_OPTS}" -} - -stop() { - change "${STOP_OPTS}" -} diff --git a/pcr/openrc-misc/init.d.NetworkManager b/pcr/openrc-misc/init.d.NetworkManager deleted file mode 100644 index 8465449d8..000000000 --- a/pcr/openrc-misc/init.d.NetworkManager +++ /dev/null @@ -1,57 +0,0 @@ -#!/sbin/runscript -# Copyright (c) 2008 Saleem Abdulrasool <compnerd@compnerd.org> -# Distributed under the terms of the GNU General Purpose License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/files/init.d.NetworkManager,v 1.1 2013/01/28 07:05:05 tetromino Exp $ - -description="NetworkManager daemon. The service is marked as started only \ -when a network connection is established." - -depend() { - need dbus - provide net -} - -start() { - # If we are re-called by a dispatcher event, we want to mark the service - # as started without starting the daemon again - yesno "${IN_BACKGROUND}" && return 0 - - [ -z "${INACTIVE_TIMEOUT}" ] && INACTIVE_TIMEOUT="1" - - ebegin "Starting NetworkManager" - start-stop-daemon --start --quiet --pidfile /run/NetworkManager/NetworkManager.pid \ - --exec /usr/sbin/NetworkManager -- --pid-file /run/NetworkManager/NetworkManager.pid - local _retval=$? - eend "${_retval}" - if [ "x${_retval}" = 'x0' ] && ! nm-online -t "${INACTIVE_TIMEOUT}"; then - einfo "Marking NetworkManager as inactive. It will automatically be marked" - einfo "as started after a network connection has been established." - mark_service_inactive - fi - return "${_retval}" -} - -stop() { - # If we are re-called by a dispatcher event, we want to mark the service - # as inactive without stopping the daemon - if yesno "${IN_BACKGROUND}"; then - mark_service_inactive "${SVCNAME}" - return 0 - fi - - ebegin "Stopping NetworkManager" - local pidfile=/run/NetworkManager/NetworkManager.pid - if [ ! -e "${pidfile}" ] && [ -e /var/run/NetworkManager.pid ]; then - # Try stopping the pid file used by <0.9.7 - pidfile=/var/run/NetworkManager.pid - start-stop-daemon --stop --quiet --pidfile "${pidfile}" - ret=$? - [ ${ret} = 0 ] && [ -e "${pidfile}" ] && rm "${pidfile}" - eend ${ret} - else - start-stop-daemon --stop --quiet --pidfile "${pidfile}" - eend $? - fi -} - -# vim: set ft=gentoo-init-d ts=4 : diff --git a/pcr/openrc-misc/irexec-confd b/pcr/openrc-misc/irexec-confd deleted file mode 100644 index 48eb8dd4c..000000000 --- a/pcr/openrc-misc/irexec-confd +++ /dev/null @@ -1,9 +0,0 @@ -# Options to pass to the irexec process -IREXEC_OPTS="/etc/lircrc" - -# User to execute irexec as. -# Warning: Running irexec as root can open security holes -#IREXEC_USER="root" - -# Use this to disable the warning printed when starting irexec as root -# IREXEC_DISABLE_ROOT_WARNING=yes diff --git a/pcr/openrc-misc/irexec-initd-0.8.6-r2 b/pcr/openrc-misc/irexec-initd-0.8.6-r2 deleted file mode 100644 index 567322a43..000000000 --- a/pcr/openrc-misc/irexec-initd-0.8.6-r2 +++ /dev/null @@ -1,28 +0,0 @@ -#!/sbin/runscript -# Copyright 2003 Martin Hierling <mad@cc.fh-lippe.de> -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/files/irexec-initd-0.8.6-r2,v 1.1 2009/11/15 10:04:21 zzam Exp $ - -: ${IREXEC_USER:=root} - -depend() { - need lirc -} - -start() { - if [ "x${IREXEC_USER}" = "xroot" -a "x${IREXEC_DISABLE_ROOT_WARNING}" != "xyes" ]; then - ewarn "Warning: Running irexec as root can open security holes" - fi - - ebegin "Starting irexec" - start-stop-daemon --start --chuid ${IREXEC_USER} --user ${IREXEC_USER} --chdir / \ - --exec /usr/bin/irexec -- --daemon ${IREXEC_OPTS} - eend $? "Failed to start irexec." -} - -stop() { - ebegin "Stopping irexec" - start-stop-daemon --stop --exec /usr/bin/irexec --user ${IREXEC_USER} - eend $? "Failed to stop irexec." -} - diff --git a/pcr/openrc-misc/libvirt.install b/pcr/openrc-misc/libvirt.install new file mode 100644 index 000000000..2b58e0e07 --- /dev/null +++ b/pcr/openrc-misc/libvirt.install @@ -0,0 +1,16 @@ +_svc="libvirtd" +_rlvl="default" + +post_install() { + _cmd="rc-update add ${_svc} ${_rlvl}" + echo " ==> run '${_cmd}'" +} + +post_upgrade() { + post_install "$1" +} + +post_remove() { + _cmd="rc-update del ${_svc} ${_rlvl}" + echo " ==> run '${_cmd}'" +} diff --git a/pcr/openrc-misc/lircd-0.8.6-r2 b/pcr/openrc-misc/lircd-0.8.6-r2 deleted file mode 100644 index d6f16ba07..000000000 --- a/pcr/openrc-misc/lircd-0.8.6-r2 +++ /dev/null @@ -1,52 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/files/lircd-0.8.6-r2,v 1.2 2014/01/23 21:37:11 vapier Exp $ - -PIDFILE=/var/run/lirc/${SVCNAME}.pid -: ${LIRCD_SYMLINKFILE:=/dev/lircd} -: ${LIRCD_SOCKET:=/var/run/lirc/lircd} - -depend() { - need localmount - use modules - provide lirc -} - -start() { - local retval - - ebegin "Starting lircd" - - for retval in ${LIRCD_SET_SYSCLASSRCS} ; do - if [ -e /sys/class/rc/${retval}/protocols ] && \ - grep -qs 'lirc' /sys/class/rc/${retval}/protocols ; then - einfo "Setting lirc protocol active for ${retval}" - echo lirc >/sys/class/rc/${retval}/protocols - fi - done - - checkpath -q -d -m 0755 -o root:root /var/run/lirc - rm -Rf ${LIRCD_SOCKET} && ln -s ${LIRCD_SOCKET} ${LIRCD_SYMLINKFILE} - if [ $? -ne 0 ]; then - eend $? "Unable to create symbolic link ${LIRCD_SYMLINKFILE}" - return 1 - fi - - start-stop-daemon --start --quiet --pidfile "${PIDFILE}" --exec /usr/sbin/lircd -- \ - -P "${PIDFILE}" ${LIRCD_OPTS} - retval=$? - - if [ ${retval} -ne 0 ]; then - rm -Rf ${LIRCD_SOCKET} - fi - - eend ${retval} -} - -stop() { - ebegin "Stopping lircd" - rm -f ${LIRCD_SYMLINKFILE} - start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" --exec /usr/sbin/lircd - eend $? -} diff --git a/pcr/openrc-misc/lircd.conf.4 b/pcr/openrc-misc/lircd.conf.4 deleted file mode 100644 index f59c5f214..000000000 --- a/pcr/openrc-misc/lircd.conf.4 +++ /dev/null @@ -1,22 +0,0 @@ -# Options to pass to the lircd process - -# for devices with lirc-kernel-module -#LIRCD_OPTS="-d /dev/lirc0" -#LIRCD_OPTS="-d /dev/lirc" - -# for devices using the input-layer -#LIRCD_OPTS="-H devinput -d /dev/input/by-path/pci-0000:00:0a.0--event-ir" -# This should work, Bug #235107 -#LIRCD_OPTS="-H devinput -d name=*DVB*" - -# set default protocol to 'lirc' for in-kernel IR decoding -# for the following entries in /sys/class/rc/ -# (space-separated list if there is more than one) -LIRCD_SET_SYSCLASSRCS="rc0" - -# If running mulitple instances of lircd, the following -# can be used to override the default socket path and -# socket symlink -#LIRCD_SOCKET="/var/run/lirc/lircd" -#LIRCD_SYMLINKFILE="/dev/lircd" - diff --git a/pcr/openrc-misc/lircmd b/pcr/openrc-misc/lircmd deleted file mode 100644 index d3837781f..000000000 --- a/pcr/openrc-misc/lircmd +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/files/lircmd,v 1.2 2004/09/28 00:22:15 swegener Exp $ - -depend() { - need lircd -} - -start() { - ebegin "Starting lircmd" - start-stop-daemon --start --quiet --exec /usr/sbin/lircmd - eend $? -} - -stop() { - ebegin "Stopping lircmd" - start-stop-daemon --stop --quiet --exec /usr/sbin/lircmd - eend $? -} diff --git a/pcr/openrc-misc/lm_sensors-3-init.d b/pcr/openrc-misc/lm_sensors-3-init.d deleted file mode 100644 index 18fb35370..000000000 --- a/pcr/openrc-misc/lm_sensors-3-init.d +++ /dev/null @@ -1,105 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-3-init.d,v 1.1 2008/03/17 07:59:28 dberkholz Exp $ - -checkconfig() { - if [ ! -f /etc/conf.d/lm_sensors ]; then - eerror "/etc/conf.d/lm_sensors does not exist, try running sensors-detect" - return 1 - fi - - if [ "${LOADMODULES}" = "yes" -a -f /proc/modules ]; then - if [ -z "${MODULE_0}" ]; then - eerror "MODULE_0 is not set in /etc/conf.d/lm_sensors, try running sensors-detect" - return 1 - fi - fi -} - -start() { - checkconfig || return 1 - - if [ "${LOADMODULES}" = "yes" -a -f /proc/modules ]; then - einfo "Loading lm_sensors modules..." - - mount | grep sysfs >/dev/null 2>&1 - if [ ${?} = 0 ]; then - if ! ( [ -e /sys/i2c ] || [ -e /sys/bus/i2c ] ); then - ebegin " Loading i2c-core" - modprobe i2c-core >/dev/null 2>&1 - if [ ${?} != 0 ]; then - eerror " Could not load i2c-core!" - eend 1 - fi - ( [ -e /sys/i2c ] || [ -e /sys/bus/i2c ] ) || return 1 - eend 0 - fi - elif ! [ -e /proc/sys/dev/sensors ]; then - ebegin " Loading i2c-proc" - modprobe i2c-proc >/dev/null 2>&1 - if [ ${?} != 0 ]; then - eerror " Could not load i2c-proc!" - eend 1 - fi - [ -e /proc/sys/dev/sensors ] || return 1 - eend 0 - fi - - i=0 - while true; do - module=`eval echo '$'MODULE_${i}` - module_args=`eval echo '$'MODULE_${i}_ARGS` - if [ -z "${module}" ]; then - break - fi - ebegin " Loading ${module}" - modprobe ${module} ${module_args} >/dev/null 2>&1 - eend $? - i=$(($i+1)) - done - fi - - if [ "${INITSENSORS}" = "yes" ]; then - if ! [ -f /etc/sensors3.conf ]; then - eerror "/etc/sensors3.conf does not exist!" - return 1 - fi - - ebegin "Initializing sensors" - /usr/bin/sensors -s >/dev/null 2>&1 - eend ${?} - fi -} - -stop() { - checkconfig || return 1 - - if [ "${LOADMODULES}" = "yes" -a -f /proc/modules ]; then - einfo "Unloading lm_sensors modules..." - - # find the highest possible MODULE_ number - i=0 - while true; do - module=`eval echo '$'MODULE_${i}` - if [ -z "${module}" ] ; then - break - fi - i=$(($i+1)) - done - - while [ ${i} -gt 0 ]; do - i=$(($i-1)) - module=`eval echo '$'MODULE_${i}` - ebegin " Unloading ${module}" - rmmod ${module} >/dev/null 2>&1 - eend $? - done - - if [ -e /proc/sys/dev/sensors ] ; then - ebegin " Unloading i2c-proc" - rmmod i2c-proc >/dev/null 2>&1 - eend $? - fi - fi -} diff --git a/pcr/openrc-misc/master-confd-1 b/pcr/openrc-misc/master-confd-1 deleted file mode 100644 index c70e8e766..000000000 --- a/pcr/openrc-misc/master-confd-1 +++ /dev/null @@ -1,5 +0,0 @@ -# /etc/conf.d/salt-master: config file for /etc/init.d/salt-master - -# see man pages for salt-minion or run `salt-master --help` -# for valid cmdline options -SALT_OPTS="--log-level=warning" diff --git a/pcr/openrc-misc/master-initd-3 b/pcr/openrc-misc/master-initd-3 deleted file mode 100644 index f9b102198..000000000 --- a/pcr/openrc-misc/master-initd-3 +++ /dev/null @@ -1,14 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/files/master-initd-3,v 1.1 2014/02/27 00:02:32 chutzpah Exp $ - -command="/usr/bin/salt-master" -command_args="${SALT_OPTS}" -command_background="1" -pidfile="/var/run/salt-master.pid" -name="SALT master daemon" - -depend() { - use net logger -} diff --git a/pcr/openrc-misc/metalog.confd b/pcr/openrc-misc/metalog.confd deleted file mode 100644 index caa5918d3..000000000 --- a/pcr/openrc-misc/metalog.confd +++ /dev/null @@ -1,19 +0,0 @@ -# /etc/conf.d/metalog -# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/files/metalog.confd,v 1.7 2006/02/08 01:04:02 vapier Exp $ - -# Some useful options: -# -a Log with buffering -# -s Log without buffering -# See `metalog --help` for more - -METALOG_OPTS="" - - -# Options used by /usr/sbin/consolelog.sh - -# Space delimited list of devices to write "console" messages to -#CONSOLE="/dev/console /dev/tty10" -CONSOLE="/dev/tty10" - -# Format of logging (make sure you use single quotes) -FORMAT='$1 [$2] $3' diff --git a/pcr/openrc-misc/metalog.initd b/pcr/openrc-misc/metalog.initd deleted file mode 100644 index 7f1d29282..000000000 --- a/pcr/openrc-misc/metalog.initd +++ /dev/null @@ -1,42 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/files/metalog.initd,v 1.5 2011/09/23 03:15:23 vapier Exp $ - -extra_started_commands="buffer unbuffer" - -PIDFILE=/var/run/metalog.pid - -depend() { - need localmount - use clock hostname - after bootmisc - provide logger -} - -ssd() { start-stop-daemon --exec /usr/sbin/metalog --pidfile "${PIDFILE}" "$@" ; } - -start() { - ebegin "Starting metalog" - ssd --start -- \ - --daemonize --pidfile="${PIDFILE}" ${METALOG_OPTS} - eend $? -} - -stop() { - ebegin "Stopping metalog" - ssd --stop - eend $? -} - -buffer() { - ebegin "Enabling log buffering" - ssd --signal USR2 - eend $? -} - -unbuffer() { - ebegin "Disabling log buffering" - ssd --signal USR1 - eend $? -} diff --git a/pcr/openrc-misc/minion-confd-1 b/pcr/openrc-misc/minion-confd-1 deleted file mode 100644 index d69d83fcd..000000000 --- a/pcr/openrc-misc/minion-confd-1 +++ /dev/null @@ -1,5 +0,0 @@ -# /etc/conf.d/salt-minion: config file for /etc/init.d/salt-minion - -# see man pages for salt-minion or run `salt-minion --help` -# for valid cmdline options -SALT_OPTS="--log-level=warning" diff --git a/pcr/openrc-misc/minion-initd-3 b/pcr/openrc-misc/minion-initd-3 deleted file mode 100644 index bf57cbd5c..000000000 --- a/pcr/openrc-misc/minion-initd-3 +++ /dev/null @@ -1,15 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/files/minion-initd-3,v 1.1 2014/02/27 00:02:32 chutzpah Exp $ - -command="/usr/bin/salt-minion" -command_args="${SALT_OPTS}" -command_background="1" -pidfile="/var/run/salt-minion.pid" -name="SALT minion daemon" - -depend() { - need net - use logger -} diff --git a/pcr/openrc-misc/mpd2.init b/pcr/openrc-misc/mpd2.init deleted file mode 100644 index 53f5a02de..000000000 --- a/pcr/openrc-misc/mpd2.init +++ /dev/null @@ -1,37 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/files/mpd2.init,v 1.1 2014/04/15 16:35:25 angelos Exp $ - -depend() { - need localmount - use net netmount nfsmount alsasound esound pulseaudio -} - -checkconfig() { - if ! [ -f /etc/mpd.conf ]; then - eerror "Configuration file /etc/mpd.conf does not exist." - return 1 - fi - - if ! grep -q ^pid_file /etc/mpd.conf; then - eerror "Invalid configuration: pid_file needs to be set." - return 1 - fi - - return 0 -} - -start() { - checkconfig || return 1 - - ebegin "Starting Music Player Daemon" - start-stop-daemon --start --quiet --exec /usr/bin/mpd -- /etc/mpd.conf 2>/dev/null - eend $? -} - -stop() { - ebegin "Stopping Music Player Daemon" - /usr/bin/mpd --kill - eend $? -} diff --git a/pcr/openrc-misc/networkmanager.install b/pcr/openrc-misc/networkmanager.install index c4c741cdf..c634a0a68 100644 --- a/pcr/openrc-misc/networkmanager.install +++ b/pcr/openrc-misc/networkmanager.install @@ -8,7 +8,8 @@ post_install() { post_upgrade() { # For transition from old nm-openrc - rc-update del networkmanager + oldpkgver=${2%-*} + [ "$oldpkgver" -lt 20150118 ] && rc-update del networkmanager post_install "$1" } diff --git a/pcr/openrc-misc/ntp-client.confd b/pcr/openrc-misc/ntp-client.confd deleted file mode 100644 index 786004da8..000000000 --- a/pcr/openrc-misc/ntp-client.confd +++ /dev/null @@ -1,21 +0,0 @@ -# /etc/conf.d/ntp-client - -# Command to run to set the clock initially -# Most people should just leave this line alone ... -# however, if you know what you're doing, and you -# want to use ntpd to set the clock, change this to 'ntpd' -NTPCLIENT_CMD="ntpdate" - -# Options to pass to the above command -# This default setting should work fine but you should -# change the default 'pool.ntp.org' to something closer -# to your machine. See http://www.pool.ntp.org/ or -# try running `netselect -s 3 pool.ntp.org`. -NTPCLIENT_OPTS="-s -b -u \ - 0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org \ - 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" - -# If you use hostnames above, then you should depend on dns -# being up & running before we try to run. Otherwise, you -# can disable this. -rc_use="dns" diff --git a/pcr/openrc-misc/ntp-client.rc b/pcr/openrc-misc/ntp-client.rc deleted file mode 100644 index 3a8b15e80..000000000 --- a/pcr/openrc-misc/ntp-client.rc +++ /dev/null @@ -1,32 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntp-client.rc,v 1.13 2013/12/24 11:01:52 vapier Exp $ - -depend() { - before cron portmap - after net - use dns logger -} - -checkconfig() { - if ! type "${NTPCLIENT_CMD}" >/dev/null 2>&1 ; then - eerror "Please edit /etc/conf.d/ntp-client" - eerror "Unable to locate the client command ${NTPCLIENT_CMD}!" - return 1 - fi - if [ -z "${NTPCLIENT_OPTS}" ] ; then - eerror "Please edit /etc/conf.d/ntp-client" - eerror "I need to know what server/options to use!" - return 1 - fi - return 0 -} - -start() { - checkconfig || return $? - - ebegin "Setting clock via the NTP client '${NTPCLIENT_CMD}'" - "${NTPCLIENT_CMD}" ${NTPCLIENT_OPTS} - eend $? "Failed to set clock" -} diff --git a/pcr/openrc-misc/ntpd.confd b/pcr/openrc-misc/ntpd.confd deleted file mode 100644 index 2b74282c5..000000000 --- a/pcr/openrc-misc/ntpd.confd +++ /dev/null @@ -1,6 +0,0 @@ -# /etc/conf.d/ntpd - -# Options to pass to the ntpd process -# Most people should leave this line alone ... -# however, if you know what you're doing, feel free to tweak -NTPD_OPTS="-g -u ntp:ntp" diff --git a/pcr/openrc-misc/ntpd.rc-r1 b/pcr/openrc-misc/ntpd.rc-r1 deleted file mode 100644 index 1a34bb2f2..000000000 --- a/pcr/openrc-misc/ntpd.rc-r1 +++ /dev/null @@ -1,23 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd.rc-r1,v 1.2 2014/12/23 17:43:25 floppym Exp $ - -description="ntpd - the network time protocol daemon" -pidfile="/var/run/ntpd.pid" -command="/usr/sbin/ntpd" -command_args="-p ${pidfile} ${NTPD_OPTS}" -start_stop_daemon_args="--pidfile ${pidfile}" - -depend() { - use net dns logger - after ntp-client -} - -start_pre() { - if [ ! -f /etc/ntp.conf ] ; then - eerror "Please create /etc/ntp.conf" - return 1 - fi - return 0 -} diff --git a/pcr/openrc-misc/rsyslog.confd b/pcr/openrc-misc/rsyslog.confd deleted file mode 100644 index d8cbe8759..000000000 --- a/pcr/openrc-misc/rsyslog.confd +++ /dev/null @@ -1,30 +0,0 @@ -# /etc/conf.d/rsyslog - -# Configuration file -RSYSLOG_CONFIGFILE="/etc/rsyslog.conf" - -# PID file -# If you should ever change this, remember to update -# "/etc/logrotate.d/rsyslog", too. -RSYSLOG_PIDFILE="/run/rsyslogd.pid" - -# You can use this configuration option to pass additional options to the -# start-stop-daemon, see start-stop-daemon(8) for more details. -# Per default we wait 1000ms after we have started the service to ensure -# that the daemon is really up and running. -RSYSLOG_SSDARGS="--wait 1000" - -# The termination timeout (start-stop-daemon parameter "retry") ensures -# that the service will be terminated within a given time (60 + 5 seconds -# per default) when you are stopping the service. -# You need to increase the value when you are working with a large queue. -# See http://www.rsyslog.com/doc/queues.html for further information. -RSYSLOG_TERMTIMEOUT="TERM/60/KILL/5" - - -# Options to rsyslogd -# See rsyslogd(8) for more details -# Notes: -# * Do not specify another PIDFILE but use the variable above to change the location -# * Do not specify another CONFIGFILE but use the variable above to change the location -RSYSLOG_OPTS="" diff --git a/pcr/openrc-misc/rsyslog.initd b/pcr/openrc-misc/rsyslog.initd deleted file mode 100644 index ec831d7f8..000000000 --- a/pcr/openrc-misc/rsyslog.initd +++ /dev/null @@ -1,69 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/8-stable/rsyslog.initd,v 1.1 2014/09/30 13:09:39 polynomial-c Exp $ - -RSYSLOG_CONFIGFILE=${RSYSLOG_CONFIGFILE:-"/etc/rsyslog.conf"} -RSYSLOG_PIDFILE=${RSYSLOG_PIDFILE:-"/run/rsyslogd.pid"} - -command="/usr/sbin/rsyslogd" -command_args="${RSYSLOG_OPTS} -f ${RSYSLOG_CONFIGFILE} -i ${RSYSLOG_PIDFILE}" -start_stop_daemon_args="${RSYSLOG_SSDARGS}" -pidfile="${RSYSLOG_PIDFILE}" -retry="${RSYSLOG_TERMTIMEOUT}" - -required_files="${RSYSLOG_CONFIGFILE}" - -description="RSYSLOG is the rocket-fast system for log processing (syslog replacement)." - -extra_commands="configtest" -extra_started_commands="rotate" - -description_configtest="Run rsyslogd's internal config check." - -description_rotate="Sends rsyslogd a signal to re-open its log files." - -depend() { - need clock hostname localmount - provide logger -} - -start_pre() { - if [ "${RC_CMD}" != "restart" ]; then - configtest || return 1 - fi -} - -stop_pre() { - if [ "${RC_CMD}" = "restart" ]; then - configtest || return 1 - fi -} - -stop_post() { - rm -f ${RSYSLOG_PIDFILE} -} - -configtest() { - # This will currently only detect fatal errors - # See https://github.com/rsyslog/rsyslog/issues/79 - - local _test_command="${command} -N 999 -f ${RSYSLOG_CONFIGFILE}" - local _retval=0 - - ebegin "Checking rsyslogd's configuration" - ${_test_command} >/dev/null 2>&1 - _retval=$? - - if [ ${_retval} -ne 0 ]; then - ${_test_command} - fi - - eend ${_retval} "failed, please correct errors above" -} - -rotate() { - ebegin "Re-opening rsyslogd logs" - start-stop-daemon --signal SIGHUP --pidfile "${RSYSLOG_PIDFILE}" - eend $? -} diff --git a/pcr/openrc-misc/saned.confd b/pcr/openrc-misc/saned.confd deleted file mode 100644 index adb1eab2c..000000000 --- a/pcr/openrc-misc/saned.confd +++ /dev/null @@ -1,2 +0,0 @@ -# The user saned should drop its privileges to after startup -#SANED_USER="" diff --git a/pcr/openrc-misc/saned.initd b/pcr/openrc-misc/saned.initd deleted file mode 100644 index 26498dd71..000000000 --- a/pcr/openrc-misc/saned.initd +++ /dev/null @@ -1,12 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/files/saned.initd,v 1.1 2013/03/15 08:15:52 phosphan Exp $ - -pidfile="/var/run/saned/saned.pid" -command="/usr/sbin/saned" -command_args="-a ${SANED_USER:-root}" - -start_pre() { - checkpath -d -o ${SANED_USER:-root} ${pidfile%/*} -} diff --git a/pcr/openrc-misc/sensord-4-init.d b/pcr/openrc-misc/sensord-4-init.d deleted file mode 100644 index 293341c69..000000000 --- a/pcr/openrc-misc/sensord-4-init.d +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/sensord-4-init.d,v 1.3 2013/09/17 20:05:50 pacho Exp $ - -CONFIG=/etc/sensors3.conf - -depend() { - need localmount - use logger lm_sensors -} - -pidfile=/run/sensord.pid -command=/usr/sbin/sensord -command_args="--config-file ${CONFIG} ${SENSORD_OPTIONS} --pid-file ${pidfile}" - -start_pre() { - if [ ! -f ${CONFIG} ]; then - eerror "Configuration file ${CONFIG} not found" - return 1 - fi -} diff --git a/pcr/openrc-misc/sntp.confd b/pcr/openrc-misc/sntp.confd deleted file mode 100644 index d11983a3f..000000000 --- a/pcr/openrc-misc/sntp.confd +++ /dev/null @@ -1,4 +0,0 @@ -# /etc/conf.d/sntp - -# Options to pass to sntp -SNTP_OPTS="-s 0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" diff --git a/pcr/openrc-misc/sntp.rc b/pcr/openrc-misc/sntp.rc deleted file mode 100644 index cd42b4497..000000000 --- a/pcr/openrc-misc/sntp.rc +++ /dev/null @@ -1,27 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/sntp.rc,v 1.1 2013/07/06 07:15:02 pacho Exp $ - -depend() { - before cron portmap - after net - use dns logger -} - -checkconfig() { - if [ -z "${SNTP_OPTS}" ] ; then - eerror "Please edit /etc/conf.d/sntp" - eerror "I need to know what server/options to use!" - return 1 - fi - return 0 -} - -start() { - checkconfig || return $? - - ebegin "Setting clock via SNTP" - /usr/bin/sntp ${SNTP_OPTS} - eend $? "Failed to set clock" -} diff --git a/pcr/openrc-misc/syndic-confd-1 b/pcr/openrc-misc/syndic-confd-1 deleted file mode 100644 index d69d83fcd..000000000 --- a/pcr/openrc-misc/syndic-confd-1 +++ /dev/null @@ -1,5 +0,0 @@ -# /etc/conf.d/salt-minion: config file for /etc/init.d/salt-minion - -# see man pages for salt-minion or run `salt-minion --help` -# for valid cmdline options -SALT_OPTS="--log-level=warning" diff --git a/pcr/openrc-misc/syndic-initd-3 b/pcr/openrc-misc/syndic-initd-3 deleted file mode 100644 index 712432f90..000000000 --- a/pcr/openrc-misc/syndic-initd-3 +++ /dev/null @@ -1,14 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/files/syndic-initd-3,v 1.1 2014/02/27 00:02:32 chutzpah Exp $ - -command="/usr/bin/salt-syndic" -command_args="${SALT_OPTS}" -command_background="1" -pidfile="/var/run/salt-syndic.pid" -name="SALT syndic daemon" - -depend() { - use net logger -} diff --git a/pcr/openrc-misc/syslog-ng.confd b/pcr/openrc-misc/syslog-ng.confd deleted file mode 100644 index 42fa26ab4..000000000 --- a/pcr/openrc-misc/syslog-ng.confd +++ /dev/null @@ -1,42 +0,0 @@ -# Config file for /etc/init.d/syslog-ng - -# If you are not using network logging, this entire section should be -# commented out. Otherwise, choose one of the settings below based on -# how you are configuring your network. -# -# If you are using the net.* scripts to configure your network, you should -# set rc_need to match the interface through which your logging server -# can be reached. -#rc_need="net.eth0" -# -# If you are using an interface manager like wicd, dhcpcd in standalone -# mode, networkmanager, etc to control your interfaces, set rc_need to -# the name of that service. -# rc_need="dhcpcd" -#rc_need="networkmanager" -# -# If you are using newnet and configuring your interface statically with -# the network script, you should use this setting. -#rc_need="network" -# -# You can use this setting, but I do not recommend relying on it. -#rc_need="net" -# -# You may also want to uncomment the following if you are using network -# logging. -#rc_use="stunnel" - -# For very customized setups these variables can be adjusted as needed -# but for most situations they should remain commented: -# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf -# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng -# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist -# SYSLOG_NG_PIDFILE_DIR=/run -# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid -# SYSLOG_NG_GROUP=root -# SYSLOG_NG_USER=root - -# Put any additional options for syslog-ng here. -# See syslog-ng(8) for more information. - -SYSLOG_NG_OPTS="" diff --git a/pcr/openrc-misc/syslog-ng.rc6 b/pcr/openrc-misc/syslog-ng.rc6 deleted file mode 100644 index 75e558be7..000000000 --- a/pcr/openrc-misc/syslog-ng.rc6 +++ /dev/null @@ -1,59 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.6/syslog-ng.rc6,v 1.3 2015/03/29 07:27:06 mr_bones_ Exp $ - -SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf} -SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng} -SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE:-${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist} -SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/run} -SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid} - -SYSLOG_NG_GROUP=${SYSLOG_NG_GROUP:-root} -SYSLOG_NG_USER=${SYSLOG_NG_USER:-root} - -command="/usr/sbin/syslog-ng" -command_args="--persist-file \"${SYSLOG_NG_STATEFILE}\" --cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}" -extra_commands="checkconfig" -extra_started_commands="reload" -pidfile="${SYSLOG_NG_PIDFILE}" -start_stop_daemon_args="--user \"${SYSLOG_NG_USER}\":\"${SYSLOG_NG_GROUP}\"" -description="Syslog-ng is a syslog replacement with advanced filtering features." -description_checkconfig="Check the configuration file that will be used by \"start\"" -description_reload="Reload the configuration without exiting" -required_files="${SYSLOG_NG_CONFIGFILE}" -required_dirs="${SYSLOG_NG_PIDFILE_DIR}" - -depend() { - use clock - need hostname localmount - after bootmisc - provide logger -} - -checkconfig() { - ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})" - syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}" - eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})" -} - -start_pre() { - checkconfig || return 1 - checkpath \ - -d \ - --mode 0700 \ - --owner "${SYSLOG_NG_USER}:${SYSLOG_NG_GROUP}" \ - "${SYSLOG_NG_STATEFILE_DIR}" -} - -stop_pre() { - [ "$RC_CMD" = restart ] && sleep 1 - return 0 -} - -reload() { - checkconfig || return 1 - ebegin "Reloading configuration and re-opening log files" - start-stop-daemon --signal HUP --pidfile "${pidfile}" - eend $? -} diff --git a/pcr/openrc-misc/xe-daemon.initd b/pcr/openrc-misc/xe-daemon.initd deleted file mode 100644 index 50519065f..000000000 --- a/pcr/openrc-misc/xe-daemon.initd +++ /dev/null @@ -1,28 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xe-guest-utilities/files/xe-daemon.initd,v 1.1 2014/06/23 14:30:35 robbat2 Exp $ - -depend() { - need localmount - after bootmisc -} - -start() { - einfo "Detecting Linux distribution version" - /usr/sbin/xe-linux-distribution /var/cache/xe-linux-distribution - - ebegin "Starting xe daemon" - start-stop-daemon --start --exec /usr/sbin/xe-daemon \ - --pidfile /var/run/xe-daemon.pid \ - --background \ - -- -p /var/run/xe-daemon.pid - eend $? -} - -stop() { - ebegin "Stopping xe daemon" - start-stop-daemon --stop --exec /usr/sbin/xe-daemon \ - --pidfile /var/run/xe-daemon.pid - eend $? -} diff --git a/pcr/openrc-net/PKGBUILD b/pcr/openrc-net/PKGBUILD index ed3450d63..768ac69be 100644 --- a/pcr/openrc-net/PKGBUILD +++ b/pcr/openrc-net/PKGBUILD @@ -1,80 +1,5 @@ -# Maintainer : freaj <freaj@riseup.net> -# Maintainer (Manjaro): artoo <artoo@manjaro.org> - -# file vars for easy update -_Cbind=named.confd-r7 -_Ibind=named.init-r13 -_Isasl=saslauthd2.rc7 -_Cdhcp1=dhcpd.conf2 -_Cdhcp2=dhcrelay.conf -_Cdhcp3=dhcrelay6.conf -_Idhcp1=dhcpd.init5 -_Idhcp2=dhcrelay.init3 -_Chost=hostapd-conf.d -_Ihost=hostapd-init.d -_Cip1=iptables-1.4.13.confd -_Cip2=ip6tables-1.4.13.confd -_Iip=iptables-1.4.13-r1.init -_Ikrb1=mit-krb5kadmind.initd-r1 -_Ikrb2=mit-krb5kdc.initd-r1 -_Ikrb3=mit-krb5kpropd.initd-r1 -_Clight=lighttpd.confd -_Ilight=lighttpd.initd -_Cnfs=nfs.confd -_Infs=nfs.initd -_Cnfsc=nfsclient.confd -_Infsc=nfsclient.initd -_Iidmapd=rpc.idmapd.initd -_Ipipefs=rpc.pipefs.initd -_Igssd=rpc.gssd.initd -_Isvcgssd=rpc.svcgssd.initd -_Istatd=rpc.statd.initd -_Cldap=slapd-confd-2.4.28-r1 -_Ildap=slapd-initd-2.4.28-r1 -_Islp=slpd-init -_Cssh=sshd.confd -_Issh=sshd.rc6.4 -_Ipolip=polipo.initd -_Ipostfix=postfix.rc6.2.7 -_Ipriv=privoxy.initd -_Cquota=quota.confd -_Iquota1=quota.rc7 -_Iquota2=rpc.rquotad.initd -#_Crpc=rpcbind.confd -_Irpc=rpcbind.initd -_Crsync=rsyncd.conf.d -_Irsync=rsyncd.init.d-r1 -_Csmb=samba4.confd -_Ismb=samba4.initd-r1 -_Csquid=squid.confd-r1 -_Isquid=squid.initd-r4 -_Ctrans=transmission-daemon.confd.4 -_Itrans=transmission-daemon.initd.9 -_Cufw=ufw.confd -_Iufw=ufw-2.initd -_Ivsftp=vsftpd.init -_Svsftp=vsftpd-checkconfig.sh -_Cxinet=xinetd.confd -_Ixinet=xinetd.rc6 -_Cypbind=ypbind.confd-r1 -_Iypbind=ypbind.initd -_Cypserv1=ypserv.confd -_Cypserv2=rpc.yppasswdd.confd -_Cypserv3=rpc.ypxfrd.confd -_Iypserv1=ypserv -_Iypserv2=rpc.yppasswdd-r1 -_Iypserv3=rpc.ypxfrd-2.23 -_Iautofs=autofs5.initd -_Cvpn=openvpn-2.1.conf -_Ivpn=openvpn-2.1.init -_Cntp=openntpd.conf.d-20080406-r6 -_Intp=openntpd.init.d-20080406-r6 -_Ctor=tor.confd -_Itor=tor.initd-r6 -_Iwicd=wicd.initd -_CSync=syncthing.confd -_ISync=syncthing.initd -_Inginx=nginx.initd-r2 +# Maintainer (Arch): artoo <artoo@manjaro.org> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> _apver=2.4.10-r1 _aprel=20140731 @@ -84,670 +9,717 @@ _gentoo_uri="http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86" pkgbase=openrc-net pkgname=('autofs-openrc' - 'apache-openrc' - 'bind-openrc' - 'cyrus-sasl-openrc' - 'dhcp-openrc' - 'hostapd-openrc' - 'iptables-openrc' - 'krb5-openrc' - 'lighttpd-openrc' - 'nfs-utils-openrc' - 'openldap-openrc' - 'openslp-openrc' - 'openssh-openrc' - 'openntpd-openrc' - 'openvpn-openrc' - 'polipo-openrc' - 'postfix-openrc' - 'privoxy-openrc' - 'quota-tools-openrc' - 'rpcbind-openrc' - 'rsync-openrc' - 'samba-openrc' - 'squid-openrc' - 'transmission-openrc' - 'ufw-openrc' - 'vsftpd-openrc' - 'xinetd-openrc' - 'ypbind-mt-openrc' - 'ypserv-openrc' - 'tor-openrc' - 'wicd-openrc' - 'syncthing-openrc' - 'nginx-openrc') -pkgver=20150330 + 'apache-openrc' + 'bind-openrc' + 'cyrus-sasl-openrc' + 'dhcp-openrc' + 'hostapd-openrc' + 'iptables-openrc' + 'krb5-openrc' + 'lighttpd-openrc' + 'nfs-utils-openrc' + 'openldap-openrc' + 'openslp-openrc' + 'openssh-openrc' + 'openntpd-openrc' + 'openvpn-openrc' + 'polipo-openrc' + 'postfix-openrc' + 'privoxy-openrc' + 'quota-tools-openrc' + 'rpcbind-openrc' + 'rsync-openrc' + 'samba-openrc' + 'squid-openrc' + 'transmission-openrc' + 'ufw-openrc' + 'vsftpd-openrc' + 'xinetd-openrc' + 'ypbind-mt-openrc' + 'ypserv-openrc' + 'tor-openrc' + 'wicd-openrc' + 'syncthing-openrc' + 'nginx-openrc') +pkgver=20150828 pkgrel=1 pkgdesc="OpenRC init scripts" arch=('any') url="https://github.com/manjaro/packages-openrc" license=('GPL2') -groups=('openrc' 'openrc-net') +groups=('openrc-net') conflicts=('openrc' - 'openrc-git' - 'openrc-arch-services-git' - 'initscripts' - 'systemd-sysvcompat') + 'openrc-git' + 'openrc-arch-services-git' + 'initscripts' + 'systemd-sysvcompat') source=("${_dev_uri}/gentoo-apache-${_apver}-${_aprel}.tar.bz2" - "${_gentoo_uri}/net-dns/bind/files/${_Cbind}" - "${_gentoo_uri}/net-dns/bind/files/${_Ibind}" - "${_gentoo_uri}/dev-libs/cyrus-sasl/files/${_Isasl}" - "${_gentoo_uri}/net-misc/dhcp/files/${_Cdhcp1}" - "${_gentoo_uri}/net-misc/dhcp/files/${_Cdhcp2}" - "${_gentoo_uri}/net-misc/dhcp/files/${_Cdhcp3}" - "${_gentoo_uri}/net-misc/dhcp/files/${_Idhcp1}" - "${_gentoo_uri}/net-misc/dhcp/files/${_Idhcp2}" - "${_gentoo_uri}/net-wireless/hostapd/files/${_Chost}" - "${_gentoo_uri}/net-wireless/hostapd/files/${_Ihost}" - "${_gentoo_uri}/net-firewall/iptables/files/${_Cip1}" - "${_gentoo_uri}/net-firewall/iptables/files/${_Cip2}" - "${_gentoo_uri}/net-firewall/iptables/files/${_Iip}" - "${_gentoo_uri}/app-crypt/mit-krb5/files/${_Ikrb1}" - "${_gentoo_uri}/app-crypt/mit-krb5/files/${_Ikrb2}" - "${_gentoo_uri}/app-crypt/mit-krb5/files/${_Ikrb3}" - "${_gentoo_uri}/www-servers/lighttpd/files/${_Clight}" - "${_gentoo_uri}/www-servers/lighttpd/files/${_Ilight}" - "${_gentoo_uri}/net-fs/nfs-utils/files/${_Cnfs}" - "${_gentoo_uri}/net-fs/nfs-utils/files/${_Infs}" - "${_gentoo_uri}/net-fs/nfs-utils/files/${_Cnfsc}" - "${_gentoo_uri}/net-fs/nfs-utils/files/${_Infsc}" - "${_gentoo_uri}/net-fs/nfs-utils/files/${_Iidmapd}" - "${_gentoo_uri}/net-fs/nfs-utils/files/${_Ipipefs}" - "${_gentoo_uri}/net-fs/nfs-utils/files/${_Igssd}" - "${_gentoo_uri}/net-fs/nfs-utils/files/${_Isvcgssd}" - "${_gentoo_uri}/net-fs/nfs-utils/files/${_Istatd}" - "${_gentoo_uri}/net-nds/openldap/files/${_Cldap}" - "${_gentoo_uri}/net-nds/openldap/files/${_Ildap}" - "${_gentoo_uri}/net-libs/openslp/files/${_Islp}" - "${_gentoo_uri}/net-misc/openssh/files/${_Cssh}" - "${_gentoo_uri}/net-misc/openssh/files/${_Issh}" - "${_gentoo_uri}/net-proxy/polipo/files/${_Ipolip}" - "${_gentoo_uri}/mail-mta/postfix/files/${_Ipostfix}" - "${_gentoo_uri}/net-proxy/privoxy/files/${_Ipriv}" - "${_gentoo_uri}/sys-fs/quota/files/${_Cquota}" - "${_gentoo_uri}/sys-fs/quota/files/${_Iquota1}" - "${_gentoo_uri}/sys-fs/quota/files/${_Iquota2}" - #"${_gentoo_uri}/net-nds/rpcbind/files/${_Crpc}" - "${_gentoo_uri}/net-nds/rpcbind/files/${_Irpc}" - "${_gentoo_uri}/net-misc/rsync/files/${_Crsync}" - "${_gentoo_uri}/net-misc/rsync/files/${_Irsync}" - "${_gentoo_uri}/net-fs/samba/files/4.1/${_Csmb}" - "${_gentoo_uri}/net-fs/samba/files/4.1/${_Ismb}" - "${_gentoo_uri}/net-proxy/squid/files/${_Csquid}" - "${_gentoo_uri}/net-proxy/squid/files/${_Isquid}" - "${_gentoo_uri}/net-p2p/transmission/files/${_Ctrans}" - "${_gentoo_uri}/net-p2p/transmission/files/${_Itrans}" - "${_gentoo_uri}/net-firewall/ufw/files/${_Cufw}" - "${_gentoo_uri}/net-firewall/ufw/files/${_Iufw}" - "${_gentoo_uri}/net-ftp/vsftpd/files/${_Svsftp}" - "${_gentoo_uri}/net-ftp/vsftpd/files/${_Ivsftp}" - "${_gentoo_uri}/sys-apps/xinetd/files/${_Cxinet}" - "${_gentoo_uri}/sys-apps/xinetd/files/${_Ixinet}" - "${_gentoo_uri}/net-nds/ypbind/files/${_Cypbind}" - "${_gentoo_uri}/net-nds/ypbind/files/${_Iypbind}" - "${_gentoo_uri}/net-nds/ypserv/files/${_Cypserv1}" - "${_gentoo_uri}/net-nds/ypserv/files/${_Cypserv2}" - "${_gentoo_uri}/net-nds/ypserv/files/${_Cypserv3}" - "${_gentoo_uri}/net-nds/ypserv/files/${_Iypserv1}" - "${_gentoo_uri}/net-nds/ypserv/files/${_Iypserv2}" - "${_gentoo_uri}/net-nds/ypserv/files/${_Iypserv3}" - "${_gentoo_uri}/net-fs/autofs/files/${_Iautofs}" - "${_gentoo_uri}/net-misc/openvpn/files/${_Cvpn}" - "${_gentoo_uri}/net-misc/openvpn/files/${_Ivpn}" - "${_gentoo_uri}/net-misc/openntpd/files/${_Cntp}" - "${_gentoo_uri}/net-misc/openntpd/files/${_Intp}" - #"${_gentoo_uri}/net-misc/wicd/files/${_Iwicd}" - "${_gentoo_uri}/net-misc/tor/files/${_Ctor}" - "${_gentoo_uri}/net-misc/tor/files/${_Itor}" - "${_Iwicd}" - "${_CSync}" - "${_ISync}" - "${_gentoo_uri}/www-servers/nginx/files/${_Inginx}") + "named.confd::${_gentoo_uri}/net-dns/bind/files/named.confd-r7" + "named.initd::${_gentoo_uri}/net-dns/bind/files/named.init-r13" + "saslauthd.initd::${_gentoo_uri}/dev-libs/cyrus-sasl/files/saslauthd2.rc7" + "dhcpd.confd::${_gentoo_uri}/net-misc/dhcp/files/dhcpd.conf2" + "dhcrelay.confd::${_gentoo_uri}/net-misc/dhcp/files/dhcrelay.conf" + "dhcrelay6.confd::${_gentoo_uri}/net-misc/dhcp/files/dhcrelay6.conf" + "dhcpd.initd::${_gentoo_uri}/net-misc/dhcp/files/dhcpd.init5" + "dhcrelay.initd::${_gentoo_uri}/net-misc/dhcp/files/dhcrelay.init3" + "hostapd.confd::${_gentoo_uri}/net-wireless/hostapd/files/hostapd-conf.d" + "hostapd.initd::${_gentoo_uri}/net-wireless/hostapd/files/hostapd-init.d" + "iptables.confd::${_gentoo_uri}/net-firewall/iptables/files/iptables-1.4.13.confd" + "ip6tables.confd::${_gentoo_uri}/net-firewall/iptables/files/ip6tables-1.4.13.confd" + "iptables.initd::${_gentoo_uri}/net-firewall/iptables/files/iptables-1.4.13-r1.init" + "krb5kadmind.initd::${_gentoo_uri}/app-crypt/mit-krb5/files/mit-krb5kadmind.initd-r1" + "krb5kdc.initd::${_gentoo_uri}/app-crypt/mit-krb5/files/mit-krb5kdc.initd-r1" + "krb5kpropd.initd::${_gentoo_uri}/app-crypt/mit-krb5/files/mit-krb5kpropd.initd-r1" + "lighttpd.confd::${_gentoo_uri}/www-servers/lighttpd/files/lighttpd.confd" + "lighttpd.initd::${_gentoo_uri}/www-servers/lighttpd/files/lighttpd.initd" + "nfs.confd::${_gentoo_uri}/net-fs/nfs-utils/files/nfs.confd" + "nfs.initd::${_gentoo_uri}/net-fs/nfs-utils/files/nfs.initd" + "nfsclient.confd::${_gentoo_uri}/net-fs/nfs-utils/files/nfsclient.confd" + "nfsclient.initd::${_gentoo_uri}/net-fs/nfs-utils/files/nfsclient.initd" + "rpc.idmapd.initd::${_gentoo_uri}/net-fs/nfs-utils/files/rpc.idmapd.initd" + "rpc.pipefs.initd::${_gentoo_uri}/net-fs/nfs-utils/files/rpc.pipefs.initd" + "rpc.gssd.initd::${_gentoo_uri}/net-fs/nfs-utils/files/rpc.gssd.initd" + "rpc.svcgssd.initd::${_gentoo_uri}/net-fs/nfs-utils/files/rpc.svcgssd.initd" + "rpc.statd.initd::${_gentoo_uri}/net-fs/nfs-utils/files/rpc.statd.initd" + "slapd.confd::${_gentoo_uri}/net-nds/openldap/files/slapd-confd-2.4.28-r1" + "slapd.initd::${_gentoo_uri}/net-nds/openldap/files/slapd-initd-2.4.28-r1" + "slpd.initd::${_gentoo_uri}/net-libs/openslp/files/slpd-init" + "sshd.confd::${_gentoo_uri}/net-misc/openssh/files/sshd.confd" + "sshd.initd::${_gentoo_uri}/net-misc/openssh/files/sshd.rc6.4" + "polipo.initd::${_gentoo_uri}/net-proxy/polipo/files/polipo.initd" + "postfix.initd::${_gentoo_uri}/mail-mta/postfix/files/postfix.rc6.2.7" + "privoxy.initd::${_gentoo_uri}/net-proxy/privoxy/files/privoxy.initd" + "quota.confd::${_gentoo_uri}/sys-fs/quota/files/quota.confd" + "quota.initd::${_gentoo_uri}/sys-fs/quota/files/quota.rc7" + "rpc.rquotad.initd::${_gentoo_uri}/sys-fs/quota/files/rpc.rquotad.initd" + "rpcbind.initd::${_gentoo_uri}/net-nds/rpcbind/files/rpcbind.initd" + "rsyncd.confd::${_gentoo_uri}/net-misc/rsync/files/rsyncd.conf.d" + "rsyncd.initd::${_gentoo_uri}/net-misc/rsync/files/rsyncd.init.d-r1" + "smb.confd::${_gentoo_uri}/net-fs/samba/files/4.1/samba4.confd" + "smb.initd::${_gentoo_uri}/net-fs/samba/files/4.1/samba4.initd-r1" + "squid.confd::${_gentoo_uri}/net-proxy/squid/files/squid.confd-r1" + "squid.initd::${_gentoo_uri}/net-proxy/squid/files/squid.initd-r4" + "transmission-daemon.confd::${_gentoo_uri}/net-p2p/transmission/files/transmission-daemon.confd.4" + "transmission-daemon.initd::${_gentoo_uri}/net-p2p/transmission/files/transmission-daemon.initd.9" + "ufw.confd::${_gentoo_uri}/net-firewall/ufw/files/ufw.confd" + "ufw.initd::${_gentoo_uri}/net-firewall/ufw/files/ufw-2.initd" + "${_gentoo_uri}/net-ftp/vsftpd/files/vsftpd-checkconfig.sh" + "vsftpd.initd::${_gentoo_uri}/net-ftp/vsftpd/files/vsftpd.init" + "xinetd.confd::${_gentoo_uri}/sys-apps/xinetd/files/xinetd.confd" + "xinetd.initd::${_gentoo_uri}/sys-apps/xinetd/files/xinetd.rc6" + "ypbind.confd::${_gentoo_uri}/net-nds/ypbind/files/ypbind.confd-r1" + "ypbind.initd::${_gentoo_uri}/net-nds/ypbind/files/ypbind.initd" + "ypserv.confd::${_gentoo_uri}/net-nds/ypserv/files/ypserv.confd" + "rpc.yppasswdd.confd::${_gentoo_uri}/net-nds/ypserv/files/rpc.yppasswdd.confd" + "rpc.ypxfrd.confd::${_gentoo_uri}/net-nds/ypserv/files/rpc.ypxfrd.confd" + "ypserv.initd::${_gentoo_uri}/net-nds/ypserv/files/ypserv" + "rpc.yppasswdd.initd::${_gentoo_uri}/net-nds/ypserv/files/rpc.yppasswdd-r1" + "rpc.ypxfrd.initd::${_gentoo_uri}/net-nds/ypserv/files/rpc.ypxfrd-2.23" + "autofs.initd::${_gentoo_uri}/net-fs/autofs/files/autofs5.initd" + "openvpn.confd::${_gentoo_uri}/net-misc/openvpn/files/openvpn-2.1.conf" + "openvpn.initd::${_gentoo_uri}/net-misc/openvpn/files/openvpn-2.1.init" + "ntpd.confd::${_gentoo_uri}/net-misc/openntpd/files/openntpd.conf.d-20080406-r6" + "ntpd.initd::${_gentoo_uri}/net-misc/openntpd/files/openntpd.init.d-20080406-r6" + "tor.confd::${_gentoo_uri}/net-misc/tor/files/tor.confd" + "tor.initd::${_gentoo_uri}/net-misc/tor/files/tor.initd-r7" + "nginx.initd::${_gentoo_uri}/www-servers/nginx/files/nginx.initd-r2" + "wicd.initd" + "syncthing.confd" + "syncthing.initd") +sha256sums=('8e093a18582c3a20283ed1c09de9acc6832a80b1d5a02962599db0535d38af19' + '3cf1ab72446cb9417de916e4cd732f2056fb74d2c6f03da6741b7bae8c415448' + '55024fe0e2b491b5cb490a9f575bad3096d446f20f8d52778d778fd26a415d52' + 'a095def10c3b7e6894a6d782c70cbe176c7b53f36386dcc4b1e5bc75424e29f0' + 'e8a413e9102948b336f60041fc3cade33125faf56d8319ee65d9f3c63199a8e7' + 'a157630c3bdc9565cca8240ee1e6539fc9cbc1e4642c40e0965e3609d1021bac' + '099f668e1ad42ed9446b15675032a1186715d1fe9e4a1b24dfb787e68495d2b6' + 'ab47d97f50f7e583e262479b19907e37c42fe7dcc54dc616e1b951f910486b30' + '204aaf81d51dc119cee1d1ff3ae3dd50af666af2f8b2a363fd1bf442d4dcee00' + '916f4b14095ee4ec8a510391c883e9f01868e18d79a3d5cbeb13a104a793d45d' + 'b9701b9ea509638ee1ed74bec38a22e6bd7358763497ce53c146d2faf9e97a61' + '7e2341211ca14997b7a8a1f930f94db855291af597c568f680f80031c20d45b6' + '2938fe4206514d9868047bd8f888a699fa2097ca69edab176453436d4259abaa' + '13047698e03079b754957e1e548ce7505dfb2c73c9a31f87e061140603ab0e44' + '3e55c79f19aaa6ef6b64a621c03dbb2eac3ad923916dc803f4c1bfe48ce89fbb' + '709309dea043aa306c2fcf0960e0993a6db540c220de64cf92d6b85f1cca23c5' + 'c374ea05d7e9f15e10c8f9dbd0cad6548e0f92aef7de33e5dbc27222e9407e7b' + 'bb6e6721f33e6582a91025f3500e159a599fb856d699e9394093e1018c7925e0' + 'b1515472c32927039b38f6c3a797cbc54a5a300b5d6fa54df9550174afa2b7f8' + 'c652a4fe8a43dc68a818345db2b3acc560663b5b6c969324d4f23afb0fb96a94' + '1e77bc6fb2ceb266f724818898bd42bec47512a5a7ede6660e0565ea1c58d619' + 'e8842fca856eae598fb8fe15ed8d3cef13e61851217be66b8cc4087af8cee8ad' + '122ade9931af8f64696375c9c66d00f64a90949616e00e9a00a7264c50c2e8a7' + '3ce65326859c43983dad25ad2d4731488c488037796e39b6b5eda336e8bf81ef' + 'ebee63e81fb952474c34b745913e8774b29c9cc65180d363a33d991e478aea2d' + '00d9c29280a83e8458c33139d04a9b38c6fdba9d7cb9b420ca83bf6b10e6435d' + 'f1c460d8b0e91e54a551397d755135d05a3728d81de596535bf8bda074455677' + 'a5731b8f681111421277c6c1c43b3e1d303790d9f8aebd977a895b0ed7a73bc3' + '5bca003ec3b67c7c78519aede1d82002579006ccfecce8f87b559df719f82e92' + '1fc515a6816b8a750db513df0b3b9bf8dd8bd4c4e9051205521acadfdebeae0f' + '7f228796e020c0779c52683f684197d50662ae890b1ae193ffa9acf157ccd143' + '29c6d57ac3ec6018cadc6ba6cd9b90c9ed46e20049b970fdcc68ee2481a2ee41' + '26cdcade999f3797016c8f894e27173e5ccee73cf6ec8de8ffcca468d7cd6379' + 'ff37dacce4551b6ef9866435d586b014aae5fef5b6c3ae7ba839165514644765' + '51f4bffa535d891f94d4a20ca2a4a42cc99189f3de78cee1c8d235e4a9d1721d' + '224496b498b4f692ae3316a95b5c7c8b6230dcd5fee0ca163956a7acde243de9' + '00d1dfb3b893db5d6a213a4edda622c7d64dcafa40b3019f15e070c164286632' + '00ce705b49aaa356d9d9f0be3b80a3fe2810471cbe02fd0edc66349f3ca281de' + 'c3896303d6cfebf314a3f6b8aeed0f6cb6ae421c4c0923b0121c76b3251314e5' + '6561ae40c5899a9f7a12f1f0867bec47d47c7cc3c583574ffcecbbf6f8d8afbb' + 'de758791b16b89a648c01867af7f51bc9bd44e40cbe868e439b753ff5d9572e5' + 'baff64277f9aa62cf1eeed2284bb08c4f3078a8e6e7604e4fec228ca5fa9dd82' + '53755809cc27fdbaf98752cd3da45b5c2bda62dd46fcc37570c6e237f7954ffa' + '9f4eaba0b966fd30351fa66cac9a666b5ec1dc54035ddad94c61a2f43dcb2d62' + '214a184495a3384eb452caef435256043bc51e35140a61b1f5fdff32603c8f7e' + '3830cb94600ac658a6ff1f9f31bdbece64caf3ad23c62ae0a887d152970125f5' + '249689688aad23d0d27ccdd08a0907fd85058d6a52ccd3467f756b07f5d059ee' + '06d047b47befe6aaf1b1542fdd50e84ea38e0fef004b5095f6096f33fa1901a3' + '069aa7382b40aecebf26ef53f3f4c49890314e0357925c84b3c15f1d0b913be0' + '657b5305923b2a5de9eb96931aaaa28d6e997ace6c40793d905887798094258c' + '2de7c7c1edfe3ae0480e22d988a564db3bb873050929ebb6e8361d7a1288ddda' + '4297952eeeb02b5c4f2f750742614513fa6a0c8d291a9a0adcec1ec0098fcd78' + 'e401e2cf7c0180a170d3dc3e91d7e98002bae7b013df72813b7bcf89b864fb3a' + '6aeb4ec9b8ccc062b5ee8c609830c05cee3ed790fa90d7b2d8cf82a09e317c5c' + '79f6c6ed4875f00fe702f69e9a6180a032d5a47f3e58e892e6ba0e2746b6fec8' + '3cdd6872fae15dc8533b3f75ac36ad59ffb946a3f1b445d688629c621cebbe34' + '4edd475ca95d31cfcea20a8e6268024f8128423bc7ae67edb535e6811c64668e' + 'e46afe737bfc57aa31be1a441615fcc112e1ebf41d631c1929e00b81baca119d' + 'bd1f245a362f85319e83965e8b825e66e686a4a0bf185ab8ec51fd335bc873c2' + '08db79845b497f2ec8938854ffac904aeed747d98c0820ad0be9e5aa9377512b' + 'e827778b8a8e6984b637c745c315a2e02ebc46af752651b7a70626ba545a84b6' + 'a6445dd607093fdafb013e5896f60d78223549b38c96300fe239bcf5dbf2a8de' + 'f2c44e5018719f644e194a4e8e43390bdc9926c533f79c41f0abf84879799d05' + '330149a83684ddabe413d134d4c8efad4c88b18c2ab67165014deff5f7fffad2' + 'd1b1f8a00935d77521bceb62535350444df3470fa45f4d33c3934051a1bb595b' + '91fb1497b3a6ef0bb3a3d5baefdff801d8ff1cba27aaf742303415550814a09b' + 'fca7183a7676f0f471878925c8fbec20b7a0bff01551c0ad2b34d4d8a826c876' + '41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b75384c25c' + '666b0cacc53515fb8409ada05d7e92b1de4d9a4814ba145f4982ffd164958aae' + '9d5fca09d0161446a5cec30a0694cdc0656469403a008920a52a190051218b36' + '66b2b53b077ddc2d5eb1d81faa99fa0f4f0db01520900ba948001e539bfe02d8' + 'eb4a4315916fe3f8688c1da5bb5c249a1f402e61617452288d5b0668078c955c' + '63708b1a7b61ae791df64bb4cefa01dc12236f96bb67fe6d0b2c513e11c81f3e') pkgver() { - date +%Y%m%d + date +%Y%m%d +} + +_inst_initd(){ + install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1 + + sed -e 's|#!/sbin/runscript|#!/usr/bin/openrc-run|' \ + -e 's|/var/run|/run|g' \ + -i ${pkgdir}/etc/init.d/$1 } -_shebang='s|#!/sbin/runscript|#!/usr/bin/openrc-run|' -_runpath='s|/var/run|/run|g' -_binpath=('s|/usr/sbin|/usr/bin|g' 's|/sbin|/usr/bin|g') +_inst_confd(){ + install -Dm755 ${srcdir}/$1.confd ${pkgdir}/etc/conf.d/$1 +} package_apache-openrc() { - pkgdesc="OpenRC apache init script" - depends=('openrc-core' 'apache') - backup=('etc/conf.d/httpd') - install=apache.install - - install -Dm755 "${srcdir}/gentoo-apache-${_apver}/init/apache2.confd" "${pkgdir}/etc/conf.d/httpd" - install -Dm755 "${srcdir}/gentoo-apache-${_apver}/init/apache2.initd" "${pkgdir}/etc/init.d/httpd" - - local _p1='s|/usr/sbin/apache2|/usr/bin/apachectl|' \ - _p2='s|/etc/apache2/httpd.conf|/etc/httpd/conf/httpd.conf|' \ - _p3='s/! test -f/test -f/' \ - _p4='s|/usr/lib/apache2|/usr/lib/httpd|' \ - _p5='s|apache2.pid|httpd/httpd.pid|' \ - _p6='s|apache2 >/dev/null|httpd >/dev/null|' \ - _p7='s|apache2|httpd|g' \ - _p8='s|/run/apache_ssl_mutex|/run/httpd|' - sed -e "${_shebang}" -e "${_p1}" -e "${_p2}" -e "${_p3}" \ - -e "${_p4}" -e "${_p5}" -e "${_p6}" -e "${_p8}" -i "${pkgdir}/etc/init.d/httpd" - sed -e "${_p2}" -e "${_p4}" -e "${_p5}" -e "${_p7}" -i "${pkgdir}/etc/conf.d/httpd" + pkgdesc="OpenRC apache init script" + depends=('openrc-core' 'apache') + backup=('etc/conf.d/httpd') + install=apache.install + + install -Dm644 "${srcdir}/gentoo-apache-${_apver}/init/apache2.confd" "${pkgdir}/etc/conf.d/httpd" + install -Dm755 "${srcdir}/gentoo-apache-${_apver}/init/apache2.initd" "${pkgdir}/etc/init.d/httpd" + + sed -e "${_shebang}" \ + -e 's|/usr/sbin/apache2|/usr/bin/apachectl|' \ + -e 's|/etc/apache2/httpd.conf|/etc/httpd/conf/httpd.conf|' \ + -e 's/! test -f/test -f/' \ + -e 's|/usr/lib/apache2|/usr/lib/httpd|' \ + -e 's|apache2.pid|httpd/httpd.pid|' \ + -e 's|apache2 >/dev/null|httpd >/dev/null|' \ + -e 's|/run/apache_ssl_mutex|/run/httpd|' \ + -i "${pkgdir}/etc/init.d/httpd" + + sed -e 's|/etc/apache2/httpd.conf|/etc/httpd/conf/httpd.conf|' \ + -e 's|/usr/lib/apache2|/usr/lib/httpd|' \ + -e 's|apache2.pid|httpd/httpd.pid|' \ + -e 's|apache2|httpd|g' \ + -i "${pkgdir}/etc/conf.d/httpd" } package_autofs-openrc() { - pkgdesc="OpenRC autofs init script" - depends=('openrc-core' 'autofs') - install=autofs.install + pkgdesc="OpenRC autofs init script" + depends=('openrc-core' 'autofs') + install=autofs.install - install -Dm755 "${srcdir}/${_Iautofs}" "${pkgdir}/etc/init.d/autofs" + _inst_initd 'autofs' - sed -e "${_shebang}" -e "${_binpath[0]}" -e "${_runpath}" -i "${pkgdir}/etc/init.d/autofs" + sed -e 's|/usr/sbin|/usr/bin|g' \ + -i "${pkgdir}/etc/init.d/autofs" } package_bind-openrc() { - pkgdesc="OpenRC bind init script" - depends=('openrc-core' 'bind') - backup=('etc/conf.d/named') - install=bind.install + pkgdesc="OpenRC bind init script" + depends=('openrc-core' 'bind') + backup=('etc/conf.d/named') + install=bind.install - install -Dm755 "${srcdir}/${_Cbind}" "${pkgdir}/etc/conf.d/named" - install -Dm755 "${srcdir}/${_Ibind}" "${pkgdir}/etc/init.d/named" + _inst_confd 'named' + _inst_initd 'named' - local _p1='s|/etc/bind/named.conf|/etc/named.conf|g' - sed -e "${_shebang}" -e "${_binpath[0]}" -e "${_runpath}" -e "${_p1}" -i "${pkgdir}/etc/init.d/named" + sed -e 's|/usr/sbin|/usr/bin|g' \ + -e 's|/etc/bind/named.conf|/etc/named.conf|g' \ + -i "${pkgdir}/etc/init.d/named" } package_cyrus-sasl-openrc() { - pkgdesc="OpenRC cyrus-sasl init script" - depends=('openrc-core' 'cyrus-sasl') - install=cyrus-sasl.install + pkgdesc="OpenRC cyrus-sasl init script" + depends=('openrc-core' 'cyrus-sasl') + install=cyrus-sasl.install - install -Dm755 "${srcdir}/${_Isasl}" "${pkgdir}/etc/init.d/saslauthd" + _inst_initd 'saslauthd' - sed -e "${_shebang}" -e "${_binpath[0]}" -i "${pkgdir}/etc/init.d/saslauthd" + sed -e 's|/usr/sbin|/usr/bin|g' \ + -i "${pkgdir}/etc/init.d/saslauthd" } package_dhcp-openrc() { - pkgdesc="OpenRC dhcp init script" - depends=('openrc-core' 'dhcp') - optdepends=('openldap-openrc: openldap initscript' - 'bind-openrc: bind initscript') - backup=('etc/conf.d/dhcpd' - 'etc/conf.d/dhcrelay' - 'etc/conf.d/dhcrelay6') - install=dhcp.install + pkgdesc="OpenRC dhcp init script" + depends=('openrc-core' 'dhcp') + optdepends=('openldap-openrc: openldap initscript' + 'bind-openrc: bind initscript') + backup=('etc/conf.d/dhcpd' + 'etc/conf.d/dhcrelay' + 'etc/conf.d/dhcrelay6') + install=dhcp.install + + _inst_confd 'dhcpd' + _inst_initd 'dhcpd' + + _inst_confd 'dhcrelay' + _inst_initd 'dhcrelay' - install -Dm755 "${srcdir}/${_Cdhcp1}" "${pkgdir}/etc/conf.d/dhcpd" - install -Dm755 "${srcdir}/${_Cdhcp2}" "${pkgdir}/etc/conf.d/dhcrelay" - install -Dm755 "${srcdir}/${_Cdhcp3}" "${pkgdir}/etc/conf.d/dhcrelay6" + _inst_confd 'dhcrelay6' +# _inst_initd 'dhcrelay6' - install -Dm755 "${srcdir}/${_Idhcp1}" "${pkgdir}/etc/init.d/dhcpd" - install -Dm755 "${srcdir}/${_Idhcp2}" "${pkgdir}/etc/init.d/dhcrelay" - install -Dm755 "${srcdir}/${_Idhcp2}" "${pkgdir}/etc/init.d/dhcrelay6" + install -Dm755 "${srcdir}/dhcrelay.initd" "${pkgdir}/etc/init.d/dhcrelay6" - local _p1='s|#@slapd@|ldap slapd|' - for f in ${pkgdir}/etc/init.d/*;do - sed -e "${_shebang}" -e "${_binpath[0]}" -e "${_runpath}" -e "${_p1}" -i $f - done + for f in ${pkgdir}/etc/init.d/*;do + sed -e 's|/usr/sbin|/usr/bin|g' \ + -e 's|#@slapd@|ldap slapd|' \ + -i $f + done } package_hostapd-openrc() { - pkgdesc="OpenRC hostapd init script" - depends=('openrc-core' 'hostapd') - backup=('etc/conf.d/hostapd') - install=hostapd.install + pkgdesc="OpenRC hostapd init script" + depends=('openrc-core' 'hostapd') + backup=('etc/conf.d/hostapd') + install=hostapd.install - install -Dm755 "${srcdir}/${_Chost}" "${pkgdir}/etc/conf.d/hostapd" - install -Dm755 "${srcdir}/${_Ihost}" "${pkgdir}/etc/init.d/hostapd" + _inst_confd 'hostapd' + _inst_initd 'hostapd' - sed -e "${_shebang}" -e "${_binpath[0]}" -e "${_runpath}" -i "${pkgdir}/etc/init.d/hostapd" + sed -e 's|/usr/sbin|/usr/bin|g' \ + -i "${pkgdir}/etc/init.d/hostapd" } package_iptables-openrc() { - pkgdesc="OpenRC iptables init script" - depends=('openrc-core' 'iptables') - backup=('etc/conf.d/iptables' - 'etc/conf.d/ip6tables') - install=iptables.install + pkgdesc="OpenRC iptables init script" + depends=('openrc-core' 'iptables') + backup=('etc/conf.d/iptables' + 'etc/conf.d/ip6tables') + install=iptables.install - install -Dm755 "${srcdir}/${_Cip1}" "${pkgdir}/etc/conf.d/iptables" - install -Dm755 "${srcdir}/${_Iip}" "${pkgdir}/etc/init.d/iptables" - install -Dm755 "${srcdir}/${_Cip2}" "${pkgdir}/etc/conf.d/ip6tables" - install -Dm755 "${srcdir}/${_Iip}" "${pkgdir}/etc/init.d/ip6tables" + _inst_confd 'iptables' + _inst_initd 'iptables' - for f in ${pkgdir}/etc/init.d/*;do - sed -e "${_shebang}" -e "${_binpath[1]}" -e "${_runpath}" -i $f - done + _inst_confd 'ip6tables' +# _inst_initd 'iptables' + + install -Dm755 "${srcdir}/iptables.initd" "${pkgdir}/etc/init.d/ip6tables" + + for f in ${pkgdir}/etc/init.d/*;do + sed -e 's|/sbin|/usr/bin|g' \ + -i $f + done } package_krb5-openrc() { - pkgdesc="OpenRC krb5 init script" - depends=('openrc-core' 'krb5') - install=krb5.install + pkgdesc="OpenRC krb5 init script" + depends=('openrc-core' 'krb5') + install=krb5.install - install -Dm755 "${srcdir}/${_Ikrb1}" "${pkgdir}/etc/init.d/krb5kadmind" - install -Dm755 "${srcdir}/${_Ikrb2}" "${pkgdir}/etc/init.d/krb5kdc" - install -Dm755 "${srcdir}/${_Ikrb3}" "${pkgdir}/etc/init.d/krb5kpropd" + _inst_initd 'krb5kadmind' + _inst_initd 'krb5kdc' + _inst_initd 'krb5kpropd' - local _p1='s|mit-krb5kdc|krb5kdc|g' \ - _p2='s|mit-krb5kadmind|krb5kadmind|g' - for f in ${pkgdir}/etc/init.d/*;do - sed -e "${_shebang}" -e "${_binpath[0]}" -e "${_runpath}" -e "${_p1}" -e "${_p2}" -i $f - done + for f in ${pkgdir}/etc/init.d/*;do + sed -e 's|/usr/sbin|/usr/bin|g' \ + -e 's|mit-krb5kdc|krb5kdc|g' \ + -e 's|mit-krb5kadmind|krb5kadmind|g' \ + -i $f + done } package_lighttpd-openrc() { - pkgdesc="OpenRC lighttpd init script" - depends=('openrc-core' 'lighttpd') - backup=('etc/conf.d/lighttpd') - install=lighttpd.install + pkgdesc="OpenRC lighttpd init script" + depends=('openrc-core' 'lighttpd') + backup=('etc/conf.d/lighttpd') + install=lighttpd.install + + _inst_confd 'lighttpd' + _inst_initd 'lighttpd' - install -Dm755 "${srcdir}/${_Clight}" "${pkgdir}/etc/conf.d/lighttpd" - install -Dm755 "${srcdir}/${_Ilight}" "${pkgdir}/etc/init.d/lighttpd" - local _p1='s/lighttpd:lighttpd/http:http/' - sed -e "${_shebang}" -e "${_binpath[0]}" -e "${_runpath}" -e ${_p1} -i "${pkgdir}/etc/init.d/lighttpd" + sed -e 's|/usr/sbin|/usr/bin|g' \ + -e 's/lighttpd:lighttpd/http:http/' \ + -i "${pkgdir}/etc/init.d/lighttpd" } package_rpcbind-openrc() { - pkgdesc="OpenRC rpcbind init script" - depends=('openrc-core' 'rpcbind') - #backup=('etc/conf.d/rpcbind') - install=rpcbind.install + pkgdesc="OpenRC rpcbind init script" + depends=('openrc-core' 'rpcbind') + #backup=('etc/conf.d/rpcbind') + install=rpcbind.install - #install -Dm755 "${srcdir}/${_Crpc}" "${pkgdir}/etc/conf.d/rpcbind" - local _p1='s|RPCBIND_OPTS|RPCBIND_ARGS|' + _inst_initd 'rpcbind' - install -Dm755 "${srcdir}/${_Irpc}" "${pkgdir}/etc/init.d/rpcbind" - - sed -e "${_shebang}" -e "${_binpath[1]}" -e "${_runpath}" -e "${_p1}" -i "${pkgdir}/etc/init.d/rpcbind" + sed -e 's|/sbin|/usr/bin|g' \ + -e 's|RPCBIND_OPTS|RPCBIND_ARGS|' \ + -i "${pkgdir}/etc/init.d/rpcbind" } package_nfs-utils-openrc() { - pkgdesc="OpenRC nfs-utils init script" - depends=('nfs-utils' 'rpcbind-openrc' 'device-mapper-openrc') - optdepends=('ypbind-openrc: ypbind initscript' + pkgdesc="OpenRC nfs-utils init script" + depends=('nfs-utils' 'rpcbind-openrc' 'device-mapper-openrc') + optdepends=('ypbind-openrc: ypbind initscript' 'quota-tools-openrc: quota-tools initscript' 'bind-openrc: bind initscript') - backup=('etc/conf.d/nfs' - 'etc/conf.d/nfsclient') - install=nfs-utils.install - - install -Dm755 "${srcdir}/${_Cnfs}" "${pkgdir}/etc/conf.d/nfs" - install -Dm755 "${srcdir}/${_Infs}" "${pkgdir}/etc/init.d/nfs" - - install -Dm755 "${srcdir}/${_Cnfsc}" "${pkgdir}/etc/conf.d/nfsclient" - install -Dm755 "${srcdir}/${_Infsc}" "${pkgdir}/etc/init.d/nfsclient" - - install -Dm755 "${srcdir}/${_Igssd}" "${pkgdir}/etc/init.d/rpc.gssd" - install -Dm755 "${srcdir}/${_Iidmapd}" "${pkgdir}/etc/init.d/rpc.idmapd" - install -Dm755 "${srcdir}/${_Ipipefs}" "${pkgdir}/etc/init.d/rpc.pipefs" - install -Dm755 "${srcdir}/${_Istatd}" "${pkgdir}/etc/init.d/rpc.statd" - install -Dm755 "${srcdir}/${_Isvcgssd}" "${pkgdir}/etc/init.d/rpc.svcgssd" - - for f in ${pkgdir}/etc/init.d/*;do - sed -e "${_shebang}" -e "${_binpath[0]}" -e "${_runpath}" -i $f - done + backup=('etc/conf.d/nfs' + 'etc/conf.d/nfsclient') + install=nfs-utils.install + + _inst_confd 'nfs' + _inst_initd 'nfs' + + _inst_confd 'nfsclient' + _inst_initd 'nfsclient' + + _inst_initd 'rpc.gssd' + _inst_initd 'rpc.idmapd' + _inst_initd 'rpc.pipefs' + _inst_initd 'rpc.statd' + _inst_initd 'rpc.svcgssd' + + for f in ${pkgdir}/etc/init.d/*;do + sed -e 's|/usr/sbin|/usr/bin|g' \ + -i $f + done } package_openntpd-openrc() { - pkgdesc="OpenRC openntpd init script" - depends=('openrc-core' 'openntpd') - groups=('openrc-net') - provides=('openrc-timed') - conflicts=('ntp' - 'ntp-openrc' - 'openrc' - 'openrc-git' - 'openrc-arch-services-git' - 'initscripts' - 'systemd-sysvcompat') - backup=('etc/conf.d/ntpd') - install=openntpd.install - - install -Dm755 "${srcdir}/${_Cntp}" "${pkgdir}/etc/conf.d/ntpd" - install -Dm755 "${srcdir}/${_Intp}" "${pkgdir}/etc/init.d/ntpd" - - sed -e "${_shebang}" -e "${_binpath[0]}" -e "${_runpath}" -i "${pkgdir}/etc/init.d/ntpd" + pkgdesc="OpenRC openntpd init script" + depends=('openrc-core' 'openntpd') + groups=('openrc-net') + provides=('openrc-timed') + conflicts=('ntp' + 'ntp-openrc' + 'openrc' + 'openrc-git' + 'openrc-arch-services-git' + 'initscripts' + 'systemd-sysvcompat') + backup=('etc/conf.d/ntpd') + install=openntpd.install + + _inst_confd 'ntpd' + _inst_initd 'ntpd' + + sed -e 's|/usr/sbin|/usr/bin|g' \ + -i "${pkgdir}/etc/init.d/ntpd" } package_openldap-openrc() { - pkgdesc="OpenRC openldap init script" - depends=('openrc-core' 'openldap') - backup=('etc/conf.d/slapd') - install=openldap.install + pkgdesc="OpenRC openldap init script" + depends=('openrc-core' 'openldap') + backup=('etc/conf.d/slapd') + install=openldap.install - install -Dm755 "${srcdir}/${_Cldap}" "${pkgdir}/etc/conf.d/slapd" - install -Dm755 "${srcdir}/${_Ildap}" "${pkgdir}/etc/init.d/slapd" + _inst_confd 'slapd' + _inst_initd 'slapd' - local _p1='s|/usr/lib/openldap/slapd|/usr/lib/slapd|g' - sed -e "${_shebang}" -e "${_binpath[0]}" -e "${_runpath}" -e "${_p1}" -i "${pkgdir}/etc/init.d/slapd" + sed -e 's|/usr/sbin|/usr/bin|g' \ + -e 's|/usr/lib/openldap/slapd|/usr/lib/slapd|g' \ + -i "${pkgdir}/etc/init.d/slapd" } package_openslp-openrc() { - pkgdesc="OpenRC openslp init script" - depends=('openrc-core' 'openslp') - install=openslp.install + pkgdesc="OpenRC openslp init script" + depends=('openrc-core' 'openslp') + install=openslp.install - install -Dm755 "${srcdir}/${_Islp}" "${pkgdir}/etc/init.d/slpd" + _inst_initd 'slpd' - sed -e "${_shebang}" -e "${_binpath[0]}" -e "${_runpath}" -i "${pkgdir}/etc/init.d/slpd" + sed -e 's|/usr/sbin|/usr/bin|g' \ + -i "${pkgdir}/etc/init.d/slpd" } package_openssh-openrc() { - pkgdesc="OpenRC openssh init script" - depends=('openrc-core' 'openssh') - optdepends=('bind-openrc: bind initscript') - backup=('etc/conf.d/sshd') - install=openssh.install + pkgdesc="OpenRC openssh init script" + depends=('openrc-core' 'openssh') + optdepends=('bind-openrc: bind initscript') + backup=('etc/conf.d/sshd') + install=openssh.install - install -Dm755 "${srcdir}/${_Cssh}" "${pkgdir}/etc/conf.d/sshd" - install -Dm755 "${srcdir}/${_Issh}" "${pkgdir}/etc/init.d/sshd" + _inst_confd 'sshd' + _inst_initd 'sshd' - sed -e "${_binpath[0]}" -e "${_runpath}" -i "${pkgdir}/etc/conf.d/sshd" - sed -e "${_shebang}" -e "${_binpath[0]}" -e "${_runpath}" -i "${pkgdir}/etc/init.d/sshd" + sed -e 's|/usr/sbin|/usr/bin|g' \ + -i "${pkgdir}/etc/conf.d/sshd" + + sed -e 's|/usr/sbin|/usr/bin|g' \ + -i "${pkgdir}/etc/init.d/sshd" } package_openvpn-openrc() { - pkgdesc="OpenRC openvpn init script" - depends=('openrc-core' 'openvpn') - backup=('etc/conf.d/openvpn') - install=openvpn.install + pkgdesc="OpenRC openvpn init script" + depends=('openrc-core' 'openvpn') + backup=('etc/conf.d/openvpn') + install=openvpn.install - install -Dm755 "${srcdir}/${_Cvpn}" "${pkgdir}/etc/conf.d/openvpn" - install -Dm755 "${srcdir}/${_Ivpn}" "${pkgdir}/etc/init.d/openvpn" + _inst_confd 'openvpn' + _inst_initd 'openvpn' - sed -e "${_shebang}" -e "${_binpath[0]}" -e "${_runpath}" -i "${pkgdir}/etc/init.d/openvpn" + sed -e 's|/usr/sbin|/usr/bin|g' \ + -i "${pkgdir}/etc/init.d/openvpn" } package_polipo-openrc() { - pkgdesc="OpenRC polipo init script" - depends=('openrc-core' 'polipo') - install=polipo.install + pkgdesc="OpenRC polipo init script" + depends=('openrc-core' 'polipo') + install=polipo.install - install -Dm755 "${srcdir}/${_Ipolip}" "${pkgdir}/etc/init.d/polipo" + _inst_initd 'polipo' - sed -e "${_shebang}" -e "${_binpath[0]}" -e "${_runpath}" -i "${pkgdir}/etc/init.d/polipo" + sed -e 's|/usr/sbin|/usr/bin|g' \ + -i "${pkgdir}/etc/init.d/polipo" } package_postfix-openrc() { - pkgdesc="OpenRC postfix init script" - depends=('openrc-core' 'postfix') - optdepends=('bind-openrc: bind initscript' + pkgdesc="OpenRC postfix init script" + depends=('openrc-core' 'postfix') + optdepends=('bind-openrc: bind initscript' 'ypbind-openrc: ypbind initscript' 'cyrus-sasl-openrc: cyrus-sasl initscript') - install=postfix.install + install=postfix.install - install -Dm755 "${srcdir}/${_Ipostfix}" "${pkgdir}/etc/init.d/postfix" + _inst_initd 'postfix' - sed -e "${_shebang}" -e "${_binpath[0]}" -e "${_runpath}" -i "${pkgdir}/etc/init.d/postfix" + sed -e 's|/usr/sbin|/usr/bin|g' \ + -i "${pkgdir}/etc/init.d/postfix" } package_privoxy-openrc() { - pkgdesc="OpenRC privoxy init script" - depends=('openrc-core' 'privoxy') - install=privoxy.install + pkgdesc="OpenRC privoxy init script" + depends=('openrc-core' 'privoxy') + install=privoxy.install - install -Dm755 "${srcdir}/${_Ipriv}" "${pkgdir}/etc/init.d/privoxy" + _inst_initd 'privoxy' - sed -e "${_shebang}" -e "${_binpath[0]}" -e "${_runpath}" -i "${pkgdir}/etc/init.d/privoxy" + sed -e "${_shebang}" \ + -e 's|/usr/sbin|/usr/bin|g' \ + -e "${_runpath}" \ + -i "${pkgdir}/etc/init.d/privoxy" } package_quota-tools-openrc() { - pkgdesc="OpenRC quota-tools init script" - depends=('quota-tools' 'rpcbind-openrc') - optdepends=('ypbind-openrc: ypbind initscript') - backup=('etc/conf.d/quota') - install=quota-tools.install - - install -Dm755 "${srcdir}/${_Cquota}" "${pkgdir}/etc/conf.d/quota" - install -Dm755 "${srcdir}/${_Iquota1}" "${pkgdir}/etc/init.d/quota" - install -Dm755 "${srcdir}/${_Iquota2}" "${pkgdir}/etc/init.d/rpc.rquotad" + pkgdesc="OpenRC quota-tools init script" + depends=('quota-tools' 'rpcbind-openrc') + optdepends=('ypbind-openrc: ypbind initscript') + backup=('etc/conf.d/quota') + install=quota-tools.install + _inst_confd 'quota' + _inst_initd 'quota' + _inst_initd 'rpc.rquotad' - for f in ${pkgdir}/etc/init.d/*;do - sed -e "${_shebang}" -e "${_binpath[0]}" -e "${_runpath}" -i $f - done + for f in ${pkgdir}/etc/init.d/*;do + sed -e 's|/usr/sbin|/usr/bin|g' \ + -i $f + done } package_rsync-openrc() { - pkgdesc="OpenRC rsync init script" - depends=('openrc-core' 'rsync') - backup=('etc/conf.d/rsyncd') - install=rsync.install + pkgdesc="OpenRC rsync init script" + depends=('openrc-core' 'rsync') + backup=('etc/conf.d/rsyncd') + install=rsync.install - install -Dm755 "${srcdir}/${_Crsync}" "${pkgdir}/etc/conf.d/rsyncd" - install -Dm755 "${srcdir}/${_Irsync}" "${pkgdir}/etc/init.d/rsyncd" + _inst_confd 'rsyncd' + _inst_initd 'rsyncd' - sed -e "${_shebang}" -e "${_binpath[0]}" -e "${_runpath}" -i "${pkgdir}/etc/init.d/rsyncd" + sed -e 's|/usr/sbin|/usr/bin|g' \ + -i "${pkgdir}/etc/init.d/rsyncd" } package_samba-openrc() { - pkgdesc="OpenRC samba init script" - depends=('openrc-core' 'samba') - backup=('etc/conf.d/smb') - install=samba.install + pkgdesc="OpenRC samba init script" + depends=('openrc-core' 'samba') + backup=('etc/conf.d/smb') + install=samba.install - install -Dm755 "${srcdir}/${_Csmb}" "${pkgdir}/etc/conf.d/smb" - install -Dm755 "${srcdir}/${_Ismb}" "${pkgdir}/etc/init.d/smb" + _inst_confd 'smb' + _inst_initd 'smb' - local _p1='s/="samba"/="smb"/' - sed -e "${_binpath[0]}" -e ${_p1} -i "${pkgdir}/etc/conf.d/smb" + sed -e 's|/usr/sbin|/usr/bin|g' \ + -e 's/="samba"/="smb"/' \ + -i "${pkgdir}/etc/conf.d/smb" - _p1='s/##samba/##smb/' - local _p2='s|"samba"|"smb"|' - sed -e "${_shebang}" -e "${_binpath[0]}" -e "${_runpath}" -e ${_p1} -e ${_p2} -i "${pkgdir}/etc/init.d/smb" + sed -e 's|/usr/sbin|/usr/bin|g' \ + -e 's/##samba/##smb/' \ + -e 's|"samba"|"smb"|' \ + -i "${pkgdir}/etc/init.d/smb" } package_squid-openrc() { - pkgdesc="OpenRC squid init script" - depends=('openrc-core' 'squid') - optdepends=('bind-openrc: bind initscript') - backup=('etc/conf.d/squid') - install=squid.install + pkgdesc="OpenRC squid init script" + depends=('openrc-core' 'squid') + optdepends=('bind-openrc: bind initscript') + backup=('etc/conf.d/squid') + install=squid.install - install -Dm755 "${srcdir}/${_Csquid}" "${pkgdir}/etc/conf.d/squid" - install -Dm755 "${srcdir}/${_Isquid}" "${pkgdir}/etc/init.d/squid" + _inst_confd 'squid' + _inst_initd 'squid' - local _p1='s|chown squid|chown proxy|' \ - _p2='s|squid:squid|proxy:proxy|' - sed -e "${_shebang}" -e "${_binpath[0]}" -e "${_runpath}" -e "${_p1}" -e "${_p2}" -i "${pkgdir}/etc/init.d/squid" + sed -e 's|/usr/sbin|/usr/bin|g' \ + -e 's|chown squid|chown proxy|' \ + -e 's|squid:squid|proxy:proxy|' \ + -i "${pkgdir}/etc/init.d/squid" } package_transmission-openrc() { - pkgdesc="OpenRC transmission init script" - depends=('openrc-core' 'transmission-cli') - backup=('etc/conf.d/transmission-daemon') - install=transmission.install + pkgdesc="OpenRC transmission init script" + depends=('openrc-core' 'transmission-cli') + backup=('etc/conf.d/transmission-daemon') + install=transmission.install - install -Dm755 "${srcdir}/${_Ctrans}" "${pkgdir}/etc/conf.d/transmission-daemon" - install -Dm755 "${srcdir}/${_Itrans}" "${pkgdir}/etc/init.d/transmission-daemon" - - sed -e "${_shebang}" -e "${_runpath}" -i "${pkgdir}/etc/init.d/transmission-daemon" + _inst_confd 'transmission-daemon' + _inst_initd 'transmission-daemon' } package_ufw-openrc() { - pkgdesc="OpenRC ufw init script" - depends=('openrc-core' 'ufw') - backup=('etc/conf.d/ufw') - install=ufw.install + pkgdesc="OpenRC ufw init script" + depends=('openrc-core' 'ufw') + backup=('etc/conf.d/ufw') + install=ufw.install - install -Dm755 "${srcdir}/${_Cufw}" "${pkgdir}/etc/conf.d/ufw" - install -Dm755 "${srcdir}/${_Iufw}" "${pkgdir}/etc/init.d/ufw" + _inst_confd 'ufw' + _inst_initd 'ufw' - local _p1='s|/usr/share/ufw/ufw-init-functions|/usr/lib/ufw/ufw-init-functions|g' - sed -e "${_shebang}" -e "${_binpath[0]}" -e "${_runpath}" -e "${_p1}" -i "${pkgdir}/etc/init.d/ufw" + sed -e 's|/usr/sbin|/usr/bin|g' \ + -e 's|/usr/share/ufw/ufw-init-functions|/usr/lib/ufw/ufw-init-functions|g' \ + -i "${pkgdir}/etc/init.d/ufw" } package_vsftpd-openrc() { - pkgdesc="OpenRC vsftpd init script" - depends=('openrc-core' 'vsftpd') - optdepends=('bind-openrc: bind initscript') - install=vsftpd.install + pkgdesc="OpenRC vsftpd init script" + depends=('openrc-core' 'vsftpd') + optdepends=('bind-openrc: bind initscript') + install=vsftpd.install + + _inst_initd 'vsftpd' + + install -Dm755 "${srcdir}/vsftpd-checkconfig.sh" "${pkgdir}/usr/lib/vsftpd-checkconfig.sh" - install -Dm755 "${srcdir}/${_Ivsftp}" "${pkgdir}/etc/init.d/vsftpd" - install -Dm755 "${srcdir}/${_Svsftp}" "${pkgdir}/usr/lib/vsftpd-checkconfig.sh" + sed -e 's|/usr/sbin|/usr/bin|g' \ + -e 's|/usr/libexec/|/usr/lib/|g' \ + -e 's|/etc/vsftpd/|/etc/|g' \ + -i "${pkgdir}/etc/init.d/vsftpd" - local _p1='s|/usr/libexec/|/usr/lib/|g' \ - _p2='s|/etc/vsftpd/|/etc/|g' - sed -e "${_shebang}" -e "${_binpath[0]}" -e "${_runpath}" -e "${_p1}" -e "${_p2}" -i "${pkgdir}/etc/init.d/vsftpd" - sed -e "${_p2}" -i "${pkgdir}/usr/lib/vsftpd-checkconfig.sh" + sed -e 's|/etc/vsftpd/|/etc/|g' \ + -i "${pkgdir}/usr/lib/vsftpd-checkconfig.sh" } package_xinetd-openrc() { - pkgdesc="OpenRC xinetd init script" - depends=('openrc-core' 'xinetd') - backup=('etc/conf.d/xinetd') - install=xinetd.install + pkgdesc="OpenRC xinetd init script" + depends=('openrc-core' 'xinetd') + backup=('etc/conf.d/xinetd') + install=xinetd.install - install -Dm755 "${srcdir}/${_Cxinet}" "${pkgdir}/etc/conf.d/xinetd" - install -Dm755 "${srcdir}/${_Ixinet}" "${pkgdir}/etc/init.d/xinetd" + _inst_confd 'xinetd' + _inst_initd 'xinetd' - sed -e "${_shebang}" -e "${_binpath[0]}" -e "${_runpath}" -i "${pkgdir}/etc/init.d/xinetd" + sed -e 's|/usr/sbin|/usr/bin|g' \ + -i "${pkgdir}/etc/init.d/xinetd" } package_ypbind-mt-openrc() { - pkgdesc="OpenRC ypbind-mt init script" - depends=('ypbind-mt' 'rpcbind-openrc' 'openslp-openrc') - optdepends=('ypserv-openrc: ypserv initscript') - backup=('etc/conf.d/ypbind') - install=ypbind-mt.install + pkgdesc="OpenRC ypbind-mt init script" + depends=('ypbind-mt' 'rpcbind-openrc' 'openslp-openrc') + optdepends=('ypserv-openrc: ypserv initscript') + backup=('etc/conf.d/ypbind') + install=ypbind-mt.install - install -Dm755 "${srcdir}/${_Cypbind}" "${pkgdir}/etc/conf.d/ypbind" - install -Dm755 "${srcdir}/${_Iypbind}" "${pkgdir}/etc/init.d/ypbind" + _inst_confd 'ypbind' + _inst_initd 'ypbind' - sed -e "${_shebang}" -e "${_binpath[0]}" -e "${_runpath}" -i "${pkgdir}/etc/init.d/ypbind" + sed -e 's|/usr/sbin|/usr/bin|g' \ + -i "${pkgdir}/etc/init.d/ypbind" } package_ypserv-openrc() { - pkgdesc="OpenRC ypserv init script" - depends=('openrc-core' 'ypserv') - backup=('etc/conf.d/rpc.yppasswdd' - 'etc/conf.d/rpc.ypxfrd' - 'etc/conf.d/ypserv') - install=ypserv.install + pkgdesc="OpenRC ypserv init script" + depends=('openrc-core' 'ypserv') + backup=('etc/conf.d/rpc.yppasswdd' + 'etc/conf.d/rpc.ypxfrd' + 'etc/conf.d/ypserv') + install=ypserv.install + + _inst_confd 'ypserv' + _inst_initd 'ypserv' + + _inst_confd 'rpc.yppasswdd' + _inst_initd 'rpc.yppasswdd' - install -Dm755 "${srcdir}/${_Cypserv1}" "${pkgdir}/etc/init.d/ypserv" - install -Dm755 "${srcdir}/${_Iypserv1}" "${pkgdir}/etc/conf.d/ypserv" - install -Dm755 "${srcdir}/${_Cypserv2}" "${pkgdir}/etc/conf.d/rpc.yppasswdd" - install -Dm755 "${srcdir}/${_Iypserv2}" "${pkgdir}/etc/init.d/rpc.yppasswdd" - install -Dm755 "${srcdir}/${_Cypserv3}" "${pkgdir}/etc/conf.d/rpc.ypxfrd" - install -Dm755 "${srcdir}/${_Iypserv3}" "${pkgdir}/etc/init.d/rpc.ypxfrd" + _inst_confd 'rpc.ypxfrd' + _inst_initd 'rpc.ypxfrd' - for f in ${pkgdir}/etc/init.d/*;do - sed -e "${_shebang}" -e "${_binpath[0]}" -e "${_runpath}" -i $f - done + for f in ${pkgdir}/etc/init.d/*;do + sed -e 's|/usr/sbin|/usr/bin|g' \ + -i $f + done } package_tor-openrc() { - pkgdesc="OpenRC tor init script" - depends=('openrc-core' 'tor') - backup=('etc/conf.d/tor') - install=tor.install + pkgdesc="OpenRC tor init script" + depends=('openrc-core' 'tor') + backup=('etc/conf.d/tor') + install=tor.install - install -Dm755 "${srcdir}/${_Ctor}" "${pkgdir}/etc/conf.d/tor" - install -Dm755 "${srcdir}/${_Itor}" "${pkgdir}/etc/init.d/tor" - - sed -e "${_shebang}" -e "${_runpath}" -i "${pkgdir}/etc/init.d/tor" + _inst_confd 'tor' + _inst_initd 'tor' } package_wicd-openrc() { - pkgdesc="OpenRC wicd script" - depends=('openrc-core' 'wicd') - install=wicd.install + pkgdesc="OpenRC wicd script" + depends=('openrc-core' 'wicd') + install=wicd.install - install -Dm755 "${srcdir}/${_Iwicd}" "${pkgdir}/etc/init.d/wicd" + _inst_initd 'wicd' } package_syncthing-openrc() { - pkgdesc="OpenRC syncthing init script" - depends=('openrc-core' 'syncthing') - backup=('etc/conf.d/syncthing') - install=syncthing.install - - install -Dm755 "${srcdir}/${_CSync}" "${pkgdir}/etc/conf.d/syncthing" - install -Dm755 "${srcdir}/${_ISync}" "${pkgdir}/etc/init.d/syncthing" + pkgdesc="OpenRC syncthing init script" + depends=('openrc-core' 'syncthing') + backup=('etc/conf.d/syncthing') + install=syncthing.install + _inst_confd 'syncthing' + _inst_initd 'syncthing' } package_nginx-openrc() { - pkgdesc="OpenRC nginx init script" - depends=('openrc-core' 'nginx') - install=nginx.install + pkgdesc="OpenRC nginx init script" + depends=('openrc-core' 'nginx') + install=nginx.install - install -Dm755 "${srcdir}/${_Inginx}" "${pkgdir}/etc/init.d/nginx" + _inst_initd 'nginx' - sed -e "${_shebang}" -e "${_binpath[0]}" -i "${pkgdir}/etc/init.d/nginx" + sed -e 's|/usr/sbin|/usr/bin|g' \ + -i "${pkgdir}/etc/init.d/nginx" } -sha256sums=('8e093a18582c3a20283ed1c09de9acc6832a80b1d5a02962599db0535d38af19' - '3cf1ab72446cb9417de916e4cd732f2056fb74d2c6f03da6741b7bae8c415448' - '55024fe0e2b491b5cb490a9f575bad3096d446f20f8d52778d778fd26a415d52' - 'a095def10c3b7e6894a6d782c70cbe176c7b53f36386dcc4b1e5bc75424e29f0' - 'e8a413e9102948b336f60041fc3cade33125faf56d8319ee65d9f3c63199a8e7' - 'a157630c3bdc9565cca8240ee1e6539fc9cbc1e4642c40e0965e3609d1021bac' - '099f668e1ad42ed9446b15675032a1186715d1fe9e4a1b24dfb787e68495d2b6' - 'b5811c6adf10d6210e5685b4e999f0449ac492379d055226eeb140f00d9b8702' - '204aaf81d51dc119cee1d1ff3ae3dd50af666af2f8b2a363fd1bf442d4dcee00' - '916f4b14095ee4ec8a510391c883e9f01868e18d79a3d5cbeb13a104a793d45d' - 'b9701b9ea509638ee1ed74bec38a22e6bd7358763497ce53c146d2faf9e97a61' - '7e2341211ca14997b7a8a1f930f94db855291af597c568f680f80031c20d45b6' - '2938fe4206514d9868047bd8f888a699fa2097ca69edab176453436d4259abaa' - '13047698e03079b754957e1e548ce7505dfb2c73c9a31f87e061140603ab0e44' - '3e55c79f19aaa6ef6b64a621c03dbb2eac3ad923916dc803f4c1bfe48ce89fbb' - '709309dea043aa306c2fcf0960e0993a6db540c220de64cf92d6b85f1cca23c5' - 'c374ea05d7e9f15e10c8f9dbd0cad6548e0f92aef7de33e5dbc27222e9407e7b' - 'bb6e6721f33e6582a91025f3500e159a599fb856d699e9394093e1018c7925e0' - 'b1515472c32927039b38f6c3a797cbc54a5a300b5d6fa54df9550174afa2b7f8' - 'c652a4fe8a43dc68a818345db2b3acc560663b5b6c969324d4f23afb0fb96a94' - '1e77bc6fb2ceb266f724818898bd42bec47512a5a7ede6660e0565ea1c58d619' - 'e8842fca856eae598fb8fe15ed8d3cef13e61851217be66b8cc4087af8cee8ad' - '122ade9931af8f64696375c9c66d00f64a90949616e00e9a00a7264c50c2e8a7' - '3ce65326859c43983dad25ad2d4731488c488037796e39b6b5eda336e8bf81ef' - 'ebee63e81fb952474c34b745913e8774b29c9cc65180d363a33d991e478aea2d' - '00d9c29280a83e8458c33139d04a9b38c6fdba9d7cb9b420ca83bf6b10e6435d' - 'f1c460d8b0e91e54a551397d755135d05a3728d81de596535bf8bda074455677' - 'a5731b8f681111421277c6c1c43b3e1d303790d9f8aebd977a895b0ed7a73bc3' - '5bca003ec3b67c7c78519aede1d82002579006ccfecce8f87b559df719f82e92' - '1fc515a6816b8a750db513df0b3b9bf8dd8bd4c4e9051205521acadfdebeae0f' - '7f228796e020c0779c52683f684197d50662ae890b1ae193ffa9acf157ccd143' - '29c6d57ac3ec6018cadc6ba6cd9b90c9ed46e20049b970fdcc68ee2481a2ee41' - '97221a017d8ee9de996277c5a794d973a0b5e8180c29c97b3652bd1984a7b5d0' - 'ff37dacce4551b6ef9866435d586b014aae5fef5b6c3ae7ba839165514644765' - '51f4bffa535d891f94d4a20ca2a4a42cc99189f3de78cee1c8d235e4a9d1721d' - '224496b498b4f692ae3316a95b5c7c8b6230dcd5fee0ca163956a7acde243de9' - '00d1dfb3b893db5d6a213a4edda622c7d64dcafa40b3019f15e070c164286632' - '00ce705b49aaa356d9d9f0be3b80a3fe2810471cbe02fd0edc66349f3ca281de' - 'c3896303d6cfebf314a3f6b8aeed0f6cb6ae421c4c0923b0121c76b3251314e5' - '6561ae40c5899a9f7a12f1f0867bec47d47c7cc3c583574ffcecbbf6f8d8afbb' - 'de758791b16b89a648c01867af7f51bc9bd44e40cbe868e439b753ff5d9572e5' - 'baff64277f9aa62cf1eeed2284bb08c4f3078a8e6e7604e4fec228ca5fa9dd82' - '53755809cc27fdbaf98752cd3da45b5c2bda62dd46fcc37570c6e237f7954ffa' - '9f4eaba0b966fd30351fa66cac9a666b5ec1dc54035ddad94c61a2f43dcb2d62' - '214a184495a3384eb452caef435256043bc51e35140a61b1f5fdff32603c8f7e' - '3830cb94600ac658a6ff1f9f31bdbece64caf3ad23c62ae0a887d152970125f5' - '249689688aad23d0d27ccdd08a0907fd85058d6a52ccd3467f756b07f5d059ee' - '06d047b47befe6aaf1b1542fdd50e84ea38e0fef004b5095f6096f33fa1901a3' - '069aa7382b40aecebf26ef53f3f4c49890314e0357925c84b3c15f1d0b913be0' - '657b5305923b2a5de9eb96931aaaa28d6e997ace6c40793d905887798094258c' - '2de7c7c1edfe3ae0480e22d988a564db3bb873050929ebb6e8361d7a1288ddda' - '4297952eeeb02b5c4f2f750742614513fa6a0c8d291a9a0adcec1ec0098fcd78' - 'e401e2cf7c0180a170d3dc3e91d7e98002bae7b013df72813b7bcf89b864fb3a' - '6aeb4ec9b8ccc062b5ee8c609830c05cee3ed790fa90d7b2d8cf82a09e317c5c' - '79f6c6ed4875f00fe702f69e9a6180a032d5a47f3e58e892e6ba0e2746b6fec8' - '3cdd6872fae15dc8533b3f75ac36ad59ffb946a3f1b445d688629c621cebbe34' - '4edd475ca95d31cfcea20a8e6268024f8128423bc7ae67edb535e6811c64668e' - 'e46afe737bfc57aa31be1a441615fcc112e1ebf41d631c1929e00b81baca119d' - 'bd1f245a362f85319e83965e8b825e66e686a4a0bf185ab8ec51fd335bc873c2' - '08db79845b497f2ec8938854ffac904aeed747d98c0820ad0be9e5aa9377512b' - 'e827778b8a8e6984b637c745c315a2e02ebc46af752651b7a70626ba545a84b6' - 'a6445dd607093fdafb013e5896f60d78223549b38c96300fe239bcf5dbf2a8de' - 'f2c44e5018719f644e194a4e8e43390bdc9926c533f79c41f0abf84879799d05' - '330149a83684ddabe413d134d4c8efad4c88b18c2ab67165014deff5f7fffad2' - 'd1b1f8a00935d77521bceb62535350444df3470fa45f4d33c3934051a1bb595b' - '91fb1497b3a6ef0bb3a3d5baefdff801d8ff1cba27aaf742303415550814a09b' - 'fca7183a7676f0f471878925c8fbec20b7a0bff01551c0ad2b34d4d8a826c876' - '41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b75384c25c' - '17cfda4d50a3d3fd74f36c79dec78b5f89fe6b45712729d8bbdbddd7e8ea9a10' - '66b2b53b077ddc2d5eb1d81faa99fa0f4f0db01520900ba948001e539bfe02d8' - 'eb4a4315916fe3f8688c1da5bb5c249a1f402e61617452288d5b0668078c955c' - '63708b1a7b61ae791df64bb4cefa01dc12236f96bb67fe6d0b2c513e11c81f3e' - '9d5fca09d0161446a5cec30a0694cdc0656469403a008920a52a190051218b36') diff --git a/pcr/openrc-net/autofs5.initd b/pcr/openrc-net/autofs5.initd deleted file mode 100644 index 939444e02..000000000 --- a/pcr/openrc-net/autofs5.initd +++ /dev/null @@ -1,70 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs5.initd,v 1.4 2013/11/10 15:53:29 tomwij Exp $ - -DAEMON=/usr/sbin/automount -PIDFILE=/var/run/autofs.pid -DEVICE=autofs - -depend() { - need localmount - use ypbind nfs slapd portmap net -} - -extra_started_commands="reload" - -start() { - ebegin "Starting automounter" - - # Ensure autofs support is loaded - grep -q autofs /proc/filesystems || modprobe -q autofs4 - if [ $? -ne 0 ]; then - eend 1 "No autofs support available in kernel" - return 1 - fi - - # Check misc device - if [ -n "${USE_MISC_DEVICE}" -a "${USE_MISC_DEVICE}" = "yes" ]; then - sleep 1 - if [ -e "/proc/misc" ]; then - MINOR=$(awk "/${DEVICE}/ {print \$1}" /proc/misc) - if [ -n "${MINOR}" -a ! -c "/dev/${DEVICE}" ]; then - mknod -m 0600 "/dev/${DEVICE}" c 10 ${MINOR} - if [ $? -ne 0 ]; then - eend 1 "Could not create '/dev/${DEVICE}'" - return 1 - fi - fi - fi - if [ -x /sbin/restorecon -a -c "/dev/${DEVICE}" ]; then - /sbin/restorecon "/dev/${DEVICE}" - if [ $? -ne 0 ]; then - eend 1 "Failed to execute '/sbin/restorecon \"/dev/${DEVICE}\"'" - return 1 - fi - fi - else - [ -c "/dev/${DEVICE}" ] && rm -rf "/dev/${DEVICE}" - fi - - start-stop-daemon --start --exec ${DAEMON} -- -p ${PIDFILE} ${OPTIONS} - - eend $? -} - -stop() { - ebegin "Stopping automounter" - start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE} - eend $? -} - -reload() { - ebegin "Reloading automounter" - if [ ! -r "${PIDFILE}" ]; then - eend 1 "automount not running" - else - kill -s HUP $(cat "${PIDFILE}") 2> /dev/null - eend $? - fi -} diff --git a/pcr/openrc-net/dhcpd.conf2 b/pcr/openrc-net/dhcpd.conf2 deleted file mode 100644 index 5cd2eeca3..000000000 --- a/pcr/openrc-net/dhcpd.conf2 +++ /dev/null @@ -1,28 +0,0 @@ -# /etc/conf.d/dhcpd: config file for /etc/init.d/dhcpd - -# If you require more than one instance of dhcpd you can create symbolic -# links to dhcpd service like so -# cd /etc/init.d -# ln -s dhcpd dhcpd.foo -# cd ../conf.d -# cp dhcpd dhcpd.foo -# Now you can edit dhcpd.foo and specify a different configuration file. -# You'll also need to specify a pidfile in that dhcpd.conf file. -# See the pid-file-name option in the dhcpd.conf man page for details. - -# If you wish to run dhcpd in a chroot, uncomment the following line -# DHCPD_CHROOT="/var/lib/dhcp/chroot" - -# All file paths below are relative to the chroot. -# You can specify a different chroot directory but MAKE SURE it's empty. - -# Specify a configuration file - the default is /etc/dhcp/dhcpd.conf -# DHCPD_CONF="/etc/dhcp/dhcpd.conf" - -# Configure which interface or interfaces to for dhcpd to listen on. -# List all interfaces space separated. If this is not specified then -# we listen on all interfaces. -# DHCPD_IFACE="" - -# Insert any other dhcpd options - see the man page for a full list. -# DHCPD_OPTS="" diff --git a/pcr/openrc-net/dhcpd.init5 b/pcr/openrc-net/dhcpd.init5 deleted file mode 100644 index 65148e08d..000000000 --- a/pcr/openrc-net/dhcpd.init5 +++ /dev/null @@ -1,115 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init5,v 1.6 2015/02/10 00:27:08 polynomial-c Exp $ - -extra_commands="configtest" - -: ${DHCPD_CONF:=/etc/dhcp/${SVCNAME}.conf} - -depend() { - need net - use logger dns #@slapd@ -} - -get_var() { - local var="$(sed -n 's/^[[:blank:]]\?'"$1"' "*\([^#";]\+\).*/\1/p' "${chroot}${DHCPD_CONF}")" - echo ${var:-$2} -} - -checkconfig() { - set -- ${DHCPD_OPTS} ${chroot:+-chroot} ${chroot} -t - - dhcpd "$@" 1>/dev/null 2>&1 - local ret=$? - if [ ${ret} -ne 0 ] ; then - eerror "${SVCNAME} has detected a syntax error in your configuration files:" - dhcpd "$@" - fi - - return ${ret} -} - -configtest() { - local chroot=${DHCPD_CHROOT%/} - - ebegin "Checking ${SVCNAME} configuration" - checkconfig - eend $? -} - -start() { - local chroot=${DHCPD_CHROOT%/} - - # Work out our cffile if it's in our DHCPD_OPTS - case " ${DHCPD_OPTS} " in - *" -cf "*) - DHCPD_CONF=" ${DHCPD_OPTS} " - DHCPD_CONF="${DHCPD_CONF##* -cf }" - DHCPD_CONF="${DHCPD_CONF%% *}" - ;; - *) DHCPD_OPTS="${DHCPD_OPTS} -cf ${DHCPD_CONF}" - ;; - esac - - if [ -n "${chroot}" ] ; then - # the config test want's these to exist - mkdir -p \ - "${chroot}"/var/run/dhcp \ - "${chroot}"/var/lib/dhcp \ - "${chroot}"/etc/dhcp - fi - - # see comment in get_var() above - if [ ! -f "${chroot}${DHCPD_CONF}" ] ; then - eerror "${chroot}${DHCPD_CONF} does not exist" - return 1 - fi - - checkconfig || return 1 - - checkpath -d -o dhcp:dhcp "${chroot}"/var/run/dhcp "${chroot}"/var/lib/dhcp - - local leasefile="$(get_var lease-file-name /var/lib/dhcp/${SVCNAME}.leases)" - checkpath -f -o dhcp:dhcp "${chroot}${leasefile}" - - # Setup LD_PRELOAD so name resolution works in our chroot. - if [ -n "${chroot}" ] ; then - checkpath -d -o root:root -m 755 "${chroot}"/dev "${chroot}"/etc "${chroot}"/proc - cp -pP /etc/localtime /etc/resolv.conf "${chroot}"/etc/ - export LD_PRELOAD="${LD_PRELOAD} libresolv.so libnss_dns.so" - if ! mountinfo -q "${chroot}/proc" ; then - mount --bind /proc "${chroot}/proc" - fi - fi - - local pidfile="$(get_var pid-file-name /var/run/dhcp/${SVCNAME}.pid)" - - ebegin "Starting ${chroot:+chrooted }${SVCNAME}" - start-stop-daemon --start --exec /usr/sbin/dhcpd \ - --pidfile "${chroot}/${pidfile}" \ - -- ${DHCPD_OPTS} -q -pf "${pidfile}" -lf "${leasefile}" \ - -user dhcp -group dhcp \ - ${chroot:+-chroot} ${chroot} ${DHCPD_IFACE} - eend $? \ - && save_options dhcpd_chroot "${chroot}" \ - && save_options pidfile "${pidfile}" -} - -stop() { - local chroot="$(get_options dhcpd_chroot)" - [ -z "$chroot" ] && chroot="$(get_options chroot)" - - ebegin "Stopping ${chroot:+chrooted }${SVCNAME}" - start-stop-daemon --stop --exec /usr/sbin/dhcpd \ - --pidfile "${chroot}/$(get_options pidfile)" - res=$? - - if [ ${res} -eq 0 ] && [ -n "${chroot}" ] ; then - if mountinfo -q "${chroot}/proc" ; then - umount "${chroot}/proc" - fi - fi - - eend $res -} diff --git a/pcr/openrc-net/dhcrelay.conf b/pcr/openrc-net/dhcrelay.conf deleted file mode 100644 index 44699682d..000000000 --- a/pcr/openrc-net/dhcrelay.conf +++ /dev/null @@ -1,16 +0,0 @@ -# /etc/conf.d/dhcrelay: config file for /etc/init.d/dhcrelay - -# Configure which interface or interfaces to for dhcrelay to listen on -# and send to. -# List all interfaces space separated. If this is not specified then -# we use all interfaces. -#IFACE="" -# If you have split net interfaces, you might want to depend on them -# explicitly here. -#rc_need=$(printf 'net.%s ' ${IFACE}) - -# Insert any other options needed. See dhcrelay(8) for details. -#DHCRELAY_OPTS="" - -# Space separated list of IPs to forward BOOTP/DHCP packets to. -DHCRELAY_SERVERS="" diff --git a/pcr/openrc-net/dhcrelay.init3 b/pcr/openrc-net/dhcrelay.init3 deleted file mode 100644 index fe4ec8c6d..000000000 --- a/pcr/openrc-net/dhcrelay.init3 +++ /dev/null @@ -1,34 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.init3,v 1.3 2012/11/11 21:42:02 vapier Exp $ - -depend() { - need net - use logger #@slapd@ -} - -start() { - if [ -z "${DHCRELAY_SERVERS}" ] ; then - eerror "No DHCRELAY_SERVERS specified in /etc/conf.d/${SVCNAME}" - return 1 - fi - - checkpath -d /var/run/dhcp - - local iface_opts - if [ -n "${IFACE}" ] ; then - iface_opts=$(printf -- '-i %s ' ${IFACE}) - fi - - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --exec /usr/sbin/dhcrelay \ - -- -q ${iface_opts} ${DHCRELAY_OPTS} ${DHCRELAY_SERVERS} - eend $? -} - -stop() { - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --pidfile /var/run/dhcp/${SVCNAME}.pid - eend $? -} diff --git a/pcr/openrc-net/dhcrelay6.conf b/pcr/openrc-net/dhcrelay6.conf deleted file mode 100644 index 4e8b8c6fe..000000000 --- a/pcr/openrc-net/dhcrelay6.conf +++ /dev/null @@ -1,8 +0,0 @@ -# /etc/conf.d/dhcrelay6: config file for /etc/init.d/dhcrelay6 - -# Insert any other options needed. See dhcrelay(8) for details. -# Make sure you specify the lower (-l)/upper (-u) interfaces. -DHCRELAY_OPTS="-6 -l lower-iface -u upper-iface" - -# Space separated list of IPs to forward BOOTP/DHCP packets to. -DHCRELAY_SERVERS="" diff --git a/pcr/openrc-net/hostapd-conf.d b/pcr/openrc-net/hostapd-conf.d deleted file mode 100644 index 7d05735eb..000000000 --- a/pcr/openrc-net/hostapd-conf.d +++ /dev/null @@ -1,9 +0,0 @@ -# Space separated List of interfaces which needs to be started before -# hostapd -INTERFACES="wlan0" - -# Space separated list of configuration files -CONFIGS="/etc/hostapd/hostapd.conf" - -# Extra options to pass to hostapd, see hostapd(8) -OPTIONS="" diff --git a/pcr/openrc-net/hostapd-init.d b/pcr/openrc-net/hostapd-init.d deleted file mode 100644 index d09002b66..000000000 --- a/pcr/openrc-net/hostapd-init.d +++ /dev/null @@ -1,39 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-init.d,v 1.4 2014/03/21 19:47:14 gurligebis Exp $ - -pidfile="/run/${SVCNAME}.pid" -command="/usr/sbin/hostapd" -command_args="-P ${pidfile} -B ${OPTIONS} ${CONFIGS}" - -extra_started_commands="reload" - -depend() { - local myneeds= - for iface in ${INTERFACES}; do - myneeds="${myneeds} net.${iface}" - done - - [ -n "${myneeds}" ] && need ${myneeds} - use logger -} - -start_pre() { - local file - - for file in ${CONFIGS}; do - if [ ! -r "${file}" ]; then - eerror "hostapd configuration file (${CONFIG}) not found" - return 1 - fi - done -} - -reload() { - start_pre || return 1 - - ebegin "Reloading ${SVCNAME} configuration" - kill -HUP $(cat ${pidfile}) > /dev/null 2>&1 - eend $? -} diff --git a/pcr/openrc-net/ip6tables-1.4.13.confd b/pcr/openrc-net/ip6tables-1.4.13.confd deleted file mode 100644 index 3bb36989d..000000000 --- a/pcr/openrc-net/ip6tables-1.4.13.confd +++ /dev/null @@ -1,19 +0,0 @@ -# /etc/conf.d/ip6tables - -# Location in which iptables initscript will save set rules on -# service shutdown -IP6TABLES_SAVE="/var/lib/ip6tables/rules-save" - -# Options to pass to iptables-save and iptables-restore -SAVE_RESTORE_OPTIONS="-c" - -# Save state on stopping iptables -SAVE_ON_STOP="yes" - -# If you need to log iptables messages as soon as iptables starts, -# AND your logger does NOT depend on the network, then you may wish -# to uncomment the next line. -# If your logger depends on the network, and you uncomment this line -# you will create an unresolvable circular dependency during startup. -# After commenting or uncommenting this line, you must run 'rc-update -u'. -#rc_use="logger" diff --git a/pcr/openrc-net/iptables-1.4.13-r1.init b/pcr/openrc-net/iptables-1.4.13-r1.init deleted file mode 100644 index a63d07688..000000000 --- a/pcr/openrc-net/iptables-1.4.13-r1.init +++ /dev/null @@ -1,130 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.4.13-r1.init,v 1.3 2013/04/27 17:29:09 vapier Exp $ - -extra_commands="check save panic" -extra_started_commands="reload" - -iptables_name=${SVCNAME} -case ${iptables_name} in -iptables|ip6tables) ;; -*) iptables_name="iptables" ;; -esac - -iptables_bin="/sbin/${iptables_name}" -case ${iptables_name} in - iptables) iptables_proc="/proc/net/ip_tables_names" - iptables_save=${IPTABLES_SAVE};; - ip6tables) iptables_proc="/proc/net/ip6_tables_names" - iptables_save=${IP6TABLES_SAVE};; -esac - -depend() { - need localmount #434774 - before net -} - -set_table_policy() { - local chains table=$1 policy=$2 - case ${table} in - nat) chains="PREROUTING POSTROUTING OUTPUT";; - mangle) chains="PREROUTING INPUT FORWARD OUTPUT POSTROUTING";; - filter) chains="INPUT FORWARD OUTPUT";; - *) chains="";; - esac - local chain - for chain in ${chains} ; do - ${iptables_bin} -t ${table} -P ${chain} ${policy} - done -} - -checkkernel() { - if [ ! -e ${iptables_proc} ] ; then - eerror "Your kernel lacks ${iptables_name} support, please load" - eerror "appropriate modules and try again." - return 1 - fi - return 0 -} -checkconfig() { - if [ ! -f ${iptables_save} ] ; then - eerror "Not starting ${iptables_name}. First create some rules then run:" - eerror "/etc/init.d/${iptables_name} save" - return 1 - fi - return 0 -} - -start() { - checkconfig || return 1 - ebegin "Loading ${iptables_name} state and starting firewall" - ${iptables_bin}-restore ${SAVE_RESTORE_OPTIONS} < "${iptables_save}" - eend $? -} - -stop() { - if [ "${SAVE_ON_STOP}" = "yes" ] ; then - save || return 1 - fi - checkkernel || return 1 - ebegin "Stopping firewall" - local a - for a in $(cat ${iptables_proc}) ; do - set_table_policy $a ACCEPT - - ${iptables_bin} -F -t $a - ${iptables_bin} -X -t $a - done - eend $? -} - -reload() { - checkkernel || return 1 - checkrules || return 1 - ebegin "Flushing firewall" - local a - for a in $(cat ${iptables_proc}) ; do - ${iptables_bin} -F -t $a - ${iptables_bin} -X -t $a - done - eend $? - - start -} - -checkrules() { - ebegin "Checking rules" - ${iptables_bin}-restore --test ${SAVE_RESTORE_OPTIONS} < "${iptables_save}" - eend $? -} - -check() { - # Short name for users of init.d script. - checkrules -} - -save() { - ebegin "Saving ${iptables_name} state" - checkpath -q -d "$(dirname "${iptables_save}")" - checkpath -q -m 0600 -f "${iptables_save}" - ${iptables_bin}-save ${SAVE_RESTORE_OPTIONS} > "${iptables_save}" - eend $? -} - -panic() { - checkkernel || return 1 - if service_started ${iptables_name}; then - rc-service ${iptables_name} stop - fi - - local a - ebegin "Dropping all packets" - for a in $(cat ${iptables_proc}) ; do - ${iptables_bin} -F -t $a - ${iptables_bin} -X -t $a - - set_table_policy $a DROP - done - eend $? -} diff --git a/pcr/openrc-net/iptables-1.4.13.confd b/pcr/openrc-net/iptables-1.4.13.confd deleted file mode 100644 index 7225374c3..000000000 --- a/pcr/openrc-net/iptables-1.4.13.confd +++ /dev/null @@ -1,19 +0,0 @@ -# /etc/conf.d/iptables - -# Location in which iptables initscript will save set rules on -# service shutdown -IPTABLES_SAVE="/var/lib/iptables/rules-save" - -# Options to pass to iptables-save and iptables-restore -SAVE_RESTORE_OPTIONS="-c" - -# Save state on stopping iptables -SAVE_ON_STOP="yes" - -# If you need to log iptables messages as soon as iptables starts, -# AND your logger does NOT depend on the network, then you may wish -# to uncomment the next line. -# If your logger depends on the network, and you uncomment this line -# you will create an unresolvable circular dependency during startup. -# After commenting or uncommenting this line, you must run 'rc-update -u'. -#rc_use="logger" diff --git a/pcr/openrc-net/lighttpd.confd b/pcr/openrc-net/lighttpd.confd deleted file mode 100644 index f3afb07a5..000000000 --- a/pcr/openrc-net/lighttpd.confd +++ /dev/null @@ -1,12 +0,0 @@ -# /etc/conf.d/lighttpd - -# Location of a shell used by the 'include_shell' directive -# in the lighttpd's configuration file -#export SHELL="/bin/bash" - -# Location of the lighttpd configuration file -LIGHTTPD_CONF="/etc/lighttpd/lighttpd.conf" - -# Location of the lighttpd pid file -LIGHTTPD_PID="$(/usr/bin/awk '/^server.pid-file/{s=$3};{sub("\"","",s)};END{print s}' ${LIGHTTPD_CONF})" - diff --git a/pcr/openrc-net/lighttpd.initd b/pcr/openrc-net/lighttpd.initd deleted file mode 100644 index 43626c026..000000000 --- a/pcr/openrc-net/lighttpd.initd +++ /dev/null @@ -1,73 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.initd,v 1.22 2013/02/06 19:36:51 hwoarang Exp $ - -extra_started_commands="reload graceful" - -depend() { - need net - use mysql logger spawn-fcgi ldap slapd netmount dns - after famd - after sshd -} - -checkconfig() { - if [ ! -f "${LIGHTTPD_CONF}" ] ; then - ewarn "${LIGHTTPD_CONF} does not exist." - return 1 - fi - - if [ -z "${LIGHTTPD_PID}" ] ; then - ewarn "server.pid-file variable in ${LIGHTTPD_CONF}" - ewarn "is not set. Falling back to lighttpd.pid" - LIGHTTPD_PID="/run/lighttpd.pid" - fi - /usr/sbin/lighttpd -t -f ${LIGHTTPD_CONF} >/dev/null -} - -start() { - checkconfig || return 1 - checkpath -d -q -m 0750 -o lighttpd:lighttpd /run/lighttpd/ - - ebegin "Starting lighttpd" - start-stop-daemon --start --quiet --exec /usr/sbin/lighttpd \ - --pidfile "${LIGHTTPD_PID}" -- -f "${LIGHTTPD_CONF}" - eend $? -} - -stop() { - local rv=0 - ebegin "Stopping lighttpd" - start-stop-daemon --stop --quiet --pidfile "${LIGHTTPD_PID}" - eend $? -} - -reload() { - if ! service_started "${SVCNAME}" ; then - eerror "${SVCNAME} isn't running" - return 1 - fi - checkconfig || return 1 - - ebegin "Re-opening lighttpd log files" - start-stop-daemon --quiet --pidfile "${LIGHTTPD_PID}" \ - --signal HUP - eend $? -} - -graceful() { - if ! service_started "${SVCNAME}" ; then - eerror "${SVCNAME} isn't running" - return 1 - fi - checkconfig || return 1 - - ebegin "Gracefully stopping lighttpd" - start-stop-daemon --quiet --pidfile "${LIGHTTPD_PID}" \ - --signal INT - if eend $? ; then - rm -f "${LIGHTTPD_PID}" - start - fi -} diff --git a/pcr/openrc-net/mit-krb5kadmind.initd-r1 b/pcr/openrc-net/mit-krb5kadmind.initd-r1 deleted file mode 100644 index 7b28fb2ae..000000000 --- a/pcr/openrc-net/mit-krb5kadmind.initd-r1 +++ /dev/null @@ -1,25 +0,0 @@ -#!/sbin/runscript - -#--------------------------------------------------------------------------- -# This script starts/stops the MIT Kerberos 5 Admin daemon -#--------------------------------------------------------------------------- - -daemon="MIT Kerberos 5 Admin daemon" -exec="/usr/sbin/kadmind" - -depend() { - need mit-krb5kdc - use net -} - -start() { - ebegin "Starting $daemon" - start-stop-daemon --start --quiet --exec ${exec} 1>&2 - eend $? "Error starting $daemon" -} - -stop() { - ebegin "Stopping $daemon" - start-stop-daemon --stop --quiet --exec ${exec} 1>&2 - eend $? "Error stopping $daemon" -} diff --git a/pcr/openrc-net/mit-krb5kdc.initd-r1 b/pcr/openrc-net/mit-krb5kdc.initd-r1 deleted file mode 100644 index 94f1f7937..000000000 --- a/pcr/openrc-net/mit-krb5kdc.initd-r1 +++ /dev/null @@ -1,24 +0,0 @@ -#!/sbin/runscript - -#--------------------------------------------------------------------------- -# This script starts/stops the MIT Kerberos 5 KDC -#--------------------------------------------------------------------------- - -daemon="MIT Kerberos 5 KDC" -exec="/usr/sbin/krb5kdc" - -depend() { - use net -} - -start() { - ebegin "Starting $daemon" - start-stop-daemon --start --quiet --exec ${exec} 1>&2 - eend $? "Error starting $daemon" -} - -stop() { - ebegin "Stopping $daemon" - start-stop-daemon --stop --quiet --exec ${exec} 1>&2 - eend $? "Error stopping $daemon" -} diff --git a/pcr/openrc-net/mit-krb5kpropd.initd-r1 b/pcr/openrc-net/mit-krb5kpropd.initd-r1 deleted file mode 100644 index d800d666a..000000000 --- a/pcr/openrc-net/mit-krb5kpropd.initd-r1 +++ /dev/null @@ -1,24 +0,0 @@ -#!/sbin/runscript - -#--------------------------------------------------------------------------- -# This script starts/stops the MIT Kerberos 5 kpropd -#--------------------------------------------------------------------------- - -daemon="MIT Kerberos 5 kpropd" -exec="/usr/sbin/kpropd" - -depend() { - use net mit-krb5kdc mit-krb5kadmind -} - -start() { - ebegin "Starting $daemon" - start-stop-daemon --start --quiet --exec ${exec} -- -S 1>&2 - eend $? "Error starting $daemon" -} - -stop() { - ebegin "Stopping $daemon" - start-stop-daemon --stop --quiet --exec ${exec} 1>&2 - eend $? "Error stopping $daemon" -} diff --git a/pcr/openrc-net/named.confd-r7 b/pcr/openrc-net/named.confd-r7 deleted file mode 100644 index 477a48061..000000000 --- a/pcr/openrc-net/named.confd-r7 +++ /dev/null @@ -1,48 +0,0 @@ -# Set various named options here. -# -#OPTIONS="" - -# Set this to the number of processors you want bind to use. -# Leave this unchanged if you want bind to automatically detect the number -#CPU="1" - -# If you wish to run bind in a chroot: -# 1) un-comment the CHROOT= assignment, below. You may use -# a different chroot directory but MAKE SURE it's empty. -# 2) run: emerge --config =<bind-version> -# -#CHROOT="/chroot/dns" - -# Uncomment to enable binmount of /usr/share/GeoIP -#CHROOT_GEOIP="1" - -# Uncomment the line below to avoid that the init script mounts the needed paths -# into the chroot directory. -# You have to copy all needed config files by hand if you say CHROOT_NOMOUNT="1". -#CHROOT_NOMOUNT="1" - -# Uncomment this option if you have setup your own chroot environment and you -# don't want/need the chroot consistency check -#CHROOT_NOCHECK=1 - -# Default pid file location -PIDFILE="${CHROOT}/run/named/named.pid" - -# Scheduling priority: 19 is the lowest and -20 is the highest. -# Default: 0 -#NAMED_NICELEVEL="0" - -# Uncomment rc_named_use/rc_named_after for the database you need. -# Its necessary to ensure the database backend will be started before named. - -# MySQL -#rc_named_use="mysql" -#rc_named_after="mysql" - -# PostgreSQL -#rc_named_use="pg_autovacuum postgresql" -#rc_named_after="pg_autovacuum postgresql" - -# LDAP -#rc_named_use="ldap" -#rc_named_after="ldap" diff --git a/pcr/openrc-net/named.init-r13 b/pcr/openrc-net/named.init-r13 deleted file mode 100644 index 7f4955327..000000000 --- a/pcr/openrc-net/named.init-r13 +++ /dev/null @@ -1,248 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r13,v 1.1 2014/01/31 21:24:49 idl0r Exp $ - -extra_commands="checkconfig checkzones" -extra_started_commands="reload" - -depend() { - need net - use logger - provide dns -} - -NAMED_CONF=${CHROOT}/etc/bind/named.conf - -OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0} -MOUNT_CHECK_TIMEOUT=${MOUNT_CHECK_TIMEOUT:-60} - -_mount() { - local from - local to - local opts - local ret=0 - - if [ "${#}" -lt 3 ]; then - eerror "_mount(): to few arguments" - return 1 - fi - - from=$1 - to=$2 - shift 2 - - opts="${*}" - shift $# - - if [ -z "$(awk "\$2 == \"${to}\" { print \$2 }" /proc/mounts)" ]; then - einfo "mounting ${from} to ${to}" - mount ${from} ${to} ${opts} - ret=$? - - eend $ret - return $ret - fi - - return 0 -} - -_umount() { - local dir=$1 - local ret=0 - - if [ -n "$(awk "\$2 == \"${dir}\" { print \$2 }" /proc/mounts)" ]; then - ebegin "umounting ${dir}" - umount ${dir} - ret=$? - - eend $ret - return $ret - fi - - return 0 -} - -_get_pidfile() { - # as suggested in bug #107724, bug 335398#c17 - [ -n "${PIDFILE}" ] || PIDFILE=${CHROOT}$(\ - /usr/sbin/named-checkconf -p ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} | grep 'pid-file' | cut -d\" -f2) - [ -z "${PIDFILE}" ] && PIDFILE=${CHROOT}/run/named/named.pid -} - -check_chroot() { - if [ -n "${CHROOT}" ]; then - [ ! -d "${CHROOT}" ] && return 1 - [ ! -d "${CHROOT}/dev" ] || [ ! -d "${CHROOT}/etc" ] || [ ! -d "${CHROOT}/var" ] && return 1 - [ ! -d "${CHROOT}/run" ] || [ ! -d "${CHROOT}/var/log" ] && return 1 - [ ! -d "${CHROOT}/etc/bind" ] || [ ! -d "${CHROOT}/var/bind" ] && return 1 - [ ! -d "${CHROOT}/var/log/named" ] && return 1 - [ ! -c "${CHROOT}/dev/null" ] || [ ! -c "${CHROOT}/dev/zero" ] && return 1 - [ ! -c "${CHROOT}/dev/random" ] && [ ! -c "${CHROOT}/dev/urandom" ] && return 1 - [ "${CHROOT_GEOIP:-0}" -eq 1 ] && [ ! -d "${CHROOT}/usr/share/GeoIP" ] && return 1 - if [ ${OPENSSL_LIBGOST:-0} -eq 1 ]; then - if [ -d "/usr/lib64" ]; then - [ ! -d "${CHROOT}/usr/lib64/engines" ] && return 1 - elif [ -d "/usr/lib" ]; then - [ ! -d "${CHROOT}/usr/lib/engines" ] && return 1 - fi - fi - fi - - return 0 -} - -checkconfig() { - ebegin "Checking named configuration" - - if [ ! -f "${NAMED_CONF}" ] ; then - eerror "No ${NAMED_CONF} file exists!" - return 1 - fi - - /usr/sbin/named-checkconf ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} || { - eerror "named-checkconf failed! Please fix your config first." - return 1 - } - - eend 0 - return 0 -} - -checkzones() { - ebegin "Checking named configuration and zones" - /usr/sbin/named-checkconf -z -j ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} - eend $? -} - -start() { - local piddir - - ebegin "Starting ${CHROOT:+chrooted }named" - - if [ -n "${CHROOT}" ]; then - if [ ${CHROOT_NOCHECK:-0} -eq 0 ]; then - check_chroot || { - eend 1 - eerror "Your chroot dir ${CHROOT} is inconsistent, please run 'emerge --config net-dns/bind' first" - return 1 - } - fi - - if [ ${OPENSSL_LIBGOST:-0} -eq 1 ]; then - if [ ! -e /usr/lib/engines/libgost.so ]; then - eend 1 - eerror "Couldn't find /usr/lib/engines/libgost.so but bind has been built with openssl and libgost support" - return 1 - fi - cp -Lp /usr/lib/engines/libgost.so "${CHROOT}/usr/lib/engines/libgost.so" || { - eend 1 - eerror "Couldn't copy /usr/lib/engines/libgost.so into '${CHROOT}/usr/lib/engines/'" - return 1 - } - fi - cp -Lp /etc/localtime "${CHROOT}/etc/localtime" - - if [ "${CHROOT_NOMOUNT:-0}" -eq 0 ]; then - einfo "Mounting chroot dirs" - _mount /etc/bind ${CHROOT}/etc/bind -o bind - _mount /var/bind ${CHROOT}/var/bind -o bind - _mount /var/log/named ${CHROOT}/var/log/named -o bind - if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then - _mount /usr/share/GeoIP ${CHROOT}/usr/share/GeoIP -o bind - fi - fi - fi - - checkconfig || { eend 1; return 1; } - - # create piddir (usually /run/named) if necessary, bug 334535 - _get_pidfile - piddir="${PIDFILE%/*}" - checkpath -q -d -o root:named -m 0770 "${piddir}" || { - eend 1 - return 1 - } - - # In case someone have $CPU set in /etc/conf.d/named - if [ -n "${CPU}" ] && [ "${CPU}" -gt 0 ]; then - CPU="-n ${CPU}" - fi - - start-stop-daemon --start --pidfile ${PIDFILE} \ - --nicelevel ${NAMED_NICELEVEL:-0} \ - --exec /usr/sbin/named \ - -- -u named ${CPU} ${OPTIONS} ${CHROOT:+-t} ${CHROOT} - eend $? -} - -stop() { - local reported=0 - - ebegin "Stopping ${CHROOT:+chrooted }named" - - # Workaround for now, until openrc's restart has been fixed. - # openrc doesn't care about a restart() function in init scripts. - if [ "${RC_CMD}" = "restart" ]; then - if [ -n "${CHROOT}" -a ${CHROOT_NOCHECK:-0} -eq 0 ]; then - check_chroot || { - eend 1 - eerror "Your chroot dir ${CHROOT} is inconsistent, please run 'emerge --config net-dns/bind' first" - return 1 - } - fi - - checkconfig || { eend 1; return 1; } - fi - - # -R 10, bug 335398 - _get_pidfile - start-stop-daemon --stop --retry 10 --pidfile $PIDFILE \ - --exec /usr/sbin/named - - if [ -n "${CHROOT}" ] && [ "${CHROOT_NOMOUNT:-0}" -eq 0 ]; then - ebegin "Umounting chroot dirs" - - # just to be sure everything gets clean - while fuser -s ${CHROOT} 2>/dev/null; do - if [ "${reported}" -eq 0 ]; then - einfo "Waiting until all named processes are stopped (max. ${MOUNT_CHECK_TIMEOUT} seconds)" - elif [ "${reported}" -eq "${MOUNT_CHECK_TIMEOUT}" ]; then - eerror "Waiting until all named processes are stopped failed!" - eend 1 - break - fi - sleep 1 - reported=$((reported+1)) - done - - [ "${CHROOT_GEOIP:-0}" -eq 1 ] && _umount ${CHROOT}/usr/share/GeoIP - _umount ${CHROOT}/etc/bind - _umount ${CHROOT}/var/log/named - _umount ${CHROOT}/var/bind - fi - - eend $? -} - -reload() { - local ret - - ebegin "Reloading named.conf and zone files" - - checkconfig || { eend 1; return 1; } - - _get_pidfile - if [ -n "${PIDFILE}" ]; then - start-stop-daemon --pidfile $PIDFILE --signal HUP - ret=$? - else - ewarn "Unable to determine the pidfile... this is" - ewarn "a fallback mode. Please check your installation!" - - $RC_SERVICE restart - ret=$? - fi - - eend $ret -} diff --git a/pcr/openrc-net/nfs.confd b/pcr/openrc-net/nfs.confd deleted file mode 100644 index 9dc14058c..000000000 --- a/pcr/openrc-net/nfs.confd +++ /dev/null @@ -1,38 +0,0 @@ -# /etc/conf.d/nfs - -# If you wish to set the port numbers for lockd, -# please see /etc/sysctl.conf - -# Optional services to include in default `/etc/init.d/nfs start` -# For NFSv4 users, you'll want to add "rpc.idmapd" here. -NFS_NEEDED_SERVICES="" - -# Options to pass to rpc.nfsd -OPTS_RPC_NFSD="8" - -# Options to pass to rpc.mountd -# ex. OPTS_RPC_MOUNTD="-p 32767" -OPTS_RPC_MOUNTD="" - -# Options to pass to rpc.statd -# ex. OPTS_RPC_STATD="-p 32765 -o 32766" -OPTS_RPC_STATD="" - -# Options to pass to rpc.idmapd -OPTS_RPC_IDMAPD="" - -# Options to pass to rpc.gssd -OPTS_RPC_GSSD="" - -# Options to pass to rpc.svcgssd -OPTS_RPC_SVCGSSD="" - -# Options to pass to rpc.rquotad (requires sys-fs/quota) -OPTS_RPC_RQUOTAD="" - -# Timeout (in seconds) for exportfs -EXPORTFS_TIMEOUT=30 - -# Options to set in the nfsd filesystem (/proc/fs/nfsd/). -# Format is <option>=<value>. Multiple options are allowed. -#OPTS_NFSD="nfsv4leasetime=30 max_block_size=4096" diff --git a/pcr/openrc-net/nfs.initd b/pcr/openrc-net/nfs.initd deleted file mode 100644 index e4239b70c..000000000 --- a/pcr/openrc-net/nfs.initd +++ /dev/null @@ -1,163 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.28 2014/06/20 06:21:22 vapier Exp $ - -extra_started_commands="reload" - -# This variable is used for controlling whether or not to run exportfs -ua; -# see stop() for more information -restarting=no - -# The binary locations -exportfs=/usr/sbin/exportfs - mountd=/usr/sbin/rpc.mountd - nfsd=/usr/sbin/rpc.nfsd -smnotify=/usr/sbin/sm-notify - -depend() { - local myneed="" - # XXX: no way to detect NFSv4 is desired and so need rpc.idmapd - myneed="${myneed} $( - awk '!/^[[:space:]]*#/ { - # clear the path to avoid spurious matches - $1 = ""; - if ($0 ~ /[(][^)]*sec=(krb|spkm)[^)]*[)]/) { - print "rpc.svcgssd" - exit 0 - } - }' /etc/exports /etc/exports.d/*.exports 2>/dev/null - )" - config /etc/exports /etc/exports.d/*.exports - need portmap rpc.statd ${myneed} ${NFS_NEEDED_SERVICES} - use ypbind net dns rpc.rquotad rpc.idmapd rpc.svcgssd - after quota -} - -mkdir_nfsdirs() { - local d - for d in v4recovery v4root ; do - d="/var/lib/nfs/${d}" - [ ! -d "${d}" ] && mkdir -p "${d}" - done -} - -waitfor_exportfs() { - local pid=$1 - ( sleep ${EXPORTFS_TIMEOUT:-30}; kill -9 ${pid} 2>/dev/null ) & - wait $1 -} - -mount_nfsd() { - if [ -e /proc/modules ] ; then - # Make sure nfs support is loaded in the kernel #64709 - if ! grep -qs nfsd /proc/filesystems ; then - modprobe -q nfsd - fi - # Restart idmapd if needed #220747 - if grep -qs nfsd /proc/modules ; then - killall -q -HUP rpc.idmapd - fi - fi - - # This is the new "kernel 2.6 way" to handle the exports file - if grep -qs nfsd /proc/filesystems ; then - if ! mountinfo -q /proc/fs/nfsd ; then - ebegin "Mounting nfsd filesystem in /proc" - mount -t nfsd -o nodev,noexec,nosuid nfsd /proc/fs/nfsd - eend $? - fi - - local o - for o in ${OPTS_NFSD} ; do - echo "${o#*=}" > "/proc/fs/nfsd/${o%%=*}" - done - fi -} - -start_it() { - ebegin "Starting NFS $1" - shift - "$@" - eend $? - ret=$((ret + $?)) -} -start() { - mount_nfsd - mkdir_nfsdirs - - # Exportfs likes to hang if networking isn't working. - # If that's the case, then try to kill it so the - # bootup process can continue. - if grep -qs '^[[:space:]]*/' /etc/exports /etc/exports.d/*.exports ; then - ebegin "Exporting NFS directories" - ${exportfs} -r & - waitfor_exportfs $! - eend $? - fi - - local ret=0 - start_it mountd ${mountd} ${OPTS_RPC_MOUNTD} - start_it daemon ${nfsd} ${OPTS_RPC_NFSD} - [ -x "${smnotify}" ] && start_it smnotify ${smnotify} ${OPTS_SMNOTIFY} - return ${ret} -} - -stop() { - local ret=0 - - ebegin "Stopping NFS mountd" - start-stop-daemon --stop --exec ${mountd} - eend $? - ret=$((ret + $?)) - - # nfsd sets its process name to [nfsd] so don't look for $nfsd - ebegin "Stopping NFS daemon" - start-stop-daemon --stop --name nfsd --user root --signal 2 - eend $? - ret=$((ret + $?)) - # in case things don't work out ... #228127 - rpc.nfsd 0 - - # When restarting the NFS server, running "exportfs -ua" probably - # isn't what the user wants. Running it causes all entries listed - # in xtab to be removed from the kernel export tables, and the - # xtab file is cleared. This effectively shuts down all NFS - # activity, leaving all clients holding stale NFS filehandles, - # *even* when the NFS server has restarted. - # - # That's what you would want if you were shutting down the NFS - # server for good, or for a long period of time, but not when the - # NFS server will be running again in short order. In this case, - # then "exportfs -r" will reread the xtab, and all the current - # clients will be able to resume NFS activity, *without* needing - # to umount/(re)mount the filesystem. - if [ "${restarting}" = no -o "${RC_CMD}" = "restart" ] ; then - ebegin "Unexporting NFS directories" - # Exportfs likes to hang if networking isn't working. - # If that's the case, then try to kill it so the - # shutdown process can continue. - ${exportfs} -ua & - waitfor_exportfs $! - eend $? - fi - - return ${ret} -} - -reload() { - # Exportfs likes to hang if networking isn't working. - # If that's the case, then try to kill it so the - # bootup process can continue. - ebegin "Reloading /etc/exports" - ${exportfs} -r 1>&2 & - waitfor_exportfs $! - eend $? -} - -restart() { - # See long comment in stop() regarding "restarting" and exportfs -ua - restarting=yes - svc_stop - svc_start -} diff --git a/pcr/openrc-net/nfsclient.confd b/pcr/openrc-net/nfsclient.confd deleted file mode 100644 index 8a995571e..000000000 --- a/pcr/openrc-net/nfsclient.confd +++ /dev/null @@ -1,18 +0,0 @@ -# You need to decide which nfs protocol version you want to use. -# If you are unsure, leave these alone. -# -# If you are using only nfsv4, uncomment this line: -# -#rc_need="!rpc.statd" -# -# If you are using only nfsv3, uncomment this line: -# -#rc_need="!rpc.idmapd" -# -# You will need to set the dependencies in the nfsclient script to match -# the network configuration tools you are using. This should be done in -# this file by following the examples below, and not by changing the -# service script itself. See /etc/conf.d/netmount for more examples. -# -# This is a safe default. -rc_after="net" diff --git a/pcr/openrc-net/nfsclient.initd b/pcr/openrc-net/nfsclient.initd deleted file mode 100644 index 72ba9a963..000000000 --- a/pcr/openrc-net/nfsclient.initd +++ /dev/null @@ -1,34 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsclient.initd,v 1.5 2015/02/05 04:32:41 williamh Exp $ - -[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs - -depend() { - local opts myneed="" - if [ -e /etc/fstab ] ; then - for opts in $(fstabinfo -o -t nfs,nfs4) ; do - case $opts in - *sec=krb*|*sec=spkm*) myneed="$myneed rpc.gssd" ;; - esac - done - fi - config /etc/fstab - need portmap rpc.statd rpc.idmapd ${myneed} - use ypbind dns -} - -start() { - if [ -x /usr/sbin/sm-notify ] ; then - ebegin "Starting NFS sm-notify" - /usr/sbin/sm-notify ${OPTS_SMNOTIFY} - eend $? - fi - - # Make sure nfs support is loaded in the kernel #64709 - if [ -e /proc/modules ] && ! grep -qs 'nfs$' /proc/filesystems ; then - modprobe -q nfs - fi - return 0 -} diff --git a/pcr/openrc-net/nginx.initd-r2 b/pcr/openrc-net/nginx.initd-r2 deleted file mode 100644 index 903670955..000000000 --- a/pcr/openrc-net/nginx.initd-r2 +++ /dev/null @@ -1,89 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.initd-r2,v 1.1 2013/05/13 12:18:11 dev-zero Exp $ - -extra_commands="configtest" -extra_started_commands="upgrade reload" - -description="Robust, small and high performance http and reverse proxy server" -description_configtest="Run nginx' internal config check." -description_upgrade="Upgrade the nginx binary without losing connections." -description_reload="Reload the nginx configuration without losing connections." - -nginx_config=${nginx_config:-/etc/nginx/nginx.conf} - -command="/usr/sbin/nginx" -command_args="-c ${nginx_config}" -pidfile=${pidfile:-/run/nginx.pid} -user=${user:-nginx} -group=${group:-nginx} - -depend() { - need net - use dns logger netmount -} - -start_pre() { - if [ "${RC_CMD}" != "restart" ]; then - configtest || return 1 - fi -} - -stop_pre() { - if [ "${RC_CMD}" = "restart" ]; then - configtest || return 1 - fi -} - -stop_post() { - rm -f ${pidfile} -} - -reload() { - configtest || return 1 - ebegin "Refreshing nginx' configuration" - kill -HUP `cat ${pidfile}` &>/dev/null - eend $? "Failed to reload nginx" -} - -upgrade() { - configtest || return 1 - ebegin "Upgrading nginx" - - einfo "Sending USR2 to old binary" - kill -USR2 `cat ${pidfile}` &>/dev/null - - einfo "Sleeping 3 seconds before pid-files checking" - sleep 3 - - if [ ! -f ${pidfile}.oldbin ]; then - eerror "File with old pid not found" - return 1 - fi - - if [ ! -f ${pidfile} ]; then - eerror "New binary failed to start" - return 1 - fi - - einfo "Sleeping 3 seconds before WINCH" - sleep 3 ; kill -WINCH `cat ${pidfile}.oldbin` - - einfo "Sending QUIT to old binary" - kill -QUIT `cat ${pidfile}.oldbin` - - einfo "Upgrade completed" - eend $? "Upgrade failed" -} - -configtest() { - ebegin "Checking nginx' configuration" - ${command} -c ${nginx_config} -t -q - - if [ $? -ne 0 ]; then - ${command} -c ${nginx_config} -t - fi - - eend $? "failed, please correct errors above" -} diff --git a/pcr/openrc-net/openntpd.conf.d-20080406-r6 b/pcr/openrc-net/openntpd.conf.d-20080406-r6 deleted file mode 100644 index ccd454596..000000000 --- a/pcr/openrc-net/openntpd.conf.d-20080406-r6 +++ /dev/null @@ -1,7 +0,0 @@ -# /etc/conf.d/ntpd: config file for openntpd's ntpd - -# See ntpd(8) man page ... some popular options: -# -s Set the time immediately at startup -# (Note: may cause up to a 15 second startup delay -# if ntp servers not reachable) -NTPD_OPTS="" diff --git a/pcr/openrc-net/openntpd.init.d-20080406-r6 b/pcr/openrc-net/openntpd.init.d-20080406-r6 deleted file mode 100644 index 2f452e0fd..000000000 --- a/pcr/openrc-net/openntpd.init.d-20080406-r6 +++ /dev/null @@ -1,15 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/files/openntpd.init.d-20080406-r6,v 1.1 2013/12/02 13:32:12 ottxor Exp $ - -name="OpenNTPD" -command="/usr/sbin/ntpd" -pidfile="/run/ntpd.pid" -command_args="-p ${pidfile} ${NTPD_OPTS}" - -depend() { - need net - after ntp-client - use dns logger -} diff --git a/pcr/openrc-net/openvpn-2.1.conf b/pcr/openrc-net/openvpn-2.1.conf deleted file mode 100644 index 72510c34a..000000000 --- a/pcr/openrc-net/openvpn-2.1.conf +++ /dev/null @@ -1,18 +0,0 @@ -# OpenVPN automatically creates an /etc/resolv.conf (or sends it to -# resolvconf) if given DNS information by the OpenVPN server. -# Set PEER_DNS="no" to stop this. -PEER_DNS="yes" - -# OpenVPN can run in many modes. Most people will want the init script -# to automatically detect the mode and try and apply a good default -# configuration and setup scripts. However, there are cases where the -# OpenVPN configuration looks like a client, but it's really a peer or -# something else. DETECT_CLIENT controls this behaviour. -DETECT_CLIENT="yes" - -# If DETECT_CLIENT is no and you have your own scripts to re-enter the openvpn -# init script (ie, it first becomes "inactive" and the script then starts the -# script again to make it "started") then you can state this below. -# In other words, unless you understand service dependencies and are a -# competent shell scripter, don't set this. -RE_ENTER="no" diff --git a/pcr/openrc-net/openvpn-2.1.init b/pcr/openrc-net/openvpn-2.1.init deleted file mode 100644 index d65e6f8bd..000000000 --- a/pcr/openrc-net/openvpn-2.1.init +++ /dev/null @@ -1,133 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -VPNDIR=${VPNDIR:-/etc/openvpn} -VPN=${SVCNAME#*.} -if [ -n "${VPN}" ] && [ ${SVCNAME} != "openvpn" ]; then - VPNPID="/var/run/openvpn.${VPN}.pid" -else - VPNPID="/var/run/openvpn.pid" -fi -VPNCONF="${VPNDIR}/${VPN}.conf" - -depend() { - need localmount net - use dns - after bootmisc -} - -checkconfig() { - # Linux has good dynamic tun/tap creation - if [ $(uname -s) = "Linux" ] ; then - if [ ! -e /dev/net/tun ]; then - if ! modprobe tun ; then - eerror "TUN/TAP support is not available" \ - "in this kernel" - return 1 - fi - fi - if [ -h /dev/net/tun ] && [ -c /dev/misc/net/tun ]; then - ebegin "Detected broken /dev/net/tun symlink, fixing..." - rm -f /dev/net/tun - ln -s /dev/misc/net/tun /dev/net/tun - eend $? - fi - return 0 - fi - - # Other OS's don't, so we rely on a pre-configured interface - # per vpn instance - local ifname=$(sed -n -e 's/[[:space:]]*dev[[:space:]][[:space:]]*\([^[:space:]]*\).*/\1/p' "${VPNCONF}") - if [ -z ${ifname} ] ; then - eerror "You need to specify the interface that this openvpn" \ - "instance should use" \ - "by using the dev option in ${VPNCONF}" - return 1 - fi - - if ! ifconfig "${ifname}" >/dev/null 2>/dev/null ; then - # Try and create it - echo > /dev/"${ifname}" >/dev/null - fi - if ! ifconfig "${ifname}" >/dev/null 2>/dev/null ; then - eerror "${VPNCONF} requires interface ${ifname}" \ - "but that does not exist" - return 1 - fi -} - -start() { - # If we are re-called by the openvpn gentoo-up.sh script - # then we don't actually want to start openvpn - [ "${IN_BACKGROUND}" = "true" ] && return 0 - - ebegin "Starting ${SVCNAME}" - - checkconfig || return 1 - - local args="" reenter=${RE_ENTER:-no} - # If the config file does not specify the cd option, we do - # But if we specify it, we override the config option which we do not want - if ! grep -q "^[ ]*cd[ ].*" "${VPNCONF}" ; then - args="${args} --cd ${VPNDIR}" - fi - - # We mark the service as inactive and then start it. - # When we get an authenticated packet from the peer then we run our script - # which configures our DNS if any and marks us as up. - if [ "${DETECT_CLIENT:-yes}" = "yes" ] && \ - grep -q "^[ ]*remote[ ].*" "${VPNCONF}" ; then - reenter="yes" - args="${args} --up-delay --up-restart" - args="${args} --script-security 2" - args="${args} --up /etc/openvpn/up.sh" - args="${args} --down-pre --down /etc/openvpn/down.sh" - - # Warn about setting scripts as we override them - if grep -Eq "^[ ]*(up|down)[ ].*" "${VPNCONF}" ; then - ewarn "WARNING: You have defined your own up/down scripts" - ewarn "As you're running as a client, we now force Gentoo specific" - ewarn "scripts to be run for up and down events." - ewarn "These scripts will call /etc/openvpn/${SVCNAME}-{up,down}.sh" - ewarn "where you can put your own code." - fi - - # Warn about the inability to change ip/route/dns information when - # dropping privs - if grep -q "^[ ]*user[ ].*" "${VPNCONF}" ; then - ewarn "WARNING: You are dropping root privileges!" - ewarn "As such openvpn may not be able to change ip, routing" - ewarn "or DNS configuration." - fi - else - # So we're a server. Run as openvpn unless otherwise specified - grep -q "^[ ]*user[ ].*" "${VPNCONF}" || args="${args} --user openvpn" - grep -q "^[ ]*group[ ].*" "${VPNCONF}" || args="${args} --group openvpn" - fi - - # Ensure that our scripts get the PEER_DNS variable - [ -n "${PEER_DNS}" ] && args="${args} --setenv PEER_DNS ${PEER_DNS}" - - [ "${reenter}" = "yes" ] && mark_service_inactive "${SVCNAME}" - start-stop-daemon --start --exec /usr/sbin/openvpn --pidfile "${VPNPID}" \ - -- --config "${VPNCONF}" --writepid "${VPNPID}" --daemon \ - --setenv SVCNAME "${SVCNAME}" ${args} - eend $? "Check your logs to see why startup failed" -} - -stop() { - # If we are re-called by the openvpn gentoo-down.sh script - # then we don't actually want to stop openvpn - if [ "${IN_BACKGROUND}" = "true" ] ; then - mark_service_inactive "${SVCNAME}" - return 0 - fi - - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --quiet \ - --exec /usr/sbin/openvpn --pidfile "${VPNPID}" - eend $? -} - -# vim: set ts=4 : diff --git a/pcr/openrc-net/polipo.initd b/pcr/openrc-net/polipo.initd deleted file mode 100644 index 9074050c2..000000000 --- a/pcr/openrc-net/polipo.initd +++ /dev/null @@ -1,54 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2011 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/files/Attic/polipo.initd,v 1.7 2015/01/12 16:16:12 bircoph dead $ - -depend() { - need net -} - -checkconfig() { - { polipo -v || return 1 ; } | { - local retvalue=0 - local name type value desc - while read name type value desc ; do - case ${name} in - configFile) - if [ "${value}" = "(none)" ] ; then - eerror "Unable to read configuration file /etc/polipo/config" - retvalue=1 - fi - ;; - daemonise) - if [ "${value}" != "false" ] ; then - eerror "Configuration option not supported by this init script: ${name}=${value}" - retvalue=1 - fi - ;; - pidFile) - if [ "${value}" != "(none)" ] ; then - eerror "Configuration option not supported by this init script: ${name}=${value}" - retvalue=1 - fi - ;; - esac - done - return ${retvalue} - } -} - -start() { - checkconfig || return 1 - - ebegin "Starting Polipo HTTP proxy" - start-stop-daemon --start --user polipo \ - --background --pidfile /var/run/polipo.pid --make-pidfile \ - --exec /usr/bin/polipo - eend $? -} - -stop() { - ebegin "Stopping Polipo HTTP proxy" - start-stop-daemon --stop --pidfile /var/run/polipo.pid - eend $? -} diff --git a/pcr/openrc-net/postfix.rc6.2.7 b/pcr/openrc-net/postfix.rc6.2.7 deleted file mode 100644 index aecd8e71f..000000000 --- a/pcr/openrc-net/postfix.rc6.2.7 +++ /dev/null @@ -1,86 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/files/postfix.rc6.2.7,v 1.2 2012/03/07 10:27:37 eras Exp $ - -extra_started_commands="reload abort flush" - -description_reload="Re-read configuration files. Running processes terminate at their earliest convenience." -description_abort="Stop the Postfix mail system abruptly. Running processes are signaled to stop immediately." -description_flush="Force delivery: attempt to deliver every message in the deferred mail queue." - -# Please read http://www.postfix.org/MULTI_INSTANCE_README.html for multi instance support -CONF_DIR="/etc/postfix" -CONF_OPT="${SVCNAME##*.}" -if [ -n ${CONF_OPT} -a ${SVCNAME} != "postfix" ]; then - CONF_DIR="${CONF_DIR}.${CONF_OPT}" -fi -if [ "${CONF_DIR}" = "/etc/postfix" ]; then - CONF_PARAM="" - CONF_MESSAGE="" -else - CONF_PARAM="-c ${CONF_DIR}" - CONF_MESSAGE="(${CONF_DIR})" -fi - -depend() { - use logger dns ypbind amavisd antivirus postfix_greylist net saslauthd - if [ "${SVCNAME}" = "postfix" ]; then - provide mta - fi -} - -start() { - if [ ! -z "${CONF_PARAM}" ]; then - einfo "Please consider updating your config for postmulti support." - fi - ebegin "Starting postfix ${CONF_MESSAGE}" - if [ ! -d ${CONF_DIR} ]; then - eend 1 "${CONF_DIR} does not exist" - return 1 - fi - /usr/sbin/postfix ${CONF_PARAM} start >/dev/null 2>&1 - eend $? -} - -stop() { - ebegin "Stopping postfix ${CONF_MESSAGE}" - /usr/sbin/postfix ${CONF_PARAM} stop >/dev/null 2>&1 - eend -} - -status() { - local _retval - einfon "" - /usr/sbin/postfix ${CONF_PARAM} status - _retval=$? - if [ x${_retval} = 'x0' ]; then - mark_service_started "${SVCNAME}" - eend 0 - else - mark_service_stopped "${SVCNAME}" - eend 3 - fi -} - -reload() { - ebegin "Reloading postfix ${CONF_MESSAGE}" - /usr/sbin/postfix ${CONF_PARAM} reload >/dev/null 2>&1 - eend $? -} - -abort() { - ebegin "Aborting postfix ${CONF_MESSAGE}" - - if service_started "${SVCNAME}"; then - mark_service_stopped "${SVCNAME}" - fi - /usr/sbin/postfix ${CONF_PARAM} abort >/dev/null 2>&1 - eend $? -} - -flush() { - ebegin "Flushing postfix ${CONF_MESSAGE}" - /usr/sbin/postfix ${CONF_PARAM} flush >/dev/null 2>&1 - eend $? -} diff --git a/pcr/openrc-net/privoxy.initd b/pcr/openrc-net/privoxy.initd deleted file mode 100644 index 84d6186d9..000000000 --- a/pcr/openrc-net/privoxy.initd +++ /dev/null @@ -1,29 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/files/privoxy.initd,v 1.2 2007/11/14 05:14:56 mrness Exp $ - -CONFFILE=/etc/${SVCNAME}/config -PIDFILE=/var/run/${SVCNAME}.pid - -depend() { - need net -} - -start() { - if [ ! -f "${CONFFILE}" ]; then - eerror "Configuration file ${CONFFILE} not found!" - return 1 - fi - - ebegin "Starting privoxy" - start-stop-daemon --start --quiet --exec /usr/sbin/privoxy --pidfile "${PIDFILE}" \ - -- --pidfile "${PIDFILE}" --user privoxy.privoxy "${CONFFILE}" #2>/dev/null - eend $? -} - -stop() { - ebegin "Stopping privoxy" - start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" - eend $? -} diff --git a/pcr/openrc-net/quota.confd b/pcr/openrc-net/quota.confd deleted file mode 100644 index 6e66c88dd..000000000 --- a/pcr/openrc-net/quota.confd +++ /dev/null @@ -1,20 +0,0 @@ -# /etc/conf.d/quota: config file for /etc/init.d/quota - -# Note: if your console is hooked up to a serial terminal, -# you prob want to drop the '-v' from the OPTS vars below. - - -# Run quotacheck ? -RUN_QUOTACHECK="yes" - - -# Options for quotacheck -QUOTACHECK_OPTS="-avug" - - -# Options for quotaon -QUOTAON_OPTS="-avug" - - -# Options for quotaoff -QUOTAOFF_OPTS="-avug" diff --git a/pcr/openrc-net/quota.rc7 b/pcr/openrc-net/quota.rc7 deleted file mode 100644 index 23f8c1536..000000000 --- a/pcr/openrc-net/quota.rc7 +++ /dev/null @@ -1,38 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/files/quota.rc7,v 1.2 2012/12/08 19:50:27 vapier Exp $ - -extra_started_commands="check" -description_check="Running quotacheck with quota being offline" - -depend() { - need localmount - use portmap -} - -start() { - if [ "${RUN_QUOTACHECK}" = "yes" ] ; then - ebegin "Checking quotas (may take a while)" - quotacheck ${QUOTACHECK_OPTS} - eend $? - fi - - ebegin "Starting quota" - quotaon ${QUOTAON_OPTS} - eend $? -} - -stop() { - ebegin "Stopping quota" - quotaoff ${QUOTAOFF_OPTS} - eend $? -} - -check() { - ebegin "Checking quota" - quotaoff ${QUOTAOFF_OPTS} && \ - quotacheck ${QUOTACHECK_OPTS} && \ - quotaon ${QUOTAON_OPTS} - eend $? -} diff --git a/pcr/openrc-net/rpc.gssd.initd b/pcr/openrc-net/rpc.gssd.initd deleted file mode 100644 index f1b8f8774..000000000 --- a/pcr/openrc-net/rpc.gssd.initd +++ /dev/null @@ -1,24 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.gssd.initd,v 1.11 2008/10/26 09:02:47 vapier Exp $ - -[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs - -depend() { - use ypbind net - need portmap rpc.pipefs - after quota -} - -start() { - ebegin "Starting gssd" - start-stop-daemon --start --exec /usr/sbin/rpc.gssd -- ${OPTS_RPC_GSSD} - eend $? -} - -stop() { - ebegin "Stopping gssd" - start-stop-daemon --stop --exec /usr/sbin/rpc.gssd - eend $? -} diff --git a/pcr/openrc-net/rpc.idmapd.initd b/pcr/openrc-net/rpc.idmapd.initd deleted file mode 100644 index 52838b5da..000000000 --- a/pcr/openrc-net/rpc.idmapd.initd +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.idmapd.initd,v 1.8 2009/03/14 18:43:18 vapier Exp $ - -[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs - -rpc_bin=/usr/sbin/rpc.idmapd - -depend() { - use ypbind net - need portmap rpc.pipefs - after quota -} - -start() { - ebegin "Starting idmapd" - ${rpc_bin} ${OPTS_RPC_IDMAPD} - eend $? "make sure DNOTIFY support is enabled ..." -} - -stop() { - ebegin "Stopping idmapd" - start-stop-daemon --stop --exec ${rpc_bin} - eend $? -} diff --git a/pcr/openrc-net/rpc.pipefs.initd b/pcr/openrc-net/rpc.pipefs.initd deleted file mode 100644 index ebae3b915..000000000 --- a/pcr/openrc-net/rpc.pipefs.initd +++ /dev/null @@ -1,33 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.pipefs.initd,v 1.3 2014/06/20 04:33:57 vapier Exp $ - -MNT="/var/lib/nfs/rpc_pipefs" - -mount_pipefs() { - local fstype=rpc_pipefs - - # if things are already mounted, nothing to do - mountinfo -q ${MNT} && return 0 - - # if rpc_pipefs is not available, try to load sunrpc for it #219566 - grep -qs ${fstype} /proc/filesystems || modprobe -q sunrpc - # if still not available, the `mount` will issue an error for the user - - # now just do it for kicks - mkdir -p ${MNT} - mount -t ${fstype} ${fstype} ${MNT} -} - -start() { - ebegin "Setting up RPC pipefs" - mount_pipefs - eend $? "make sure you have NFS/SUNRPC enabled in your kernel" -} - -stop() { - ebegin "Unmounting RPC pipefs" - umount ${MNT} - eend $? -} diff --git a/pcr/openrc-net/rpc.rquotad.initd b/pcr/openrc-net/rpc.rquotad.initd deleted file mode 100644 index f657fc469..000000000 --- a/pcr/openrc-net/rpc.rquotad.initd +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/files/rpc.rquotad.initd,v 1.1 2007/03/25 12:09:39 vapier Exp $ - -[ -e /etc/conf.d/nfs ] && source /etc/conf.d/nfs - -rpc_bin=/usr/sbin/rpc.rquotad - -depend() { - use ypbind net - need portmap - after quota -} - -start() { - ebegin "Starting rpc.rquotad" - ${rpc_bin} ${OPTS_RPC_RQUOTAD} - eend $? -} - -stop() { - ebegin "Stopping rpc.rquotad" - start-stop-daemon --stop --quiet --exec ${rpc_bin} - eend $? -} diff --git a/pcr/openrc-net/rpc.statd.initd b/pcr/openrc-net/rpc.statd.initd deleted file mode 100644 index c82041a4d..000000000 --- a/pcr/openrc-net/rpc.statd.initd +++ /dev/null @@ -1,33 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd,v 1.9 2015/02/02 13:47:41 radhermit Exp $ - -[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs - -rpc_bin=/sbin/rpc.statd -rpc_pid=/var/run/rpc.statd.pid - -depend() { - use ypbind net - need portmap - after quota -} - -start() { - # Don't start rpc.statd if already started by someone else ... - # Don't try and kill it if it's already dead ... - if killall -q -0 ${rpc_bin} ; then - return 0 - fi - - ebegin "Starting NFS statd" - start-stop-daemon --start --exec ${rpc_bin} -- --no-notify ${OPTS_RPC_STATD} - eend $? -} - -stop() { - ebegin "Stopping NFS statd" - start-stop-daemon --stop --exec ${rpc_bin} --pidfile /var/run/rpc.statd.pid - eend $? -} diff --git a/pcr/openrc-net/rpc.svcgssd.initd b/pcr/openrc-net/rpc.svcgssd.initd deleted file mode 100644 index 74383e24d..000000000 --- a/pcr/openrc-net/rpc.svcgssd.initd +++ /dev/null @@ -1,24 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.svcgssd.initd,v 1.5 2008/10/26 09:02:47 vapier Exp $ - -[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs - -depend() { - use ypbind net - need portmap rpc.pipefs - after quota -} - -start() { - ebegin "Starting svcgssd" - start-stop-daemon --start --exec /usr/sbin/rpc.svcgssd -- ${OPTS_RPC_SVCGSSD} - eend $? -} - -stop() { - ebegin "Stopping svcgssd" - start-stop-daemon --stop --exec /usr/sbin/rpc.svcgssd - eend $? -} diff --git a/pcr/openrc-net/rpc.yppasswdd-r1 b/pcr/openrc-net/rpc.yppasswdd-r1 deleted file mode 100644 index a14762516..000000000 --- a/pcr/openrc-net/rpc.yppasswdd-r1 +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/files/rpc.yppasswdd-r1,v 1.4 2004/07/24 06:26:28 eradicator Exp $ - -depend() { - need net portmap ypserv -} - -start() { - ebegin "Starting rpc.yppasswdd" - YOPTS="" - if [ -n "${YPPASSWDD_OPTS}" ]; then YOPTS="-- ${YPPASSWDD_OPTS}"; fi - start-stop-daemon --start --quiet --exec /usr/sbin/rpc.yppasswdd ${YOPTS} - eend $? -} - -stop() { - ebegin "Stopping rpc.yppasswdd" - start-stop-daemon --stop --quiet --exec /usr/sbin/rpc.yppasswdd - eend $? -} diff --git a/pcr/openrc-net/rpc.yppasswdd.confd b/pcr/openrc-net/rpc.yppasswdd.confd deleted file mode 100644 index 0d6673630..000000000 --- a/pcr/openrc-net/rpc.yppasswdd.confd +++ /dev/null @@ -1,7 +0,0 @@ -# -e chsh allows changing shell through ypchsh, -# -e chfn allows changing GECOS ("finger") information through ypchfn, -# -D <dir> allows specification of directory with yp/NIS sources -# if other than /etc. -#YPPASSWDD_OPTS="-e chsh -e chfn -D /var/yp/source" - - diff --git a/pcr/openrc-net/rpc.ypxfrd-2.23 b/pcr/openrc-net/rpc.ypxfrd-2.23 deleted file mode 100644 index b1526aa69..000000000 --- a/pcr/openrc-net/rpc.ypxfrd-2.23 +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/files/rpc.ypxfrd-2.23,v 1.1 2011/04/21 14:18:40 jer Exp $ - -depend() { - need net portmap ypserv -} - -start() { - ebegin "Starting rpc.ypxfrd" - YOPTS="" - if [ -n "${YPXFRD_OPTS}" ]; then YOPTS="-- ${YPXFRD_OPTS}"; fi - start-stop-daemon --start --quiet --pidfile /var/run/ypxfrd.pid --exec /usr/sbin/rpc.ypxfrd ${YOPTS} - eend $? -} - -stop() { - ebegin "Stopping rpc.ypxfrd" - start-stop-daemon --stop --quiet --pidfile /var/run/ypxfrd.pid --exec /usr/sbin/rpc.ypxfrd - eend $? -} diff --git a/pcr/openrc-net/rpc.ypxfrd.confd b/pcr/openrc-net/rpc.ypxfrd.confd deleted file mode 100644 index 73cfc47e7..000000000 --- a/pcr/openrc-net/rpc.ypxfrd.confd +++ /dev/null @@ -1,3 +0,0 @@ -# Command line options to pass to rpc.ypxfrd -# eg: you can pass --port <number> to use a non-standard port -YPXFRD_OPTS="" diff --git a/pcr/openrc-net/rpcbind.initd b/pcr/openrc-net/rpcbind.initd deleted file mode 100644 index 995ca71d0..000000000 --- a/pcr/openrc-net/rpcbind.initd +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/rpcbind/files/rpcbind.initd,v 1.1 2007/12/29 09:13:55 vapier Exp $ - -depend() { - use net - before inetd xinetd - provide portmap -} - -start() { - ebegin "Starting rpcbind" - start-stop-daemon --start --quiet --exec /sbin/rpcbind -- ${RPCBIND_OPTS} - eend $? -} - -stop() { - ebegin "Stopping rpcbind" - start-stop-daemon --stop --quiet --exec /sbin/rpcbind - eend $? -} diff --git a/pcr/openrc-net/rsyncd.conf.d b/pcr/openrc-net/rsyncd.conf.d deleted file mode 100644 index c3d897ed2..000000000 --- a/pcr/openrc-net/rsyncd.conf.d +++ /dev/null @@ -1,5 +0,0 @@ -# /etc/conf.d/rsyncd: config file for /etc/init.d/rsyncd - -# see man pages for rsync or run `rsync --help` -# for valid cmdline options -#RSYNC_OPTS="" diff --git a/pcr/openrc-net/rsyncd.init.d-r1 b/pcr/openrc-net/rsyncd.init.d-r1 deleted file mode 100644 index d2e608e49..000000000 --- a/pcr/openrc-net/rsyncd.init.d-r1 +++ /dev/null @@ -1,12 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/files/rsyncd.init.d-r1,v 1.1 2012/03/22 22:01:21 idl0r Exp $ - -command="/usr/bin/rsync" -command_args="--daemon ${RSYNC_OPTS}" -pidfile="/var/run/${SVCNAME}.pid" - -depend() { - use net -} diff --git a/pcr/openrc-net/samba4.confd b/pcr/openrc-net/samba4.confd deleted file mode 100644 index 58b2c7827..000000000 --- a/pcr/openrc-net/samba4.confd +++ /dev/null @@ -1,38 +0,0 @@ -# Add "winbind" to the daemon_list if you also want winbind to start. -# Replace "smbd nmbd" by "samba4" if you want the active directory domain controller part or the ntvfs -# file server part or the rpc proxy to start. -# Note that samba4 controls 'smbd' by itself, thus it can't be started manually. You can, however, -# tweak the behaviour of a samba4-controlled smbd by modifying your '/etc/samba/smb.conf' file -# accordingly. -daemon_list="smbd nmbd" - -#---------------------------------------------------------------------------- -# Daemons calls: <daemon_name>_<command_option> -#---------------------------------------------------------------------------- -my_service_name="samba" -my_service_PRE="unset TMP TMPDIR" -my_service_POST="" - -#---------------------------------------------------------------------------- -# Daemons calls: <daemon_name>_<command_option> -#---------------------------------------------------------------------------- -smbd_start_options="-D" -smbd_start="start-stop-daemon --start --exec /usr/sbin/smbd -- ${smbd_start_options}" -smbd_stop="start-stop-daemon --stop --exec /usr/sbin/smbd" -smbd_reload="killall -HUP smbd" - -nmbd_start_options="-D" -nmbd_start="start-stop-daemon --start --exec /usr/sbin/nmbd -- ${nmbd_start_options}" -nmbd_stop="start-stop-daemon --stop --exec /usr/sbin/nmbd" -nmbd_reload="killall -HUP nmbd" - -samba4_start_options="" -samba4_start="start-stop-daemon --start --exec /usr/sbin/samba -- ${samba4_start_options}" -samba4_stop="start-stop-daemon --stop --exec /usr/sbin/samba" -samba4_reload="killall -HUP samba" - -winbind_start_options="" -winbind_start="start-stop-daemon --start --exec /usr/sbin/winbindd -- ${winbind_start_options}" -winbind_stop="start-stop-daemon --stop --exec /usr/sbin/winbindd" -winbind_reload="killall -HUP winbindd" - diff --git a/pcr/openrc-net/samba4.initd-r1 b/pcr/openrc-net/samba4.initd-r1 deleted file mode 100644 index 6401dfbe0..000000000 --- a/pcr/openrc-net/samba4.initd-r1 +++ /dev/null @@ -1,56 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/4.1/samba4.initd-r1,v 1.3 2014/03/13 15:35:07 polynomial-c Exp $ - -extra_started_commands="reload" -piddir="/var/run/samba" - -depend() { - after slapd - need net - use cupsd -} - -DAEMONNAME="${SVCNAME##samba.}" -[ "${DAEMONNAME}" != "samba" ] && daemon_list=${DAEMONNAME} - -signal_do() { - local signal="$1" - [ -z "${signal}" ] && return 0 - - local result=0 last_result=0 daemon= cmd_exec= - for daemon in ${daemon_list} ; do - eval cmd_exec=\$${daemon}_${signal} - if [ -n "${cmd_exec}" ]; then - ebegin "${my_service_name} -> ${signal}: ${daemon}" - #echo ${cmd} '->' ${!cmd} - ${cmd_exec} > /dev/null - last_result=$? - eend ${last_result} - fi - result=$(( ${result} + ${last_result} )) - done - return ${result} -} - -start() { - ${my_service_PRE} - [ -d "${piddir}" ] || mkdir -p "${piddir}" - signal_do start && return 0 - - eerror "Error: starting services (see system logs)" - signal_do stop - return 1 -} -stop() { - ${my_service_PRE} - if signal_do stop ; then - ${my_service_POST} - return 0 - fi -} -reload() { - ${my_service_PRE} - signal_do reload -} diff --git a/pcr/openrc-net/saslauthd2.rc7 b/pcr/openrc-net/saslauthd2.rc7 deleted file mode 100644 index d6b453e92..000000000 --- a/pcr/openrc-net/saslauthd2.rc7 +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd2.rc7,v 1.1 2013/07/13 12:01:10 pacho Exp $ - -depend() { - need net -} - -start() { - ebegin "Starting saslauthd" - start-stop-daemon --start --quiet --exec /usr/sbin/saslauthd \ - -- ${SASLAUTHD_OPTS} - eend $? -} - -stop() { - ebegin "Stopping saslauthd" - start-stop-daemon --stop --quiet --pidfile /run/saslauthd/saslauthd.pid - eend $? -} diff --git a/pcr/openrc-net/slapd-confd-2.4.28-r1 b/pcr/openrc-net/slapd-confd-2.4.28-r1 deleted file mode 100644 index ef19899a3..000000000 --- a/pcr/openrc-net/slapd-confd-2.4.28-r1 +++ /dev/null @@ -1,26 +0,0 @@ -# conf.d file for openldap -# -# To enable both the standard unciphered server and the ssl encrypted -# one uncomment this line or set any other server starting options -# you may desire. - -# If you have multiple slapd instances per #376699, this will provide a default config -INSTANCE="openldap${SVCNAME#slapd}" - -# If you use the classical configuration file: -OPTS_CONF="-f /etc/${INSTANCE}/slapd.conf" -# Uncomment this instead to use the new slapd.d configuration directory for openldap 2.3 -#OPTS_CONF="-F /etc/${INSTANCE}/slapd.d" -# (the OPTS_CONF variable is also passed to slaptest during startup) - -OPTS="${OPTS_CONF} -h 'ldaps:// ldap:// ldapi://%2fvar%2frun%2fopenldap%2fslapd.sock'" -# Optional connectionless LDAP: -#OPTS="${OPTS_CONF} -h 'ldaps:// ldap:// ldapi://%2fvar%2frun%2fopenldap%2fslapd.sock cldap://'" - -# If you change the above listen statement to bind on a specific IP for -# listening, you should ensure that interface is up here (change eth0 as -# needed). -#rc_need="net.eth0" - -# Specify the kerberos keytab file -#KRB5_KTNAME=/etc/openldap/krb5-ldap.keytab diff --git a/pcr/openrc-net/slapd-initd-2.4.28-r1 b/pcr/openrc-net/slapd-initd-2.4.28-r1 deleted file mode 100644 index 48946d6ef..000000000 --- a/pcr/openrc-net/slapd-initd-2.4.28-r1 +++ /dev/null @@ -1,36 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-initd-2.4.28-r1,v 1.4 2012/05/27 07:22:43 robbat2 Exp $ - -extra_commands="checkconfig" - -[ -z "$INSTANCE" ] && INSTANCE="openldap${SVCNAME#slapd}" - -depend() { - need net - before dbus hald avahi-daemon - provide ldap -} - -start() { - checkpath -q -d /var/run/openldap/ -o ldap:ldap - if ! checkconfig -Q ; then - eerror "There is a problem with your slapd.conf!" - return 1 - fi - ebegin "Starting ldap-server" - [ -n "$KRB5_KTNAME" ] && export KRB5_KTNAME - eval start-stop-daemon --start --pidfile /var/run/openldap/${SVCNAME}.pid --exec /usr/lib/openldap/slapd -- -u ldap -g ldap "${OPTS}" - eend $? -} - -stop() { - ebegin "Stopping ldap-server" - start-stop-daemon --stop --signal 2 --quiet --pidfile /var/run/openldap/${SVCNAME}.pid - eend $? -} - -checkconfig() { - /usr/sbin/slaptest -u "$@" ${OPTS_CONF} -} diff --git a/pcr/openrc-net/slpd-init b/pcr/openrc-net/slpd-init deleted file mode 100644 index bbc0eac1a..000000000 --- a/pcr/openrc-net/slpd-init +++ /dev/null @@ -1,89 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/files/slpd-init,v 1.5 2012/02/09 08:19:35 robbat2 Exp $ - -depend() { - need net -} - -# -# Does nothing if a route exists that supports multicast traffic. -# If no routes supporting multicast traffic exists, the function -# tries to add one. A 0 is returned on success and a 1 on failure. -# One parameter must be passed in. This variable determins verbosity. -# If parameter is non-zero debugging will appear. -# -multicast_route_set() { - PING_OPTIONS_1='-c1 -w1' - PING_OPTIONS_2='-c1 -i1' - MULTICAST_ADDRESS='239.255.255.253' - TMP_FILE=/tmp/route.check - PING_ERROR_NO_ROUTE='unreachable' - - MSG_FAILED_TO_FIND='Failed to Detect Multicast Route' - MSG_SUCCESS_ON_FIND='Multicast Route Enabled' - MSG_ADDING_ROUTE='Attempting to Add Multicast Route ...' - MSG_FAILED_TO_ADD=' FAILED - Route NOT Added.' - MSG_SUCCES_ON_ADD=' SUCCESS - Route Added.' - - CMD_GET_INTERFACE="netstat -i | awk 'BEGIN{}(NR>2)&&(!/^lo*/){print \$1;exit}'" - CMD_ADD_ROUTE="route add -net 224.0.0.0 netmask 240.0.0.0" - - ping $PING_OPTIONS_1 $MULTICAST_ADDRESS 2> $TMP_FILE 1> /dev/null - if [ $? = 2 ]; then - ping $PING_OPTIONS_2 $MULTICAST_ADDRESS 2> $TMP_FILE 1> /dev/null - fi - - grep $PING_ERROR_NO_ROUTE $TMP_FILE > /dev/null 2>&1 - err_unreachable_found=$? - - #If errors, add route. Otherwise, do nothing - if [ -s $TMP_FILE ] && [ $err_unreachable_found = 0 ]; then - - if [ $1 != 0 ]; then - echo $MSG_FAILED_TO_FIND - echo $MSG_ADDING_ROUTE - fi - - $CMD_ADD_ROUTE `eval $CMD_GET_INTERFACE` > /dev/null 2>&1 - retval=$? - if [ $1 != 0 ]; then - - if [ $retval = 0 ]; then - echo $MSG_SUCCES_ON_ADD - else - echo $MSG_FAILED_TO_ADD - fi - fi - else - if [ $1 != 0 ]; then - echo -n $MSG_SUCCESS_ON_FIND - fi - retval=0 - fi - - rm -f $TMP_FILE # Clean up - return $retval -} - -checkconfig() { - multicast_route_set 0 - if [ $? -ne 0 ]; then - eerror "No route available for multicast traffic!" - return 1 - fi -} - -start() { - checkconfig || return 1 - ebegin "Starting slpd" - start-stop-daemon --start --quiet --exec /usr/sbin/slpd --pidfile /var/run/slpd.pid - eend $? -} - -stop() { - ebegin "Stopping slpd" - start-stop-daemon --stop --quiet --pidfile /var/run/slpd.pid - eend $? -} diff --git a/pcr/openrc-net/squid.confd-r1 b/pcr/openrc-net/squid.confd-r1 deleted file mode 100644 index f17bfe06f..000000000 --- a/pcr/openrc-net/squid.confd-r1 +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.confd-r1,v 1.1 2013/01/11 15:25:49 eras Exp $ - -# Config file for /etc/init.d/squid - -SQUID_OPTS="-YC" - -# Kerberos keytab file to use. This is required if you enable kerberos authentication. -SQUID_KEYTAB="" - -# Use max_filedescriptors setting in squid.conf to determine the maximum number -# of filedescriptors squid can open. diff --git a/pcr/openrc-net/squid.initd-r4 b/pcr/openrc-net/squid.initd-r4 deleted file mode 100644 index 0b5741955..000000000 --- a/pcr/openrc-net/squid.initd-r4 +++ /dev/null @@ -1,118 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-r4,v 1.1 2014/01/18 22:16:27 eras Exp $ - -extra_started_commands="reload rotate" - -depend() { - use dns net -} - -checkconfig() { - if [ ! -f /etc/squid/${SVCNAME}.conf ]; then - eerror "You need to create /etc/squid/${SVCNAME}.conf first." - eerror "An example can be found in /etc/squid/squid.conf.default" - return 1 - fi - - local PIDFILE=$(awk '/^[ \t]*pid_filename[ \t]+/ { print $2 }' < /etc/squid/${SVCNAME}.conf) - [ -z ${PIDFILE} ] && PIDFILE=/run/squid.pid - if [ /run/${SVCNAME}.pid != ${PIDFILE} ]; then - eerror "/etc/squid/${SVCNAME}.conf must set pid_filename to" - eerror " /run/${SVCNAME}.pid" - eerror "CAUTION: http_port, cache_dir and *_log parameters must be different than" - eerror " in any other instance of squid." - return 1 - fi - - # Maximum file descriptors squid can open is determined by: - # a basic default of N=1024 - # ... altered by ./configure --with-filedescriptors=N - # ... overridden on production by squid.conf max_filedescriptors (if, - # and only if, setrlimit() RLIMIT_NOFILE is able to be built+used). - # Since we do not configure hard coded # of filedescriptors anymore, - # there is no need for ulimit calls in the init script. - # Use max_filedescriptors in squid.conf instead. - - local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ( $2 == "rock" ) printf "%s/rock ", $3; else if ( $2 == "coss" ) printf "%s/stripe ", $3; else printf "%s/00 ", $3; }' < /etc/squid/${SVCNAME}.conf) - [ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00" - - local x - for x in $CACHE_SWAP ; do - if [ ! -e $x ] ; then - ebegin "Initializing cache directory ${x%/*}" - local ORIG_UMASK=$(umask) - umask 027 - - if ! (mkdir -p ${x%/*} && chown squid ${x%/*}) ; then - eend 1 - return 1 - fi - - local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N -f /etc/squid/${SVCNAME}.conf 2>&1)" - if [ $? != 0 ] || echo "$INIT_CACHE_RESPONSE" | grep -q "erminated abnormally" ; then - umask $ORIG_UMASK - eend 1 - echo "$INIT_CACHE_RESPONSE" - return 1 - fi - - umask $ORIG_UMASK - eend 0 - break - fi - done - - return 0 -} - -start() { - checkconfig || return 1 - checkpath -d -q -m 0750 -o squid:squid /run/${SVCNAME} - - ebegin "Starting ${SVCNAME}" - KRB5_KTNAME="${SQUID_KEYTAB}" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${SVCNAME}.conf - eend $? && sleep 1 -} - -stop() { - ebegin "Stopping ${SVCNAME}" - if /usr/sbin/squid -k shutdown -f /etc/squid/${SVCNAME}.conf ; then - # Now we have to wait until squid has _really_ stopped. - sleep 1 - if [ -f /run/${SVCNAME}.pid ] ; then - einfon "Waiting for squid to shutdown ." - cnt=0 - while [ -f /run/${SVCNAME}.pid ] ; do - cnt=$(expr $cnt + 1) - if [ $cnt -gt 60 ] ; then - # Waited 120 seconds now. Fail. - echo - eend 1 "Failed." - break - fi - sleep 2 - echo -n "." - done - echo - fi - else - eerror "Squid shutdown failed, probably service is already down." - fi - eend 0 -} - -reload() { - checkconfig || return 1 - ebegin "Reloading ${SVCNAME}" - /usr/sbin/squid -k reconfigure -f /etc/squid/${SVCNAME}.conf - eend $? -} - -rotate() { - service_started ${SVCNAME} || return 1 - ebegin "Rotating ${SVCNAME} logs" - /usr/sbin/squid -k rotate -f /etc/squid/${SVCNAME}.conf - eend $? -} diff --git a/pcr/openrc-net/sshd.confd b/pcr/openrc-net/sshd.confd deleted file mode 100644 index 28952b4a2..000000000 --- a/pcr/openrc-net/sshd.confd +++ /dev/null @@ -1,21 +0,0 @@ -# /etc/conf.d/sshd: config file for /etc/init.d/sshd - -# Where is your sshd_config file stored? - -SSHD_CONFDIR="/etc/ssh" - - -# Any random options you want to pass to sshd. -# See the sshd(8) manpage for more info. - -SSHD_OPTS="" - - -# Pid file to use (needs to be absolute path). - -#SSHD_PIDFILE="/var/run/sshd.pid" - - -# Path to the sshd binary (needs to be absolute path). - -#SSHD_BINARY="/usr/sbin/sshd" diff --git a/pcr/openrc-net/sshd.rc6.4 b/pcr/openrc-net/sshd.rc6.4 deleted file mode 100644 index 1b872bc87..000000000 --- a/pcr/openrc-net/sshd.rc6.4 +++ /dev/null @@ -1,87 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6.4,v 1.3 2013/04/24 03:13:03 vapier Exp $ - -extra_commands="checkconfig" -extra_started_commands="reload" - -SSHD_CONFDIR=${SSHD_CONFDIR:-/etc/ssh} -SSHD_CONFIG=${SSHD_CONFIG:-${SSHD_CONFDIR}/sshd_config} -SSHD_PIDFILE=${SSHD_PIDFILE:-/var/run/${SVCNAME}.pid} -SSHD_BINARY=${SSHD_BINARY:-/usr/sbin/sshd} - -depend() { - use logger dns - if [ "${rc_need+set}" = "set" ]; then - : # Do nothing, the user has explicitly set rc_need - else - warn_addr='' - for x in $(awk '/^ListenAddress/{ print $2 }' "$SSHD_CONFIG" 2>/dev/null) ; do - case "$x" in - 0.0.0.0|0.0.0.0:*) ;; - ::|\[::\]*) ;; - *) warn_addr="${warn_addr} $x" ;; - esac - done - unset x - if [ "${warn_addr:+set}" = "set" ]; then - need net - ewarn "You are binding an interface in ListenAddress statement in your sshd_config!" - ewarn "You must add rc_need=\"net.FOO\" to your /etc/conf.d/sshd" - ewarn "where FOO is the interface(s) providing the following address(es):" - ewarn "${warn_addr}" - fi - unset warn_addr - fi -} - -checkconfig() { - if [ ! -d /var/empty ] ; then - mkdir -p /var/empty || return 1 - fi - - if [ ! -e "${SSHD_CONFDIR}"/sshd_config ] ; then - eerror "You need an ${SSHD_CONFDIR}/sshd_config file to run sshd" - eerror "There is a sample file in /usr/share/doc/openssh" - return 1 - fi - - ssh-keygen -A || return 1 - - [ "${SSHD_PIDFILE}" != "/var/run/sshd.pid" ] \ - && SSHD_OPTS="${SSHD_OPTS} -o PidFile=${SSHD_PIDFILE}" - [ "${SSHD_CONFDIR}" != "/etc/ssh" ] \ - && SSHD_OPTS="${SSHD_OPTS} -f ${SSHD_CONFDIR}/sshd_config" - - "${SSHD_BINARY}" -t ${SSHD_OPTS} || return 1 -} - -start() { - checkconfig || return 1 - - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --exec "${SSHD_BINARY}" \ - --pidfile "${SSHD_PIDFILE}" \ - -- ${SSHD_OPTS} - eend $? -} - -stop() { - if [ "${RC_CMD}" = "restart" ] ; then - checkconfig || return 1 - fi - - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --exec "${SSHD_BINARY}" \ - --pidfile "${SSHD_PIDFILE}" --quiet - eend $? -} - -reload() { - checkconfig || return 1 - ebegin "Reloading ${SVCNAME}" - start-stop-daemon --signal HUP \ - --exec "${SSHD_BINARY}" --pidfile "${SSHD_PIDFILE}" - eend $? -} diff --git a/pcr/openrc-net/tor.confd b/pcr/openrc-net/tor.confd deleted file mode 100644 index 4195bf323..000000000 --- a/pcr/openrc-net/tor.confd +++ /dev/null @@ -1,3 +0,0 @@ -# -# Set the file limit -rc_ulimit="-n 30000" diff --git a/pcr/openrc-net/tor.initd-r6 b/pcr/openrc-net/tor.initd-r6 deleted file mode 100644 index c31eac12f..000000000 --- a/pcr/openrc-net/tor.initd-r6 +++ /dev/null @@ -1,60 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/files/Attic/tor.initd-r6,v 1.7 2015/03/20 12:46:13 blueness dead $ - -extra_commands="checkconfig" -extra_started_commands="reload" - -PIDFILE=/var/run/tor/tor.pid -CONFFILE=/etc/tor/torrc - -depend() { - need net -} - -checkconfig() { - # first check that it exists - if [ ! -f ${CONFFILE} ] ; then - eerror "You need to setup ${CONFFILE} first" - eerror "Example is in ${CONFFILE}.sample" - return 1 - fi - - # now verify whether the configuration is valid - /usr/bin/tor --verify-config -f ${CONFFILE} > /dev/null 2>&1 - if [ $? -eq 0 ] ; then - einfo "Tor configuration (${CONFFILE}) is valid." - return 0 - else - eerror "Tor configuration (${CONFFILE}) not valid." - /usr/bin/tor --verify-config -f ${CONFFILE} - return 1 - fi -} - -start() { - checkconfig || return 1 - checkpath -d -m 0755 -o tor:tor /var/run/tor - ebegin "Starting Tor" - HOME=/var/lib/tor - start-stop-daemon --start --pidfile "${PIDFILE}" --quiet --exec /usr/bin/tor -- -f "${CONFFILE}" --runasdaemon 1 --PidFile "${PIDFILE}" > /dev/null 2>&1 - eend $? -} - -stop() { - ebegin "Stopping Tor" - start-stop-daemon --stop --pidfile "${PIDFILE}" --exec /usr/bin/tor -- --PidFile "${PIDFILE}" - eend $? -} - -reload() { - if [ ! -f ${PIDFILE} ]; then - eerror "${SVCNAME} isn't running" - return 1 - fi - checkconfig || return 1 - ebegin "Reloading Tor configuration" - start-stop-daemon --signal HUP --pidfile ${PIDFILE} - eend $? -} diff --git a/pcr/openrc-net/transmission-daemon.confd.4 b/pcr/openrc-net/transmission-daemon.confd.4 deleted file mode 100644 index 8f3b1317a..000000000 --- a/pcr/openrc-net/transmission-daemon.confd.4 +++ /dev/null @@ -1,14 +0,0 @@ -# This is the transmission-daemon configuration file. For other options and -# better explanation, take a look at transmission-daemon manual page Note: it's -# better to configure some settings (like username/password) in -# /var/lib/transmission/config/settings.json to avoid other users see it with `ps` - -TRANSMISSION_OPTIONS="--encryption-preferred" - -# Run daemon as another user (username or username:groupname) -# If you change this setting, chown -R /var/lib/transmission/config <and download directory, check web settings> -#runas_user=transmission - -# Location of logfile (should be writeable for runas_user user) -# Set logfile=syslog to use syslog for logging -#logfile=/var/log/transmission/transmission.log diff --git a/pcr/openrc-net/transmission-daemon.initd.9 b/pcr/openrc-net/transmission-daemon.initd.9 deleted file mode 100644 index 3c4914c58..000000000 --- a/pcr/openrc-net/transmission-daemon.initd.9 +++ /dev/null @@ -1,73 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/files/transmission-daemon.initd.9,v 1.1 2013/09/07 12:10:01 ssuominen Exp $ - -extra_started_commands="reload" -description="Transmission is a fast, easy and free bittorrent client" -description_start="Start transmission-daemon server and web interface" -description_stop="Stop transmission-daemon server and web interface" -description_reload="Reload transmission-daemon settings" - -rundir=${rundir:-/var/run/transmission} -pidfile=${pidfile:-${rundir}/transmission.pid} -config_dir=${config_dir:-/var/lib/transmission/config} -download_dir=${download_dir:-/var/lib/transmission/downloads} -logfile=${logfile:-/var/log/transmission/transmission.log} -runas_user=${runas_user:-transmission:transmission} - -SSD_OPTIONS="" - -depend() { - need net -} - -check_config() { - if [ ! -d "${rundir}" ]; then - mkdir "${rundir}" - if [ -n "${runas_user}" ]; then - chown -R ${runas_user} "${rundir}" - fi - fi - - # In case no config directory option passed use default - if ! $(echo ${TRANSMISSION_OPTIONS} | grep -q -e '\B-g' -e '\B--config-dir'); then - TRANSMISSION_OPTIONS="${TRANSMISSION_OPTIONS} --config-dir ${config_dir}" - # put download dir location on first run (and take it from config later) - if [ ! -f ${config_dir}/settings.json ]; then - TRANSMISSION_OPTIONS="${TRANSMISSION_OPTIONS} --download-dir ${download_dir}" - fi - fi - - if [ -n "${runas_user}" ]; then - if [ -f /etc/init.d/sysfs ]; then - SSD_OPTIONS="${SSD_OPTIONS} --user ${runas_user}" - else - SSD_OPTIONS="${SSD_OPTIONS} --chuid ${runas_user}" - fi - fi -} - -start() { - check_config - - ebegin "Starting transmission daemon" - start-stop-daemon --start --quiet --pidfile ${pidfile} ${SSD_OPTIONS} \ - --exec /usr/bin/transmission-daemon -- --pid-file ${pidfile} \ - $(test ${logfile} != "syslog" && echo --logfile ${logfile}) \ - ${TRANSMISSION_OPTIONS} - eend $? -} - -stop() { - ebegin "Stopping transmission daemon" - start-stop-daemon --stop --quiet --retry TERM/45/QUIT/15 --pidfile ${pidfile} - eend $? -} - -reload() { - ebegin "Reloading transmission configuration" - start-stop-daemon --signal HUP --pidfile ${pidfile} - eend $? -} - diff --git a/pcr/openrc-net/ufw-2.initd b/pcr/openrc-net/ufw-2.initd deleted file mode 100644 index 1ffd1c596..000000000 --- a/pcr/openrc-net/ufw-2.initd +++ /dev/null @@ -1,137 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw/files/ufw-2.initd,v 1.2 2012/06/13 21:14:52 thev00d00 Exp $ - -depend() { - before net - provide firewall -} - -start() { - ebegin "Starting ufw" - _source_file || { eend $?; return $?; } - - local enabled_in_cfg ret - _check_if_enabled_in_cfg - enabled_in_cfg=$? - - # Avoid "Firewall already started, use 'force-reload'" message that - # appears if `ufw enable' had been run before start(). - if _status_quiet; then - eend 0 - return - fi - - # The ufw_start function does the same: if ufw is disabled using `ufw disable', - # ufw_start would not start ufw and return 0, so let's handle this case. - case $enabled_in_cfg in - 0) - ufw_start - ret=$? - eend $ret "Failed to start ufw." - ;; - 1) - # see /etc/conf.d/<name> - if [ "${ufw_nonfatal_if_disabled:-no}" != "yes" ]; then - ret=1 - eend $ret "Not starting firewall (not enabled), use \"ufw enable\" first." - else - ret=0 - eend 0 - fi - ;; - 2) - ret=1 - eend $ret "Failed to start ufw." - ;; - esac - - return $ret -} - -stop() { - ebegin "Stopping ufw" - _source_file || { eend $?; return $?; } - local enabled_in_cfg ret - _check_if_enabled_in_cfg - enabled_in_cfg=$? - - # Same as above (unless --force is passed to ufw_stop). - case $enabled_in_cfg in - 0) - ufw_stop - ret=$? - ;; - 1) - einfo "INFO: ufw is configured to be disabled" - ufw_stop --force - ret=$? - ;; - 2) - ret=1 - ;; - esac - - eend $ret "Failed to stop ufw." - return $ret -} - -_status_quiet() { - # return values: 0 - started, 1 - stopped, 2 - error - # Does not execute _source_file. - local ret - ufw_status > /dev/null - ret=$? - # Return values for ufw_status come from /usr/share/ufw/ufw-init-functions. - case $ret in - 0) return 0 ;; - 3) return 1 ;; - *) return 2 ;; - esac -} - -_source_file() { - local sourced_f="/usr/share/ufw/ufw-init-functions" - if [ ! -f "$sourced_f" ]; then - eerror "Cannot find file $sourced_f!" - return 1 - fi - - local _path=$PATH - if ! . "$sourced_f"; then - # PATH can be broken here, fix it... - PATH=$_path - eerror "Error sourcing file $sourced_f" - return 1 - fi - - if [ -z "$PATH" ]; then - PATH=$_path - else - PATH="${PATH}:${_path}" - fi - return 0 -} - -_check_if_enabled_in_cfg() { - # Check if user has enabled the firewall with "ufw enable". - # Return 0 if firewall enabled in configuration file, 1 otherwise, 2 on error. - - local sourced_f="/etc/ufw/ufw.conf" - if [ ! -f "$sourced_f" ]; then - eerror "Cannot find file $sourced_f!" - return 2 - fi - - if ! . "$sourced_f"; then - eerror "Error sourcing file $sourced_f" - return 2 - fi - - if [ "$ENABLED" = "yes" ] || [ "$ENABLED" = "YES" ]; then - return 0 - else - return 1 - fi -} diff --git a/pcr/openrc-net/ufw.confd b/pcr/openrc-net/ufw.confd deleted file mode 100644 index 900d3bf67..000000000 --- a/pcr/openrc-net/ufw.confd +++ /dev/null @@ -1,5 +0,0 @@ -# If equals to "yes", warnings that firewall is disabled -# (using `ufw disable') will be suppressed and the service -# will be considered started. -# Default if unset or another value is "no". -ufw_nonfatal_if_disabled=no diff --git a/pcr/openrc-net/vsftpd-checkconfig.sh b/pcr/openrc-net/vsftpd-checkconfig.sh deleted file mode 100644 index e1d1e5231..000000000 --- a/pcr/openrc-net/vsftpd-checkconfig.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -VSFTPD_CONF="${VSFTPD_CONF:-/etc/vsftpd/vsftpd.conf}" - -if [ ! -e ${VSFTPD_CONF} ] ; then - echo "Please setup ${VSFTPD_CONF} before starting vsftpd" >&2 - echo "There are sample configurations in /usr/share/doc/vsftpd" >&2 - exit 1 -fi - -if egrep -iq "^ *background *= *yes" "${VSFTPD_CONF}" ; then - echo "${VSFTPD_CONF} must not set background=YES" >&2 - exit 1 -fi - -has_ip=false has_ipv6=false ip_error=true -egrep -iq "^ *listen *= *yes" "${VSFTPD_CONF}" && has_ip=true -egrep -iq "^ *listen_ipv6 *= *yes" "${VSFTPD_CONF}" && has_ipv6=true -if ${has_ip} && ! ${has_ipv6} ; then - ip_error=false -elif ! ${has_ip} && ${has_ipv6} ; then - ip_error=false -fi -if ${ip_error} ; then - echo "${VSFTPD_CONF} must contain listen=YES or listen_ipv6=YES" >&2 - echo "but not both" >&2 - exit 1 -fi - diff --git a/pcr/openrc-net/vsftpd.init b/pcr/openrc-net/vsftpd.init deleted file mode 100644 index e1c26c7d8..000000000 --- a/pcr/openrc-net/vsftpd.init +++ /dev/null @@ -1,51 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init,v 1.9 2015/01/31 13:07:47 hwoarang Exp $ - -VSFTPD_NAME=${SVCNAME##*.} -if [ -n "${VSFTPD_NAME}" -a "${SVCNAME}" != "vsftpd" ]; then - VSFTPD_PID="/var/run/vsftpd.${VSFTPD_NAME}.pid" - VSFTPD_CONF_DEFAULT="/etc/vsftpd/${VSFTPD_NAME}.conf" -else - VSFTPD_PID="/var/run/vsftpd.pid" - VSFTPD_CONF_DEFAULT="/etc/vsftpd/vsftpd.conf" -fi -VSFTPD_CONF=${VSFTPD_CONF:-${VSFTPD_CONF_DEFAULT}} -VSFTPD_EXEC=${VSFTPD_EXEC:-/usr/sbin/vsftpd} - -depend() { - need net - use dns logger -} - -checkconfig() { - VSFTPD_CONF="${VSFTPD_CONF}" \ - /usr/libexec/vsftpd-checkconfig.sh || return 1 -} - -start() { - checkconfig || return 1 - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --exec ${VSFTPD_EXEC} \ - --background --make-pidfile --pidfile "${VSFTPD_PID}" \ - -- "${VSFTPD_CONF}" - eend $? -} - -stop() { - ebegin "Stopping ${SVCNAME}" - local retval=0 - if [ -f ${VSFTPD_PID} ]; then - start-stop-daemon --stop --pidfile ${VSFTPD_PID} || retval=1 - pkill --full ${VSFTPD_CONF} - else - ewarn "Couldn't find ${VSFTPD_PID} trying to stop using the config filename ${VSFTPD_CONF}" - pgrep --full ${VSFTPD_CONF} > ${VSFTPD_PID} - start-stop-daemon --stop --pidfile ${VSFTPD_PID} || retval=1 - pkill --full ${VSFTPD_CONF} - fi - eend ${retval} -} - -# vim: ts=4 diff --git a/pcr/openrc-net/xinetd.confd b/pcr/openrc-net/xinetd.confd deleted file mode 100644 index ae211f3d8..000000000 --- a/pcr/openrc-net/xinetd.confd +++ /dev/null @@ -1,3 +0,0 @@ -# /etc/conf.d/xinetd: config file for /etc/init.d/xinetd - -XINETD_OPTS="-stayalive -reuse" diff --git a/pcr/openrc-net/xinetd.rc6 b/pcr/openrc-net/xinetd.rc6 deleted file mode 100644 index 2f90775c0..000000000 --- a/pcr/openrc-net/xinetd.rc6 +++ /dev/null @@ -1,33 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/files/xinetd.rc6,v 1.24 2011/10/11 01:26:08 vapier Exp $ - -extra_started_commands="reload dump check" - -depend() { - use net -} - -start() { - ebegin "Starting xinetd" - start-stop-daemon --start --exec /usr/sbin/xinetd -- \ - -pidfile /var/run/xinetd.pid ${XINETD_OPTS} - eend $? -} - -stop() { - ebegin "Stopping xinetd" - start-stop-daemon --stop --quiet --pidfile /var/run/xinetd.pid - eend $? -} - -do_sig() { - local sig=$1 ; shift - ebegin "$*" - start-stop-daemon --signal ${sig} --pidfile /var/run/xinetd.pid - eend $? -} -reload() { do_sig HUP "Reloading configuration" ; } -dump() { do_sig USR1 "Dumping configuration" ; } -check() { do_sig IOT "Performing Consistency Check" ; } diff --git a/pcr/openrc-net/ypbind.confd-r1 b/pcr/openrc-net/ypbind.confd-r1 deleted file mode 100644 index 91cdc60c1..000000000 --- a/pcr/openrc-net/ypbind.confd-r1 +++ /dev/null @@ -1,4 +0,0 @@ -# Config file for /etc/init.d/ypbind - -# Set any command line options you want to pass to ypbind. -YPBIND_OPTS="" diff --git a/pcr/openrc-net/ypbind.initd b/pcr/openrc-net/ypbind.initd deleted file mode 100644 index f227a4172..000000000 --- a/pcr/openrc-net/ypbind.initd +++ /dev/null @@ -1,41 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/ypbind/files/ypbind.initd,v 1.6 2009/02/24 17:25:01 drizzt Exp $ - -depend() { - need net portmap - use ypserv domainname -} - -start() { - ebegin "Starting ypbind" - if [ -n "${YPBIND_OPTS}" ]; then - YOPTS="-- ${YPBIND_OPTS}" - fi - start-stop-daemon --start --quiet --exec /usr/sbin/ypbind ${YOPTS} - local ret=$? - if [ $ret -eq 0 ] ; then - notfound=1 - for i in 0 1 2 3 4 5 6 7 8 9 - do - ypwhich >/dev/null 2>&1 && { notfound=0; break; } - sleep 1 - done - if [ $notfound -eq 1 ] ; then - eend 1 "No NIS server found" - else - eend 0 - fi - else - eend $ret - fi -} - -stop() { - ebegin "Stopping ypbind" - start-stop-daemon --stop --quiet --exec /usr/sbin/ypbind - eend $? - # Remove binding files, if ypbind "forgets" it - rm -f /var/yp/binding/* -} diff --git a/pcr/openrc-net/ypserv b/pcr/openrc-net/ypserv deleted file mode 100644 index be1dc42e1..000000000 --- a/pcr/openrc-net/ypserv +++ /dev/null @@ -1,23 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/files/ypserv,v 1.4 2006/04/10 20:00:18 eradicator Exp $ - -depend() { - need net portmap - use domainname -} - -start() { - ebegin "Starting NIS Server" - YOPTS="" - if [ -n "${YPSERV_OPTS}" ]; then YOPTS="-- ${YPSERV_OPTS}"; fi - start-stop-daemon --start --quiet --exec /usr/sbin/ypserv ${YOPTS} - eend $? -} - -stop() { - ebegin "Stopping NIS Server" - start-stop-daemon --stop --quiet --exec /usr/sbin/ypserv - eend $? -} diff --git a/pcr/openrc-net/ypserv.confd b/pcr/openrc-net/ypserv.confd deleted file mode 100644 index 0ae9756dc..000000000 --- a/pcr/openrc-net/ypserv.confd +++ /dev/null @@ -1,4 +0,0 @@ -# Config file for /etc/init.d/ypserv - -# Command line options to pass to ypserv: -YPSERV_OPTS="" diff --git a/pcr/openssh-knock/PKGBUILD b/pcr/openssh-knock/PKGBUILD index 2a8368d79..a3c0cc8f5 100644 --- a/pcr/openssh-knock/PKGBUILD +++ b/pcr/openssh-knock/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 242452 2015-07-23 02:38:36Z bisson $ +# $Id: PKGBUILD 243157 2015-08-11 14:15:07Z bisson $ # Maintainer (Arch): Gaetan Bisson <bisson@archlinux.org> # Contributor (Arch): Aaron Griffin <aaron@archlinux.org> # Contributor (Arch): judd <jvinet@zeroflux.org> @@ -7,8 +7,8 @@ _pkgname=openssh pkgname=openssh-knock -pkgver=6.9p1 -pkgrel=2 +pkgver=7.0p1 +pkgrel=1 pkgdesc='Free version of the SSH connectivity tools, with support for stealth TCP sockets' url='http://www.openssh.org/portable.html' license=('custom:BSD') @@ -24,16 +24,14 @@ validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30' source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${_pkgname}-${pkgver}.tar.gz"{,.asc} #"http://gnunet.org/sites/default/files/${_pkgname}-linux-knock-patch_0.diff" "https://repo.parabola.nu/other/knock/patches/openssh/${_pkgname}-${pkgver}-linux-knock-patch.diff"{,.sig} - 'keyboard-interactive.patch' 'sshdgenkeys.service' 'sshd@.service' 'sshd.service' 'sshd.socket' 'sshd.conf' 'sshd.pam') -sha1sums=('86ab57f00d0fd9bf302760f2f6deac1b6e9df265' 'SKIP' - '149450fd40099e274a09b033cd2ff6e7439e64e8' 'SKIP' - 'ef9e9327a943839abb3d202783b318e9cd2bdcd5' +sha1sums=('d8337c9eab91d360d104f6dd805f8b32089c063c' 'SKIP' + '36fc52e849ef5baf20f48b3d8bd0568849d45dd6' 'SKIP' 'cc1ceec606c98c7407e7ac21ade23aed81e31405' '6a0ff3305692cf83aca96e10f3bb51e1c26fccda' 'ec49c6beba923e201505f5669cea48cad29014db' @@ -47,7 +45,6 @@ install=install prepare() { cd "${srcdir}/${_pkgname}-${pkgver}" - patch -p1 -i ../keyboard-interactive.patch patch -Np1 -i "${srcdir}"/${_pkgname}-${pkgver}-linux-knock-patch.diff } diff --git a/pcr/openssh-knock/keyboard-interactive.patch b/pcr/openssh-knock/keyboard-interactive.patch deleted file mode 100644 index 4adafebc1..000000000 --- a/pcr/openssh-knock/keyboard-interactive.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 5b64f85bb811246c59ebab70aed331f26ba37b18 Mon Sep 17 00:00:00 2001 -From: "djm@openbsd.org" <djm@openbsd.org> -Date: Sat, 18 Jul 2015 07:57:14 +0000 -Subject: upstream commit - -only query each keyboard-interactive device once per - authentication request regardless of how many times it is listed; ok markus@ - -Upstream-ID: d73fafba6e86030436ff673656ec1f33d9ffeda1 ---- - auth2-chall.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/auth2-chall.c b/auth2-chall.c -index ddabe1a..4aff09d 100644 ---- a/auth2-chall.c -+++ b/auth2-chall.c -@@ -1,4 +1,4 @@ --/* $OpenBSD: auth2-chall.c,v 1.42 2015/01/19 20:07:45 markus Exp $ */ -+/* $OpenBSD: auth2-chall.c,v 1.43 2015/07/18 07:57:14 djm Exp $ */ - /* - * Copyright (c) 2001 Markus Friedl. All rights reserved. - * Copyright (c) 2001 Per Allansson. All rights reserved. -@@ -83,6 +83,7 @@ struct KbdintAuthctxt - void *ctxt; - KbdintDevice *device; - u_int nreq; -+ u_int devices_done; - }; - - #ifdef USE_PAM -@@ -169,11 +170,15 @@ kbdint_next_device(Authctxt *authctxt, KbdintAuthctxt *kbdintctxt) - if (len == 0) - break; - for (i = 0; devices[i]; i++) { -- if (!auth2_method_allowed(authctxt, -+ if ((kbdintctxt->devices_done & (1 << i)) != 0 || -+ !auth2_method_allowed(authctxt, - "keyboard-interactive", devices[i]->name)) - continue; -- if (strncmp(kbdintctxt->devices, devices[i]->name, len) == 0) -+ if (strncmp(kbdintctxt->devices, devices[i]->name, -+ len) == 0) { - kbdintctxt->device = devices[i]; -+ kbdintctxt->devices_done |= 1 << i; -+ } - } - t = kbdintctxt->devices; - kbdintctxt->devices = t[len] ? xstrdup(t+len+1) : NULL; --- -cgit v0.11.2 - diff --git a/pcr/packer-git/PKGBUILD b/pcr/packer-git/PKGBUILD new file mode 100644 index 000000000..398306da6 --- /dev/null +++ b/pcr/packer-git/PKGBUILD @@ -0,0 +1,41 @@ +# Maintainer (Arch): Kyle Keen <keenerd@gmail.com> +# Contributor (Arch): Gilrain <pierre.buard+aur gmail com> +# Contributor (Arch): bruenig +# Maintainer: André Silva <emulatorman@parabola.nu> +# Contributor: Aurélien DESBRIÈRES <aurelien@hackers.camp> + +_pkgname=packer +pkgname=packer-git +pkgver=r242.ed928f8 +pkgrel=1 +pkgdesc="Bash wrapper for pacman and pur" +url="http://github.com/keenerd/packer" +license=("GPL3") +arch=('any') +makedepends=('git') +depends=('grep' 'sed' 'bash' 'curl' 'pacman' 'jshon' 'expac') +optdepends=('sudo: install and update packages as non-root' + 'customizepkg: apply customizepkg modifications') +replaces=($_pkgname) +conflicts=($_pkgname) +provides=($_pkgname) +#source=('git://github.com/keenerd/packer.git') +source=('git+https://github.com/keenerd/packer.git' + 'pur-support.patch') +md5sums=('SKIP' + '8818f9d741539da4fadf9dfb1a1c02c6') + +pkgver() { + cd $_pkgname + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +} + +prepare() { + cd $_pkgname + patch -Np1 -i ../pur-support.patch +} + +package() { + install -Dm755 "$srcdir/$_pkgname/packer" "$pkgdir/usr/bin/packer" + install -Dm644 "$srcdir/$_pkgname/packer.8" "$pkgdir/usr/share/man/man8/packer.8" +} diff --git a/pcr/packer-git/pur-support.patch b/pcr/packer-git/pur-support.patch new file mode 100644 index 000000000..2656dc76d --- /dev/null +++ b/pcr/packer-git/pur-support.patch @@ -0,0 +1,531 @@ +diff -Nur a/packer b/packer +--- a/packer 2015-08-28 16:26:27.878307880 -0300 ++++ b/packer 2015-08-28 16:35:43.554089893 -0300 +@@ -24,9 +24,9 @@ + usermakepkgconf="$HOME/.makepkg.conf" + pacmanconf='/etc/pacman.conf' + +-RPCURL="https://aur.archlinux.org/rpc.php?type" +-PKGURL="https://aur.archlinux.org" +-PKGBURL="https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h" ++RPCURL="https://pur.parabola.nu/rpc.php?type" ++PKGURL="https://pur.parabola.nu" ++PKGBURL="https://pur.parabola.nu/cgit/pur.git/plain/PKGBUILD?h" + + if [[ -t 1 && ! $COLOR = "NO" ]]; then + COLOR1='\e[1;39m' +@@ -59,14 +59,14 @@ + echo ' -Syu|-Su - updates all packages, also takes -uu and -yy options' + echo ' -Ss|-Ssq - searches for package' + echo ' -Si - outputs info for package' +- echo ' -G - download and extract aur tarball only' ++ echo ' -G - download and extract pur tarball only' + echo + echo ' --quiet - only output package name for searches' + echo ' --ignore - takes a comma-separated list of packages to ignore' + echo ' --noconfirm - do not prompt for any confirmation' + echo ' --noedit - do not prompt to edit files' + echo ' --quickcheck - check for updates and exit' +- echo ' --auronly - only do actions for aur' ++ echo ' --puronly - only do actions for pur' + echo ' --devel - update devel packages during -Su' + echo ' --skipinteg - when using makepkg, do not check md5s' + echo ' --preview - edit pkgbuild before sourcing' +@@ -103,8 +103,8 @@ + [[ " ${ignoredpackages[@]} " =~ " $1 " ]] + } + +-# Tests whether $1 exists on the aur +-existsinaur() { ++# Tests whether $1 exists on the pur ++existsinpur() { + rpcinfo "$1" + [[ "$(jshon -Qe resultcount -u < "$tmpdir/$1.info")" != "0" ]] + } +@@ -131,8 +131,8 @@ + pacman -Qq -- "$1" &>/dev/null + } + +-# Scrapes the aur deps from PKGBUILDS and puts in globally available dependencies array +-scrapeaurdeps() { ++# Scrapes the pur deps from PKGBUILDS and puts in globally available dependencies array ++scrapepurdeps() { + pkginfo "$1" "$preview" + . "$tmpdir/$1.PKGBUILD" + IFS=$'\n' +@@ -141,26 +141,26 @@ + } + + # Finds dependencies of package $1 +-# Sets pacmandeps and aurdeps array, which can be accessed globally after function runs ++# Sets pacmandeps and purdeps array, which can be accessed globally after function runs + finddeps() { +- # loop through dependencies, if not installed, determine if pacman or aur deps ++ # loop through dependencies, if not installed, determine if pacman or pur deps + pacmandeps=() +- aurdeps=() +- scrapeaurdeps "$1" ++ purdeps=() ++ scrapepurdeps "$1" + missingdeps=( $(pacman -T "${dependencies[@]}") ) + while [[ $missingdeps ]]; do + checkdeps=() + for dep in "${missingdeps[@]}"; do +- if [[ " $1 ${aurdeps[@]} ${pacmandeps[@]} " =~ " $dep " ]]; then ++ if [[ " $1 ${purdeps[@]} ${pacmandeps[@]} " =~ " $dep " ]]; then + continue + fi + if existsinpacman "$dep"; then + pacmandeps+=("$dep") +- elif existsinaur "$dep"; then +- if [[ $aurdeps ]]; then +- aurdeps=("$dep" "${aurdeps[@]}") ++ elif existsinpur "$dep"; then ++ if [[ $purdeps ]]; then ++ purdeps=("$dep" "${purdeps[@]}") + else +- aurdeps=("$dep") ++ purdeps=("$dep") + fi + checkdeps+=("$dep") + elif providedinpacman "$dep"; then +@@ -173,7 +173,7 @@ + done + missingdeps=() + for dep in "${checkdeps[@]}"; do +- scrapeaurdeps "$dep" ++ scrapepurdeps "$dep" + for depdep in "${dependencies[@]}"; do + [[ $(pacman -T "$depdep") ]] && missingdeps+=("$depdep") + done +@@ -183,12 +183,12 @@ + } + + # Displays a progress bar ($1 is numerator, $2 is denominator, $3 is candy/normal) +-aurbar() { ++purbar() { + # Delete line + printf "\033[0G" + + # Get vars for output +- beginline=" aur" ++ beginline=" pur" + beginbar="[" + endbar="] " + perc="$(($1*100/$2))" +@@ -252,13 +252,13 @@ + fi + } + +-# Checks if package is newer on aur ($1 is package name, $2 is local version) +-aurversionisnewer() { ++# Checks if package is newer on pur ($1 is package name, $2 is local version) ++purversionisnewer() { + rpcinfo "$1" +- unset aurversion +- if existsinaur "$1"; then +- aurversion="$(jshon -Q -e results -e Version -u < "$tmpdir/$1.info")" +- if [[ "$(LC_ALL=C vercmp "$aurversion" "$2")" -gt 0 ]]; then ++ unset purversion ++ if existsinpur "$1"; then ++ purversion="$(jshon -Q -e results -e Version -u < "$tmpdir/$1.info")" ++ if [[ "$(LC_ALL=C vercmp "$purversion" "$2")" -gt 0 ]]; then + return 0 + fi + fi +@@ -281,14 +281,14 @@ + fi + } + +-# Installs packages from aur ($1 is package, $2 is dependency or explicit) +-aurinstall() { ++# Installs packages from pur ($1 is package, $2 is dependency or explicit) ++purinstall() { + dir="${TMPDIR:-/tmp}/packerbuild-$UID/$1" + sourcemakepkgconf + + # Prepare the installation directory +- # If there is an old directory and aurversion is not newer, use old directory +- if . "$dir/$1/PKGBUILD" &>/dev/null && ! aurversionisnewer "$1" "$pkgver-$pkgrel"; then ++ # If there is an old directory and purversion is not newer, use old directory ++ if . "$dir/$1/PKGBUILD" &>/dev/null && ! purversionisnewer "$1" "$pkgver-$pkgrel"; then + cd "$dir/$1" + else + [[ -d "$dir" ]] && rm -rf "$dir" +@@ -354,15 +354,15 @@ + # Figure out all of the packages that need to be installed + for package in "${packageargs[@]}"; do + # Determine whether package is in pacman repos +- if ! [[ $auronly ]] && existsinpacman "$package"; then ++ if ! [[ $puronly ]] && existsinpacman "$package"; then + pacmanpackages+=("$package") +- elif ! [[ $auronly ]] && existsinpacmangroup "$package"; then ++ elif ! [[ $puronly ]] && existsinpacmangroup "$package"; then + pacmanpackages+=("$package") +- elif existsinaur "$package"; then ++ elif existsinpur "$package"; then + if finddeps "$package"; then + # here is where dep dupes are created +- aurpackages+=("$package") +- aurdepends=("${aurdeps[@]}" "${aurdepends[@]}") ++ purpackages+=("$package") ++ purdepends=("${purdeps[@]}" "${purdepends[@]}") + pacmandepends+=("${pacmandeps[@]}") + fi + else +@@ -370,8 +370,8 @@ + fi + done + +- # Check if any aur target packages are ignored +- for package in "${aurpackages[@]}"; do ++ # Check if any pur target packages are ignored ++ for package in "${purpackages[@]}"; do + if isignored "$package"; then + echo -ne "${COLOR5}:: ${COLOR1}$package is in IgnorePkg/IgnoreGroup. Install anyway?${ENDCOLOR} [Y/n] " + if ! [[ $noconfirm ]]; then +@@ -380,17 +380,17 @@ + echo + fi + fi +- aurtargets+=("$package") ++ purtargets+=("$package") + done + +- # Check if any aur dependencies are ignored +- for package in "${aurdepends[@]}"; do ++ # Check if any pur dependencies are ignored ++ for package in "${purdepends[@]}"; do + if isignored "$package"; then + echo -ne "${COLOR5}:: ${COLOR1}$package is in IgnorePkg/IgnoreGroup. Install anyway?${ENDCOLOR} [Y/n] " + if ! [[ $noconfirm ]]; then + if ! proceed; then + echo "Unresolved dependency \`$package'" +- unset aurtargets ++ unset purtargets + break + fi + else +@@ -403,33 +403,33 @@ + if [[ $pacmanpackages ]]; then + runasroot $PACMAN "${PACOPTS[@]}" -S -- "${pacmanpackages[@]}" + fi +- if [[ -z $aurtargets ]]; then ++ if [[ -z $purtargets ]]; then + exit + fi +- # Test if aurpackages are already installed; echo warning if so +- for pkg in "${aurtargets[@]}"; do ++ # Test if purpackages are already installed; echo warning if so ++ for pkg in "${purtargets[@]}"; do + if existsinlocal "$pkg"; then + localversion="$(pacman -Qs "$pkg" | grep -F "local/$pkg" | cut -d ' ' -f 2)" +- if ! aurversionisnewer "$pkg" "$localversion"; then ++ if ! purversionisnewer "$pkg" "$localversion"; then + echo -e "${COLOR6}warning:$ENDCOLOR $pkg-$localversion is up to date -- reinstalling" + fi + fi + done + + # Echo warning if packages are out of date +- for pkg in "${aurtargets[@]}" "${aurdepends[@]}"; do ++ for pkg in "${purtargets[@]}" "${purdepends[@]}"; do + if isoutofdate "$pkg"; then + echo -e "${COLOR6}warning:$ENDCOLOR $pkg is flagged out of date" + fi + done + +- # Prompt for aur packages and their dependencies ++ # Prompt for pur packages and their dependencies + echo +- if [[ $aurdepends ]]; then +- num="$((${#aurdepends[@]}+${#aurtargets[@]}))" +- echo -e "${COLOR6}Aur Targets ($num):${ENDCOLOR} ${aurdepends[@]} ${aurtargets[@]}" ++ if [[ $purdepends ]]; then ++ num="$((${#purdepends[@]}+${#purtargets[@]}))" ++ echo -e "${COLOR6}Pur Targets ($num):${ENDCOLOR} ${purdepends[@]} ${purtargets[@]}" + else +- echo -e "${COLOR6}Aur Targets ($((${#aurtargets[@]}))):${ENDCOLOR} ${aurtargets[@]}" ++ echo -e "${COLOR6}Pur Targets ($((${#purtargets[@]}))):${ENDCOLOR} ${purtargets[@]}" + fi + if [[ $pacmandepends ]]; then + IFS=$'\n' read -rd '' -a pacmandepends < \ +@@ -450,18 +450,18 @@ + runasroot $PACMAN --noconfirm --asdeps -S -- "${pacmandepends[@]}" || err "Installation failed." + fi + +- # Install aur dependencies +- if [[ $aurdepends ]]; then +- for dep in "${aurdepends[@]}"; do +- aurinstall "$dep" "dependency" ++ # Install pur dependencies ++ if [[ $purdepends ]]; then ++ for dep in "${purdepends[@]}"; do ++ purinstall "$dep" "dependency" + done + fi + +- # Install the aur packages +- for package in "${aurtargets[@]}"; do +- scrapeaurdeps "$package" ++ # Install the pur packages ++ for package in "${purtargets[@]}"; do ++ scrapepurdeps "$package" + if pacman -T "${dependencies[@]}" &>/dev/null; then +- aurinstall "$package" "explicit" ++ purinstall "$package" "explicit" + else + echo "Dependencies for \`$package' are not met, not building..." + fi +@@ -469,16 +469,16 @@ + } + + run_quick_check() { +- bigurl="https://aur.archlinux.org/rpc.php?type=multiinfo" ++ bigurl="https://pur.parabola.nu/rpc.php?type=multiinfo" + for p in $(pacman -Qqm); do + bigurl="$bigurl&arg\[\]=$p" + done +- parsed_aur="$(curl -s "$bigurl" | \ ++ parsed_pur="$(curl -s "$bigurl" | \ + jshon -e results -a -e Name -u -p -e Version -u | \ + sed 's/^$/-/' | paste -s -d '\t\n' | sort)" + packages="$(expac -Q '%n\t%v' | sort)" +- comm -23 <(echo "$parsed_aur") <(echo "$packages") | cut -f 1 +- if [[ $auronly == 1 ]]; then ++ comm -23 <(echo "$parsed_pur") <(echo "$packages") | cut -f 1 ++ if [[ $puronly == 1 ]]; then + return + fi + # see https://mailman.archlinux.org/pipermail/pacman-dev/2011-October/014673.html +@@ -527,7 +527,7 @@ + '--ignore') ignorearg="$2" ; PACOPTS+=("--ignore" "$2") ; shift ;; + '--noconfirm') noconfirm='1' PACOPTS+=("--noconfirm");; + '--noedit') noedit='1' ;; +- '--auronly') auronly='1' ;; ++ '--puronly') puronly='1' ;; + '--quickcheck') quickcheck='1' ;; + '--devel') devel='1' ;; + '--skipinteg') MAKEPKGOPTS="--skipinteg" ;; +@@ -560,12 +560,12 @@ + getignoredpackages + sourcemakepkgconf + # Pacman update +- if ! [[ $auronly ]]; then ++ if ! [[ $puronly ]]; then + runasroot $PACMAN "${PACOPTS[@]}" "$pacmanarg" + fi + +- # Aur update +- echo -e "${COLOR5}:: ${COLOR1}Synchronizing aur database...${ENDCOLOR}" ++ # Pur update ++ echo -e "${COLOR5}:: ${COLOR1}Synchronizing pur database...${ENDCOLOR}" + IFS=$'\n' read -rd '' -a packages < <(pacman -Qm) + newpackages=() + checkignores=() +@@ -574,7 +574,7 @@ + + if [[ $devel ]]; then + for ((i=0; i<$total; i++)); do +- aurbar "$((i+1))" "$total" "$bartype" ++ purbar "$((i+1))" "$total" "$bartype" + pkg="${packages[i]%% *}" + if isignored "$pkg"; then + checkignores+=("${packages[i]}") +@@ -603,7 +603,7 @@ + done + else + for ((i=0; i<$total; i++)); do +- aurbar "$((i+1))" "$total" "$bartype" ++ purbar "$((i+1))" "$total" "$bartype" + pkg="${packages[i]%% *}" + rpcinfo "$pkg" & + nap +@@ -614,25 +614,25 @@ + ver="${packages[i]##* }" + if isignored "$pkg"; then + checkignores+=("${packages[i]}") +- elif aurversionisnewer "$pkg" "$ver"; then ++ elif purversionisnewer "$pkg" "$ver"; then + newpackages+=("$pkg") + fi + done + fi + echo + +- echo -e "${COLOR5}:: ${COLOR1}Starting full aur upgrade...${ENDCOLOR}" ++ echo -e "${COLOR5}:: ${COLOR1}Starting full pur upgrade...${ENDCOLOR}" + + # Check and output ignored package update info + for package in "${checkignores[@]}"; do +- if aurversionisnewer "${package%% *}" "${package##* }"; then +- echo -e "${COLOR6}warning:${ENDCOLOR} ${package%% *}: ignoring package upgrade (${package##* } => $aurversion)" ++ if purversionisnewer "${package%% *}" "${package##* }"; then ++ echo -e "${COLOR6}warning:${ENDCOLOR} ${package%% *}: ignoring package upgrade (${package##* } => $purversion)" + fi + done + + # Now for the installation part + if [[ $newpackages ]]; then +- auronly='1' ++ puronly='1' + installhandling "${newpackages[@]}" + fi + echo " local database is up to date" +@@ -641,10 +641,10 @@ + # Download (-G) handling + if [[ $option = download ]]; then + for package in "${packageargs[@]}"; do +- if existsinaur "$package"; then ++ if existsinpur "$package"; then + pkglist+=("$package") + else +- err "Package \`$package' does not exist on aur." ++ err "Package \`$package' does not exist on pur." + fi + done + +@@ -658,7 +658,7 @@ + # Search (-Ss) handling + if [[ $option = search || $option = searchinstall ]]; then + # Pacman searching +- if ! [[ $auronly ]]; then ++ if ! [[ $puronly ]]; then + if [[ $quiet ]]; then + results="$(pacman -Ssq -- "${packageargs[@]}")" + else +@@ -677,7 +677,7 @@ + pactotal=0 + fi + +- # Aur searching and tmpfile preparation ++ # Pur searching and tmpfile preparation + for package in "${packageargs[@]}"; do + curl -LfGs --data-urlencode "arg=$package" "$RPCURL=search" | \ + jshon -Q -e results -a -e Name -u -p -e Version -u -p -e NumVotes -u -p -e Description -u | \ +@@ -692,24 +692,24 @@ + sed -i '/^$/d' "$tmpdir/search.results" + + # Prepare tmp file and arrays +- IFS=$'\n' read -rd '' -a aurname < <(cut -f 1 "$tmpdir/search.results") +- aurtotal="${#aurname[@]}" +- alltotal="$(($pactotal+$aurtotal))" ++ IFS=$'\n' read -rd '' -a purname < <(cut -f 1 "$tmpdir/search.results") ++ purtotal="${#purname[@]}" ++ alltotal="$(($pactotal+$purtotal))" + # Echo out the -Ss formatted package information + + IFS=$'\t\n' + if [[ $option = search ]]; then + if [[ $quiet ]]; then +- printf "%s\n" ${aurname[@]} ++ printf "%s\n" ${purname[@]} + elif [[ -s "$tmpdir/search.results" ]]; then +- printf "${COLOR3}aur/${COLOR1}%s ${COLOR2}%s${ENDCOLOR} (%s)\n %s\n" $(cat "$tmpdir/search.results") ++ printf "${COLOR3}pur/${COLOR1}%s ${COLOR2}%s${ENDCOLOR} (%s)\n %s\n" $(cat "$tmpdir/search.results") + fi + else + # interactive + if [[ $quiet ]]; then + nl -v ${pactotal:-0} -w 1 -s ' ' <(cut -f 1 "$tmpdir/search.results") + elif [[ -s "$tmpdir/search.results" ]]; then +- printf "%d ${COLOR3}aur/${COLOR1}%s ${COLOR2}%s${ENDCOLOR} (%s)\n %s\n" $(nl -v ${pactotal:-0} -w 1 < "$tmpdir/search.results") ++ printf "%d ${COLOR3}pur/${COLOR1}%s ${COLOR2}%s${ENDCOLOR} (%s)\n %s\n" $(nl -v ${pactotal:-0} -w 1 < "$tmpdir/search.results") + fi + fi | fmt -"$_WIDTH" -s + unset IFS +@@ -717,7 +717,7 @@ + # Prompt and install selected numbers + if [[ $option = searchinstall ]]; then + pkglist=() +- allpackages=( "${pacname[@]}" "${aurname[@]}" ) ++ allpackages=( "${pacname[@]}" "${purname[@]}" ) + + # Exit if there are no matches + [[ $allpackages ]] || exit +@@ -754,7 +754,7 @@ + # Pacman info check + sourcemakepkgconf + for package in "${packageargs[@]}"; do +- if ! [[ $auronly ]] && existsinpacman "$package"; then ++ if ! [[ $puronly ]] && existsinpacman "$package"; then + results="$(pacman -Si -- "$package")" + results="$(sed -r "s|^(Repository[^:]*:)(.*)$|\1$S${COLOR3}\2$S${ENDCOLOR}|" <<< "$results")" + results="$(sed -r "s|^(Name[^:]*:)(.*)$|\1$S${COLOR1}\2$S${ENDCOLOR}|" <<< "$results")" +@@ -763,14 +763,14 @@ + results="$(sed -r "s|^[^ ][^:]*:|$S${COLOR1}&$S${ENDCOLOR}|" <<< "$results")" + echo -e "$results" + exit +- else # Check to see if it is in the aur ++ else # Check to see if it is in the pur + pkginfo "$package" "$preview" + [[ -s "$tmpdir/$package.PKGBUILD" ]] || err "${COLOR7}error:${ENDCOLOR} package '$package' was not found" + . "$tmpdir/$package.PKGBUILD" + + # Echo out the -Si formatted package information + # Retrieve each element in order and echo them immediately +- echo -e "${COLOR1}Repository : ${COLOR3}aur" ++ echo -e "${COLOR1}Repository : ${COLOR3}pur" + echo -e "${COLOR1}Name : $pkgname" + echo -e "${COLOR1}Version : ${COLOR2}$pkgver-$pkgrel" + echo -e "${COLOR1}URL : ${COLOR4}$url" +diff -Nur a/packer.8 b/packer.8 +--- a/packer.8 2015-08-28 16:26:27.881641047 -0300 ++++ b/packer.8 2015-08-28 16:28:32.232156389 -0300 +@@ -19,13 +19,13 @@ + .\" * MAIN CONTENT STARTS HERE * + .\" ----------------------------------------------------------------- + .SH "NAME" +-packer \- package manager utility for pacman repositories and the AUR ++packer \- package manager utility for pacman repositories and the PUR + .SH "SYNOPSIS" + .sp + \fIpacman\fR <operation> [options] [packages] + .SH "DESCRIPTION" + .sp +-Packer is a bash wrapper for pacman and the AUR\&. It was designed to be a simple and very fast replacement for the basic functionality of yaourt\&. It allows you to install, update, search, and show information for any package in the main repositories and in the AUR\&. For other commands, such as removing packages, use pacman\&. ++Packer is a bash wrapper for pacman and the PUR\&. It was designed to be a simple and very fast replacement for the basic functionality of yaourt\&. It allows you to install, update, search, and show information for any package in the main repositories and in the PUR\&. For other commands, such as removing packages, use pacman\&. + .SH "OPERATIONS" + .PP + \fB\-Ss\fR +@@ -50,7 +50,7 @@ + .PP + \fB\-G\fR + .RS 4 +-Download and extract AUR package tarballs, but don\(cqt install anything\&. ++Download and extract PUR package tarballs, but don\(cqt install anything\&. + .RE + .PP + \fB\-h\fR +@@ -79,9 +79,9 @@ + Check for updates and exit\&. + .RE + .PP +-\fB\-\-auronly\fR ++\fB\-\-puronly\fR + .RS 4 +-Only perform commands for the AUR\&. ++Only perform commands for the PUR\&. + .RE + .PP + \fB\-\-devel\fR +@@ -91,7 +91,7 @@ + .PP + \fB\-\-skipinteg\fR + .RS 4 +-Skip the integrity check by ignoring AUR package MD5 sums\&. ++Skip the integrity check by ignoring PUR package MD5 sums\&. + .RE + .PP + \fB\-\-preview\fR +@@ -123,8 +123,8 @@ + .sp -1 + .IP \(bu 2.3 + .\} +-Update only AUR packages: +-packer \-Syu \-\-auronly ++Update only PUR packages: ++packer \-Syu \-\-puronly + .RE + .sp + .RS 4 diff --git a/pcr/packer/PKGBUILD b/pcr/packer/PKGBUILD deleted file mode 100644 index 0f871adbf..000000000 --- a/pcr/packer/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# Maintainer (Arch): Kyle Keen <keenerd@gmail.com> -# Contributor (Arch): Gilrain <pierre.buard+aur gmail com> -# Contributor (Arch): bruenig -# Maintainer (Parabola): Aurélien DESBRIÈRES <aurelien@hackers.camp> -# Contributor (Parabola): André Silva <emulatorman@parabola.nu> - -pkgname=packer -pkgver=$(LC_ALL=C date -u +%Y%m%d) -pkgrel=1 -pkgdesc="Bash wrapper for pacman and aur" -url="http://github.com/keenerd/packer" -license=("GPL3") -arch=('any') -makedepends=('git') -depends=('grep' 'sed' 'bash' 'curl' 'pacman' 'jshon' 'expac') -optdepends=('sudo: install and update packages as non-root' - 'customizepkg: apply customizepkg modifications') -#source=('git://github.com/keenerd/packer.git') -source=('git+https://github.com/keenerd/packer.git') -md5sums=('SKIP') - -pkgver() { - cd "$pkgname" - git show -s --format="%ci" HEAD | sed -e 's/-//g' -e 's/ .*//' -} - -package() { - install -Dm755 "$srcdir/$pkgname/packer" "$pkgdir/usr/bin/packer" - install -Dm644 "$srcdir/$pkgname/packer.8" "$pkgdir/usr/share/man/man8/packer.8" -} - diff --git a/pcr/parabola-backgrounds/PKGBUILD b/pcr/parabola-backgrounds/PKGBUILD new file mode 100644 index 000000000..b1bf77c77 --- /dev/null +++ b/pcr/parabola-backgrounds/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697 + +pkgname=parabola-backgrounds +pkgver=1.0 +pkgrel=1 +pkgdesc="Parabola backgrounds/artwork by Crazytoon, coadde, and Catira." +arch=('any') +url="https://repo.parabola.nu/other/artwork/parabola_wallpapers-r1/src/" +license=('custom') +source=("https://repo.parabola.nu/other/artwork/parabola_wallpapers-r1/src/scn-prbprbprw000001-gnu_wallpaper_01_ld_generic-r04427x02490px-c_rgb08-noa000r00h00m00s000f_nos_xcf02d08_m0001d8g-atf_lcf_nof.png" +"https://repo.parabola.nu/other/artwork/parabola_wallpapers-r1/src/scn-prbprbprw000001-gnu_wallpaper_01_ld_generic-r04427x02490px-c_rgb08-noa000r00h00m00s000f_nos_xcf02d08_m0001d8g-atf_lcf_nof.png.sig" +"https://repo.parabola.nu/other/artwork/parabola_wallpapers-r1/src/scn-prbprbprw000001-gnu_wallpaper_01_ld_parabola-r04427x02490px-c_rgb08-noa000r00h00m00s000f_nos_xcf02d08_m0001d8g-atf_lcf_nof.png" +"https://repo.parabola.nu/other/artwork/parabola_wallpapers-r1/src/scn-prbprbprw000001-gnu_wallpaper_01_ld_parabola-r04427x02490px-c_rgb08-noa000r00h00m00s000f_nos_xcf02d08_m0001d8g-atf_lcf_nof.png.sig" +"https://repo.parabola.nu/other/artwork/parabola_wallpapers-r1/src/scn-prbprbprw000001-gnu_wallpaper_02-r17280x09720px-c_rgb08-noa000r00h00m00s000f_nos_xcf02d08_m0004d0g-atf_lcf_nof.png" +"https://repo.parabola.nu/other/artwork/parabola_wallpapers-r1/src/scn-prbprbprw000001-gnu_wallpaper_02-r17280x09720px-c_rgb08-noa000r00h00m00s000f_nos_xcf02d08_m0004d0g-atf_lcf_nof.png.sig" +"https://repo.parabola.nu/other/artwork/parabola_wallpapers-r1/src/scn-prbprbprw000001-gnu_wallpaper_03-r15360x8640px-c_rgb08-noa000r00h00m00s000f_nos_xcf02d08_m0002d3g-atf_lcf_nof.png" +"https://repo.parabola.nu/other/artwork/parabola_wallpapers-r1/src/scn-prbprbprw000001-gnu_wallpaper_03-r15360x8640px-c_rgb08-noa000r00h00m00s000f_nos_xcf02d08_m0002d3g-atf_lcf_nof.png.sig") +validpgpkeys=('684D54A189305A9CC95446D36B888913DDB59515') +sha512sums=('0134a8969fcdb723a3db222bbf81b22c823249ea9628bfaf39db9891466011641947c94a45db07a7d4d6d13f0639b454207bf493fefff125839aaa2136be69d9' + 'SKIP' + 'eb290b60729b7785d9860c5b09f34e31dec76eba2b1608f5fdda351aacd0dc31b8b1d272279767f4b2c53bb389fd301ffacd50ab87fb4bfc05272d736ec33218' + 'SKIP' + '39dd9705c73b7de79f6ba191aced40cbba87220eaa08425a3d8ad4ae74e31013380a98696523d84b48fdfb0c1f53d47d250df1eccb0cf5b82b19309b6c7b59bd' + 'SKIP' + '9c275669e48f77e4eafee6a1a9116a16aeefd14c41e181e8158b0ceb492c3ed69c973375db60adca1dc3573f3e0c6fa0e9a6076218181cc9515a642e7e82162b' + 'SKIP') + +package() { + cd $srcdir + find -exec install -D -m644 {} ${pkgdir}/usr/share/backgrounds{} \; + mv ${pkgdir}/usr/share/backgrounds. ${pkgdir}/usr/share/backgrounds + rm -rf ${pkgdir}/usr/share/backgrounds/*.sig +} diff --git a/pcr/pcsx2-git/PKGBUILD b/pcr/pcsx2-git/PKGBUILD new file mode 100644 index 000000000..cfa006812 --- /dev/null +++ b/pcr/pcsx2-git/PKGBUILD @@ -0,0 +1,93 @@ +# Maintainer: André Silva <emulatorman@parabola.nu> +# Maintainer: Márcio Silva <coadde@parabola.nu> + +# Based on pcsx2 (parabola) package + +_pkgname=pcsx2 +pkgname=pcsx2-git +pkgver=r6873.9c7d417 +pkgrel=1.parabola1 +pkgdesc='A Sony PlayStation 2 emulator, without nonfree nvidia-cg-toolkit support' +arch=('i686' 'x86_64') +url='http://www.pcsx2.net' +license=('GPL2' 'GPL3' 'LGPL2.1' 'LGPL3') +depends_i686=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' + 'portaudio' 'sdl' 'soundtouch' 'wxgtk') +depends_x86_64=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra' + 'lib32-libjpeg-turbo' + 'lib32-portaudio' 'lib32-sdl' 'lib32-soundtouch' 'lib32-wxgtk') +makedepends=('cmake' 'git') +makedepends_x86_64=('gcc-multilib') +optdepends_x86_64=('lib32-gtk-engines: GTK2 engines support' + 'lib32-gtk-engine-murrine: Murrine GTK3 engine support' + 'lib32-gtk-engine-unico: Unico GTK2 engine support') +provides=("${_pkgname}") +conflicts=("${_pkgname}" "${_pkgname}-libre") +replaces=("${_pkgname}-libre") +options=('!emptydirs') +source=(${pkgname}-${pkgver}::git+https://github.com/PCSX2/pcsx2.git) +sha256sums=('SKIP') + +pkgver() { + cd ${pkgname}-${pkgver} + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +} + +prepare() { + cd ${pkgname}-${pkgver} + # remove zzogl and zerogs plugins (depends nonfree nvidia-cg-toolkit) + rm -vr plugins/{zerogs,zzogl-pg} + sed -i '\|# ZZOGL|,+6 d' linux_various/glsl2h.pl +} + +build() { + cd ${pkgname}-${pkgver} + + if [[ -d build ]]; then + rm -rf build + fi + mkdir build && cd build + + if [[ $CARCH == i686 ]]; then + cmake .. \ + -DCMAKE_BUILD_TYPE='Release' \ + -DCMAKE_INSTALL_PREFIX='/usr' \ + -DCMAKE_LIBRARY_PATH='/usr/lib' \ + -DPLUGIN_DIR='/usr/lib/pcsx2' \ + -DGAMEINDEX_DIR='/usr/share/pcsx2' \ + -DDISABLE_ADVANCE_SIMD='TRUE' \ + -DEXTRA_PLUGINS='TRUE' \ + -DREBUILD_SHADER='TRUE' \ + -DGLSL_API='TRUE' \ + -DPACKAGE_MODE='TRUE' \ + -DXDG_STD='TRUE' + elif [[ $CARCH == x86_64 ]]; then + cmake .. \ + -DCMAKE_BUILD_TYPE='Release' \ + -DCMAKE_TOOLCHAIN_FILE='cmake/linux-compiler-i386-multilib.cmake' \ + -DCMAKE_INSTALL_PREFIX='/usr' \ + -DCMAKE_LIBRARY_PATH='/usr/lib32' \ + -DPLUGIN_DIR='/usr/lib32/pcsx2' \ + -DGAMEINDEX_DIR='/usr/share/pcsx2' \ + -DDISABLE_ADVANCE_SIMD='TRUE' \ + -DEXTRA_PLUGINS='TRUE' \ + -DREBUILD_SHADER='TRUE' \ + -DGLSL_API='TRUE' \ + -DPACKAGE_MODE='TRUE' \ + -DXDG_STD='TRUE' + fi + + make +} + +package() { + cd ${pkgname}-${pkgver}/build + + make DESTDIR="${pkgdir}" install + + # create pcsx2 binary link and copy PCSX2.1 to pcsx2.1 man page + ln -vs PCSX2 ${pkgdir}/usr/bin/pcsx2 + cp -va ${pkgdir}/usr/share/man/man1/{PCSX,pcsx}2.1 +} + +# vim: ts=2 sw=2 et: diff --git a/pcr/polkit-consolekit/PKGBUILD b/pcr/polkit-consolekit/PKGBUILD index 47f184bf1..104e81b20 100644 --- a/pcr/polkit-consolekit/PKGBUILD +++ b/pcr/polkit-consolekit/PKGBUILD @@ -1,26 +1,23 @@ -# Maintainer : freaj <freaj@riseup.net> -# Maintainer (Manjaro): artoo <artoo@manjaro.org> -# Contributor (Manjaro): kozec <kozec at kozec.com> -# Contributor (Manjaro): Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Contributor (Manjaro): Jan de Groot <jgc@archlinux.org> +# Maintainer (Arch): kozec <kozec at kozec.com> +# Contributor (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com> +# Contributor (Arch): Jan de Groot <jgc@archlinux.org> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=polkit-consolekit -pkgver=0.112 -pkgrel=3 -pkgdesc="PolyciKit with ConsoleKit support for non-systemd systems" +pkgver=0.113 +pkgrel=2 +pkgdesc="PolicyKit with ConsoleKit support for non-systemd systems" arch=('i686' 'x86_64') license=('LGPL') url="http://www.freedesktop.org/wiki/Software/polkit" -depends=('glib2' 'pam' 'expat' 'js17') -makedepends=('intltool' 'gtk-doc' 'gobject-introspection' 'python2') +depends=('glib2' 'pam' 'expat' 'js185') +makedepends=('intltool' 'gtk-doc' 'gobject-introspection') provides=("polkit=$pkgver") conflicts=('polkit') options=('!libtool') install=polkit.install source=(http://www.freedesktop.org/software/polkit/releases/polkit-$pkgver.tar.gz polkit.pam) -sha256sums=('d695f43cba4748a822fbe864dd32c4887c5da1c71694a47693ace5e88fcf6af6' - 'a35af3210bff1a8f2c04add47ed131a17df9eafbbc6f1671f97021be3ab1ff34') build() { cd "$srcdir/polkit-$pkgver" @@ -42,3 +39,6 @@ package() { install -m644 "$srcdir/polkit.pam" "$pkgdir/etc/pam.d/polkit-1" } + +md5sums=('4b77776c9e4f897dcfe03b2c34198edf' + '6564f95878297b954f0572bc1610dd15') diff --git a/pcr/ppsspp-git/PKGBUILD b/pcr/ppsspp-git/PKGBUILD new file mode 100644 index 000000000..388d750c8 --- /dev/null +++ b/pcr/ppsspp-git/PKGBUILD @@ -0,0 +1,96 @@ +# Maintainer: Márcio Silva <coadde@parabola.nu> + +# Based on ppsspp package + +_pkgbase=ppsspp +pkgbase=ppsspp-git +pkgname=('ppsspp-git' 'ppsspp-qt-git') +pkgver=r16696.14fd313 +pkgrel=1 +pkgdesc='A PSP emulator written in C++' +arch=('i686' 'x86_64') +url='http://www.ppsspp.org/' +license=('GPL2') +depends=('ffmpeg' 'sdl2') +makedepends=('cmake' 'git' 'glu' 'qt5-tools') +source=("git+https://github.com/hrydgard/ppsspp.git" + 'git+https://github.com/hrydgard/ppsspp-lang.git' + 'ppsspp-native::git+https://github.com/hrydgard/native.git' + 'ppsspp-armips::git+https://github.com/Kingcom/armips.git' + 'ppsspp-ffmpeg.patch') +sha256sums=('SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + '28c4fcfb1a42f17c5a6bd5909696a53481efcd3571b0a30b1e1e535015d6aa1a') + +pkgver() { + cd ppsspp + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +} + +prepare() { + cd ppsspp + + for submodule in native lang ext/armips; do + git submodule init ${submodule} + git config submodule.${submodule}.url ../ppsspp-${submodule#*/} + git submodule update ${submodule} + done + + patch -Np1 -i ../ppsspp-ffmpeg.patch +} + +build() { + cd ppsspp + + if [[ -d build ]]; then + rm -rf build + fi + mkdir build && cd build + + cmake .. \ + -DCMAKE_BUILD_TYPE='Release' \ + -DCMAKE_SKIP_RPATH='TRUE' + make + + cd .. + + if [[ -d build-qt ]]; then + rm -rf build-qt + fi + mkdir build-qt && cd build-qt + + qmake-qt5 CONFIG+='release' CONFIG+='system_ffmpeg' ../Qt/PPSSPPQt.pro + make +} + +package_ppsspp-git() { + provides=("${_pkgbase}") + conflicts=("${_pkgbase}" "${_pkgbase}-qt" "${_pkgbase}-qt-git") + + cd ppsspp/build + + install -dm 755 "${pkgdir}"/usr/{bin,share/{applications,man/man1,pixmaps,ppsspp}} + install -m 755 PPSSPPSDL "${pkgdir}"/usr/bin/ppsspp + cp -dr --no-preserve='ownership' assets "${pkgdir}"/usr/share/ppsspp/ + install -m 644 ../assets/unix-icons/icon-512.svg "${pkgdir}"/usr/share/pixmaps/ppsspp.svg + install -m 644 ../debian/ppsspp.desktop "${pkgdir}"/usr/share/applications/ + install -m 644 ../debian/ppsspp.1 "${pkgdir}"/usr/share/man/man1/ +} + +package_ppsspp-qt-git() { + depends+=('qt5-base') + provides=("${_pkgbase}") + conflicts=("${_pkgbase}" "${_pkgbase}-qt" "${_pkgbase}-qt-git") + + cd ppsspp/build-qt + + install -dm 755 "${pkgdir}"/usr/{bin,share/{applications,man/man1,pixmaps}} + install -m 755 ppsspp "${pkgdir}"/usr/bin/ + install -m 644 ../assets/unix-icons/icon-512.svg "${pkgdir}"/usr/share/pixmaps/ppsspp.svg + install -m 644 ../debian/ppsspp.desktop "${pkgdir}"/usr/share/applications/ + install -m 644 ../debian/ppsspp.1 "${pkgdir}"/usr/share/man/man1/ +} + +# vim: ts=2 sw=2 et: diff --git a/pcr/ppsspp-git/ppsspp-ffmpeg.patch b/pcr/ppsspp-git/ppsspp-ffmpeg.patch new file mode 100644 index 000000000..0e7406080 --- /dev/null +++ b/pcr/ppsspp-git/ppsspp-ffmpeg.patch @@ -0,0 +1,190 @@ +diff -Nur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2015-08-16 01:25:43.282403676 -0300 ++++ b/CMakeLists.txt 2015-08-16 01:33:33.084570830 -0300 +@@ -419,159 +419,19 @@ + include_directories(native/ext/stb_vorbis) + + if(USE_FFMPEG) +- if(USE_SYSTEM_FFMPEG) +- include(FindFFMPEG) +- else() +- set(FFMPEG_FOUND OFF) +- endif() +- if(NOT FFMPEG_FOUND) +- if(NOT DEFINED FFMPEG_BUILDDIR) +- if(ANDROID) +- if(ARMV7) +- set(PLATFORM_ARCH "android/armv7") +- elseif(ARM) +- set(PLATFORM_ARCH "android/arm") +- elseif(X86) +- set(PLATFORM_ARCH "android/x86") +- endif() +- elseif(BLACKBERRY) +- set(PLATFORM_ARCH "blackberry/armv7") +- elseif(IOS) +- set(PLATFORM_ARCH "ios/universal") +- elseif(MACOSX) +- set(PLATFORM_ARCH "macosx/x86_64") +- elseif(LINUX) +- if(ARMV7) +- set(PLATFORM_ARCH "linux/armv7") +- elseif(ARM) +- set(PLATFORM_ARCH "linux/arm") +- elseif(MIPS) +- set(PLATFORM_ARCH "linux/mips32") +- elseif(CMAKE_SIZEOF_VOID_P EQUAL 8) +- set(PLATFORM_ARCH "linux/x86_64") +- else() +- set(PLATFORM_ARCH "linux/x86") +- endif() +- endif() +- # Using static libraries +- if (DEFINED PLATFORM_ARCH) +- include_directories(ffmpeg/${PLATFORM_ARCH}/include) +- link_directories(ffmpeg/${PLATFORM_ARCH}/lib) +- set(FFMPEG_LIBRARIES libavformat.a libavcodec.a libavutil.a libswresample.a libswscale.a) +- else() +- # Manual definition of system library locations by the user. +- if (DEFINED FFMPEG_INCLUDE_PATH) +- include_directories(ffmpeg ${FFMPEG_INCLUDE_PATH}) +- endif() +- if (DEFINED AVFORMAT_PATH) +- add_library(libavformat STATIC IMPORTED) +- set_target_properties(libavformat PROPERTIES IMPORTED_LOCATION ${AVFORMAT_PATH}) +- SET (FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} libavformat) +- endif() +- if (DEFINED AVCODEC_PATH) +- add_library(libavcodec STATIC IMPORTED) +- set_target_properties(libavcodec PROPERTIES IMPORTED_LOCATION ${AVCODEC_PATH}) +- SET (FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} libavcodec) +- endif() +- if (DEFINED AVUTIL_PATH) +- add_library(libavutil STATIC IMPORTED) +- set_target_properties(libavutil PROPERTIES IMPORTED_LOCATION ${AVUTIL_PATH}) +- SET (FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} libavutil) +- endif() +- if (DEFINED SWRESAMPLE_PATH) +- add_library(libswresample STATIC IMPORTED) +- set_target_properties(libswresample PROPERTIES IMPORTED_LOCATION ${SWRESAMPLE_PATH}) +- SET (FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} libswresample) +- endif() +- if (DEFINED SWSCALE_PATH) +- add_library(libswscale STATIC IMPORTED) +- set_target_properties(libswscale PROPERTIES IMPORTED_LOCATION ${SWSCALE_PATH}) +- SET (FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} libswscale) +- endif() +- endif(DEFINED PLATFORM_ARCH) +- else(NOT DEFINED FFMPEG_BUILDDIR) +- # Using shared libraries +- include_directories(ffmpeg ${FFMPEG_BUILDDIR}) ++ SET (FFMPEG_LIBRARIES ++ avformat ++ avcodec ++ avutil ++ swresample ++ swscale ++ ) + +- add_library(libavformat STATIC IMPORTED) +- set_target_properties(libavformat PROPERTIES IMPORTED_LOCATION ${FFMPEG_BUILDDIR}/libavformat/libavformat.a) +- add_library(libavcodec STATIC IMPORTED) +- set_target_properties(libavcodec PROPERTIES IMPORTED_LOCATION ${FFMPEG_BUILDDIR}/libavcodec/libavcodec.a) +- add_library(libavutil STATIC IMPORTED) +- set_target_properties(libavutil PROPERTIES IMPORTED_LOCATION ${FFMPEG_BUILDDIR}/libavutil/libavutil.a) +- add_library(libswresample STATIC IMPORTED) +- set_target_properties(libswresample PROPERTIES IMPORTED_LOCATION ${FFMPEG_BUILDDIR}/libswresample/libswresample.a) +- add_library(libswscale STATIC IMPORTED) +- set_target_properties(libswscale PROPERTIES IMPORTED_LOCATION ${FFMPEG_BUILDDIR}/libswscale/libswscale.a) +- +- SET (FFMPEG_LIBRARIES +- libavformat +- libavcodec +- libavutil +- libswresample +- libswscale +- ) +- endif(NOT DEFINED FFMPEG_BUILDDIR) +- endif(NOT FFMPEG_FOUND) +- +- find_library(ICONV_LIBRARY NAMES iconv) +- if (ICONV_LIBRARY) +- set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${ICONV_LIBRARY}) +- endif() +- +- if(APPLE) +- set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} bz2 "-framework CoreVideo") +- if (NOT IOS) +- set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} "-framework VideoDecodeAcceleration") +- endif() +- endif(APPLE) +- +- if(FFMPEG_FOUND) +- set(nativeExtraLibs ${nativeExtraLibs} ${FFMPEG_LIBRARIES}) +- else() +- set(LinkCommon ${LinkCommon} ${FFMPEG_LIBRARIES}) +- endif() ++ set(nativeExtraLibs ${nativeExtraLibs} ${FFMPEG_LIBRARIES}) + target_link_libraries(Common ${FFMPEG_LIBRARIES}) + add_definitions(-DUSE_FFMPEG) + endif(USE_FFMPEG) + +-# Modification to show where we are pulling the ffmpeg libraries from. +-if(USE_FFMPEG AND DEFINED FFMPEG_LIBRARIES) +- message(STATUS "FFMPEG library locations:") +- if(FFMPEG_FOUND) +- message(STATUS "libavcodec location: ${FFMPEG_avcodec_LIBRARY}") +- message(STATUS "libavformat location: ${FFMPEG_avformat_LIBRARY}") +- message(STATUS "libavutil location: ${FFMPEG_avutil_LIBRARY}") +- message(STATUS "libswresample location: ${FFMPEG_swresample_LIBRARY}") +- message(STATUS "libswscale location: ${FFMPEG_swscale_LIBRARY}") +- elseif(DEFINED PLATFORM_ARCH) +- set(TEMP ${CMAKE_SOURCE_DIR}/ffmpeg/${PLATFORM_ARCH}/lib) +- message(STATUS "libavcodec location: ${TEMP}/libavcodec.a") +- message(STATUS "libavformat location: ${TEMP}/libavformat.a") +- message(STATUS "libavutil location: ${TEMP}/libavutil.a") +- message(STATUS "libswresample location: ${TEMP}/libswresample.a") +- message(STATUS "libswscale location: ${TEMP}/libswscale.a") +- else() +- get_target_property(TEMP libavcodec IMPORTED_LOCATION) +- message(STATUS "libavcodec location: ${TEMP}") +- get_target_property(TEMP libavformat IMPORTED_LOCATION) +- message(STATUS "libavformat location: ${TEMP}") +- get_target_property(TEMP libavutil IMPORTED_LOCATION) +- message(STATUS "libavutil location: ${TEMP}") +- get_target_property(TEMP libswresample IMPORTED_LOCATION) +- message(STATUS "libswresample location: ${TEMP}") +- get_target_property(TEMP libswscale IMPORTED_LOCATION) +- message(STATUS "libswscale location: ${TEMP}") +- endif() +-else() +- message(STATUS "ERROR: No FFMPEG library locations") +-endif() +- +-if(USE_FFMPEG AND NOT DEFINED FFMPEG_LIBRARIES) +- message(WARNING "FFMPEG_BUILDDIR variable or manual path definition is required to enable FFmpeg. Disabling it.") +- unset(USE_FFMPEG) +-endif() +- + find_package(ZLIB) + if(ZLIB_FOUND) + include_directories(${ZLIB_INCLUDE_DIR}) +diff -Nur a/Core/HW/MediaEngine.h b/Core/HW/MediaEngine.h +--- a/Core/HW/MediaEngine.h 2015-08-16 01:25:43.332404138 -0300 ++++ b/Core/HW/MediaEngine.h 2015-08-16 01:35:59.109776759 -0300 +@@ -34,9 +34,14 @@ + class SimpleAudio; + + #ifdef USE_FFMPEG ++extern "C" { ++#include <libavformat/avformat.h> ++#include <libavutil/old_pix_fmts.h> ++} ++ + struct SwsContext; + struct AVFrame; +-struct AVIOContext; ++//struct AVIOContext; + struct AVFormatContext; + struct AVCodecContext; + #endif diff --git a/pcr/python-evdev/PKGBUILD b/pcr/python-evdev/PKGBUILD new file mode 100644 index 000000000..10bdcf411 --- /dev/null +++ b/pcr/python-evdev/PKGBUILD @@ -0,0 +1,20 @@ +# Maintainer: Márcio Silva <coadde@parabola.nu> + +pkgname=python-evdev +pkgver=0.5.0 +pkgrel=1 +pkgdesc="Python bindings evdev input devices" +arch=('i686' 'x86_64') +url="http://python-evdev.readthedocs.org/" +license=('BSD3') +depends=('python') +source=("https://github.com/gvalkov/$pkgname/archive/v$pkgver.tar.gz") +sha256sums=('8340a6881d0ebe175dce412edc78dd296cc0e799265c1b6c7200891c6c7271d9') + +package () { + cd $pkgname-$pkgver + + python setup.py install --prefix=/usr --root=$pkgdir + + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} diff --git a/pcr/python-oslo-i18n/PKGBUILD b/pcr/python-oslo-i18n/PKGBUILD index 6a084f6d0..38dd16763 100644 --- a/pcr/python-oslo-i18n/PKGBUILD +++ b/pcr/python-oslo-i18n/PKGBUILD @@ -6,7 +6,7 @@ _name="oslo.i18n" _module="${_name/./-}" pkgname=("python-${_module}" "python2-${_module}") -pkgver="2.3.0" +pkgver="2.4.0" pkgrel="1" pkgdesc="Oslo i18n library" arch=("any") @@ -14,7 +14,7 @@ url="https://github.com/openstack/${_name}" license=("Apache") makedepends=("python-pbr>=1.3" "python2-pbr>=1.3" "git") source=("https://pypi.python.org/packages/source/${_name:0:1}/${_name}/${_name}-${pkgver}.tar.gz") -sha256sums=('9cd35cd12104672e4675465d59badf9b1d1c1bfc54ceef57d076d4fa8a12afc6') +sha256sums=('b788a543416483196015177daf77c2d2a8ba84ea72b4372a7afa54707333308c') prepare() { cd "${srcdir}/${_name}-${pkgver}" diff --git a/pcr/python-oslo-utils/PKGBUILD b/pcr/python-oslo-utils/PKGBUILD index 75117cd72..68b606578 100644 --- a/pcr/python-oslo-utils/PKGBUILD +++ b/pcr/python-oslo-utils/PKGBUILD @@ -6,7 +6,7 @@ _name="oslo.utils" _module="${_name/./-}" pkgname=("python-${_module}" "python2-${_module}") -pkgver="2.2.0" +pkgver="2.3.0" pkgrel="1" pkgdesc="Oslo Utility library" arch=("any") @@ -14,7 +14,7 @@ url="https://github.com/openstack/${_name}" license=("Apache") makedepends=("python-pbr>=1.3" "python2-pbr>=1.3" "git") source=("https://pypi.python.org/packages/source/${_name:0:1}/${_name}/${_name}-${pkgver}.tar.gz") -sha256sums=('75edebbb9715d9658e12a0b1b510389f5af5b66da7035bae48b3c79c6ac14aad') +sha256sums=('c0ee7075a04a4c432d74d7b578fdc3478a5e831c9bd26fdff13b9bcc1e745ed4') prepare() { cd "${srcdir}/${_name}-${pkgver}" @@ -25,7 +25,7 @@ package_python-oslo-utils() { depends=("python-babel>=1.3" "python-debtcollector>=0.3.0" "python-iso8601>=0.1.9" - "python-monotonic>=0.1" + "python-monotonic>=0.3" "python-netaddr>=0.7.12" "python-netifaces>=0.10.4" "python-oslo-i18n>=1.5.0" @@ -39,7 +39,7 @@ package_python2-oslo-utils() { depends=("python2-babel>=1.3" "python2-debtcollector>=0.3.0" "python2-iso8601>=0.1.9" - "python2-monotonic>=0.1" + "python2-monotonic>=0.3" "python2-netaddr>=0.7.12" "python2-netifaces>=0.10.4" "python2-oslo-i18n>=1.5.0" diff --git a/pcr/reicast-git/PKGBUILD b/pcr/reicast-git/PKGBUILD index e10d00c34..a249b3aa1 100644 --- a/pcr/reicast-git/PKGBUILD +++ b/pcr/reicast-git/PKGBUILD @@ -3,24 +3,25 @@ # Maintainer: Márcio Silva <coadde@parabola.nu> pkgname=reicast-git -pkgver=r1322.4b94e2f +pkgver=r1622.826853a pkgrel=1 pkgdesc="A multiplatform Sega Dreamcast emulator" arch=('i686' 'x86_64') url="http://reicast.com/" license=('GPL2') -conflicts=('reicast') provides=('reicast') +conflicts=('reicast') +conflicts_x86_64+=('reicast-multilib' 'reicast-multilib-git') +replaces_x86_64=('reicast-multilib' 'reicast-multilib-git') makedepends=('git') -depends=('libgl' 'alsa-plugins') -optdepends=('xboxdrv: Userspace gamepad driver for Xbox and Xbox360 gamepads' - 'antimicro: Graphical program used to map keyboard keys and mouse controls to gamepad buttons') +depends=('libgl' 'alsa-plugins' 'libpulse' 'python-evdev' ) +optdepends=('xboxdrv: Userspace gamepad driver for Xbox and Xbox360 gamepads') source=(reicast::"git+https://github.com/reicast/reicast-emulator.git" - 'enable_joystick_support.patch' + 'enable_multiplayer_support.patch' 'wait_if_two_frames_already_in_flight.patch') sha256sums=('SKIP' - '464946512ca4cffac104128a85dd174520caeaa0325afbf281b6cfdbc0120fc6' - 'f4d3b4ad7703da09dc59cae839ca225e1a21b89d905ede3519bf3174b40903da') + '12bfc58e12b3ee79b0c82159cdc70c76a4b6804f5c6986853156602bb0e6beb0' + '4e087844ed22f5a65348e6826444481e14d0409faf8dafb0c6e5284f3f2bd9f7') pkgver() { cd reicast @@ -29,30 +30,33 @@ pkgver() { prepare () { cd reicast - patch -Np1 -i "$srcdir"/enable_joystick_support.patch + + # Remove nonfree fp.h header + rm -v core/deps/libpng/fp.h + + # Add Multiplayer support + patch -Np1 -i "$srcdir"/enable_multiplayer_support.patch + patch -Np1 -i "$srcdir"/wait_if_two_frames_already_in_flight.patch - # Fix pointer size on 64 bit arch: http://github.com/reicast-emulator/pull/768 - sed -i 's|verify((int)rbi);|verify((size_t)rbi);|' core/hw/sh4/dyna/driver.cpp # Add experimental shadow support: http://github.com/reicast-emulator/issues/94 sed -i 's|//DrawModVols|DrawModVols|' core/rend/gles/gldraw.cpp + + # Fix Xbox Input Axis + sed -i 's|DC_AXIS_LT, 0, 0, DC_AXIS_RT|0, 0, DC_AXIS_RT, DC_AXIS_LT|' core/linux-dist/joystick.cpp + + # Enable Pulseaudio + sed -i 's|#USE_PULSEAUDIO|USE_PULSEAUDIO|' shell/linux/Makefile } build () { make -C reicast/shell/linux - if [[ $CARCH == x86_64 ]]; then - make -C reicast/shell/linCPP - fi } package () { cd reicast - install -Dm755 shell/linux/reicast.elf "$pkgdir"/usr/bin/reicast - install -Dm755 shell/linux/nosym-reicast.elf "$pkgdir"/usr/bin/reicast-nosym - if [[ $CARCH == x86_64 ]]; then - install -Dm755 shell/linCPP/reicast.elf "$pkgdir"/usr/bin/reicast-cpp - install -Dm755 shell/linCPP/nosym-reicast.elf "$pkgdir"/usr/bin/reicast-nosym-cpp - fi + make -C shell/linux PREFIX=/usr DESTDIR=$pkgdir install + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } diff --git a/pcr/reicast-git/enable_joystick_support.patch b/pcr/reicast-git/enable_joystick_support.patch deleted file mode 100644 index 0fbb59ac7..000000000 --- a/pcr/reicast-git/enable_joystick_support.patch +++ /dev/null @@ -1,346 +0,0 @@ -diff -Nur reicast-emulator.orig/core/linux-dist/main.cpp reicast-emulator/core/linux-dist/main.cpp ---- reicast-emulator.orig/core/linux-dist/main.cpp 2015-06-29 21:42:22.674278849 -0300 -+++ reicast-emulator/core/linux-dist/main.cpp 2015-06-29 22:08:38.780500620 -0300 -@@ -22,6 +22,7 @@ - #include <X11/Xlib.h> - #include <X11/Xatom.h> - #include <X11/Xutil.h> -+ #include <X11/XKBlib.h> - - #if !defined(GLES) - #include <GL/gl.h> -@@ -49,6 +50,34 @@ - #endif - #define WINDOW_HEIGHT 480 - -+/*****************************************************************/ -+/****************** Configure Controls ***************************/ -+/*****************************************************************/ -+ -+// Use XEV in terminal window to find keycodes to configure buttons. -+#define XANA_UP (25) -+#define XANA_DOWN (39) -+#define XANA_LEFT (38) -+#define XANA_RIGHT (40) -+#define XANA_LT (79) -+#define XANA_RT (81) -+#define XDPAD_UP (31) -+#define XDPAD_DOWN (45) -+#define XDPAD_LEFT (44) -+#define XDPAD_RIGHT (46) -+#define XBTN_Y (80) -+#define XBTN_X (83) -+#define XBTN_B (85) -+#define XBTN_A (84) -+#define XBTN_START (36) -+ -+/*******************************************************************/ -+ -+u8 temp_joyx = 0; -+u8 temp_joyy = 0; -+u8 temp_lt = 0; -+u8 temp_rt = 0; -+ - void* x11_win=0,* x11_disp=0; - void* libPvr_GetRenderTarget() - { -@@ -124,8 +153,8 @@ - { Btn_A,Btn_B,Btn_X,Btn_Y,0,0,0,Btn_Start,0,0 }; - - const u32 JMapAxis_360[MAP_SIZE] = -- { Axis_X,Axis_Y,Axis_LT,0,0,Axis_RT,DPad_Left,DPad_Up,0,0 }; -- -+ //{ Axis_X,Axis_Y,Axis_LT,0,0,Axis_RT,DPad_Left,DPad_Up,0,0 }; -+ { Axis_X,Axis_Y,0,0,Axis_RT,Axis_LT,DPad_Left,DPad_Up,0,0 }; - const u32* JMapBtn=JMapBtn_USB; - const u32* JMapAxis=JMapAxis_USB; - -@@ -180,7 +209,7 @@ - - printf("SDK: Found '%s' joystick with %d axis and %d buttons\n",Name,AxisCount,ButtonCount); - -- if (strcmp(Name,"Microsoft X-Box 360 pad")==0) -+ if (strcmp(Name,"Microsoft X-Box 360 pad")==0 || strcmp(Name,"Xbox Gamepad (userspace driver)")==0) - { - JMapBtn=JMapBtn_360; - JMapAxis=JMapAxis_360; -@@ -414,9 +443,20 @@ - { - static char key = 0; - -- kcode[port]= x11_dc_buttons; -- rt[port]=0; -- lt[port]=0; -+ if (cfgLoadInt("config","usejoypad",0)==1) -+ { -+ HandleJoystick(port); -+ return; -+ } -+ else -+ { -+ kcode[port]= x11_dc_buttons; -+ joyx[0] = temp_joyx; -+ joyy[0] = temp_joyy; -+ lt[0] = temp_lt; -+ rt[0] = temp_rt; -+ return; -+ } - - #if defined(TARGET_GCW0) || defined(TARGET_PANDORA) - HandleJoystick(port); -@@ -472,7 +512,13 @@ - void os_DoEvents() - { - #if defined(SUPPORT_X11) -- if (x11_win) { -+ -+ static bool ana_up = false; -+ static bool ana_down = false; -+ static bool ana_left = false; -+ static bool ana_right = false; -+ -+ if (x11_win) { - //Handle X11 - XEvent e; - if(XCheckWindowEvent((Display*)x11_disp, (Window)x11_win, KeyPressMask | KeyReleaseMask, &e)) -@@ -483,6 +529,103 @@ - case KeyPress: - case KeyRelease: - { -+ -+ //Detect up press -+ if(e.xkey.keycode == XANA_UP) -+ { -+ if(e.type == KeyPress) -+ { -+ ana_up = true; -+ } -+ else if(e.type == KeyRelease) -+ { -+ ana_up = false; -+ } -+ else -+ { -+ } -+ } -+ -+ //Detect down Press -+ if(e.xkey.keycode == XANA_DOWN) -+ { -+ if(e.type == KeyPress) -+ { -+ ana_down = true; -+ } -+ else if(e.type == KeyRelease) -+ { -+ ana_down = false; -+ } -+ else -+ { -+ } -+ } -+ -+ //Detect left press -+ if(e.xkey.keycode == XANA_LEFT) -+ { -+ if(e.type == KeyPress) -+ { -+ ana_left = true; -+ } -+ else if(e.type == KeyRelease) -+ { -+ ana_left = false; -+ } -+ else -+ { -+ } -+ } -+ -+ //Detect right Press -+ if(e.xkey.keycode == XANA_RIGHT) -+ { -+ if(e.type == KeyPress) -+ { -+ ana_right = true; -+ } -+ else if(e.type == KeyRelease) -+ { -+ ana_right = false; -+ } -+ else -+ { -+ } -+ } -+ -+ //detect LT press -+ if (e.xkey.keycode == XANA_LT) -+ { -+ if (e.type == KeyPress) -+ { -+ temp_lt = 255; -+ } -+ else if (e.type == KeyRelease) -+ { -+ temp_lt = 0; -+ } -+ else -+ { -+ } -+ } -+ -+ //detect RT press -+ if (e.xkey.keycode == XANA_RT) -+ { -+ if (e.type == KeyPress) -+ { -+ temp_rt = 255; -+ } -+ else if (e.type == KeyRelease) -+ { -+ temp_rt = 0; -+ } -+ else -+ { -+ } -+ } -+ - int dc_key = x11_keymap[e.xkey.keycode]; - - if (e.type == KeyPress) -@@ -494,14 +637,44 @@ - } - break; - -- -+ default: - { - printf("KEYRELEASE\n"); - } - break; - - } -- } -+ } -+ -+ /* Check analogue control states (up/down) */ -+ if((ana_up == true) && (ana_down == false)) -+ { -+ temp_joyy = -127; -+ } -+ else if((ana_up == false) && (ana_down == true)) -+ { -+ temp_joyy = 127; -+ } -+ else -+ { -+ /* Either both pressed simultaniously or neither pressed */ -+ temp_joyy = 0; -+ } -+ -+ /* Check analogue control states (left/right) */ -+ if((ana_left == true) && (ana_right == false)) -+ { -+ temp_joyx = -127; -+ } -+ else if((ana_left == false) && (ana_right == true)) -+ { -+ temp_joyx = 127; -+ } -+ else -+ { -+ /* Either both pressed simultaniously or neither pressed */ -+ temp_joyx = 0; -+ } - } - #endif - } -@@ -527,6 +700,9 @@ - void os_CreateWindow() - { - #if defined(SUPPORT_X11) -+ -+ Bool ar_set, ar_supp = false; -+ - if (cfgLoadInt("pvr","nox11",0)==0) - { - XInitThreads(); -@@ -636,7 +812,8 @@ - int height=cfgLoadInt("x11","height", WINDOW_HEIGHT); - #endif - -- if (width==-1) -+ //if (width==-1) -+ if (cfgLoadInt("x11","fullscreen",0)==1) - { - width=XDisplayWidth(x11Display,x11Screen); - height=XDisplayHeight(x11Display,x11Screen); -@@ -653,8 +830,21 @@ - - XMapRaised(x11Display, x11Window); - #else -- XMapWindow(x11Display, x11Window); -- -+ -+ if (cfgLoadInt("x11","fullscreen",0)==1) -+ { -+ // fullscreen -+ Atom wmState = XInternAtom(x11Display, "_NET_WM_STATE", False); -+ Atom wmFullscreen = XInternAtom(x11Display, "_NET_WM_STATE_FULLSCREEN", False); -+ XChangeProperty(x11Display, x11Window, wmState, XA_ATOM, 32, PropModeReplace, (unsigned char *)&wmFullscreen, 1); -+ } -+ -+ XMapWindow(x11Display, x11Window); -+ -+ //This 1 second delay is important. Without it the GLX code can execute before the window -+ //resize completes causing a black border at the top of the screen.... -+ sleep(1); -+ - #if !defined(GLES) - - #define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091 -@@ -690,6 +880,11 @@ - //(EGLNativeDisplayType)x11Display; - x11_disp=(void*)x11Display; - x11_win=(void*)x11Window; -+ -+ ar_set = XkbSetDetectableAutoRepeat(x11Display, True, &ar_supp); -+ printf("XkbSetDetectableAutoRepeat returns %u, supported = %u\n",ar_set, ar_supp); -+ -+ - } - else - printf("Not creating X11 window ..\n"); -@@ -805,16 +1000,16 @@ - #endif - - #if defined(SUPPORT_X11) -- x11_keymap[113] = DPad_Left; -- x11_keymap[114] = DPad_Right; -+ x11_keymap[XDPAD_LEFT] = DPad_Left; -+ x11_keymap[XDPAD_RIGHT] = DPad_Right; - -- x11_keymap[111] = DPad_Up; -- x11_keymap[116] = DPad_Down; -+ x11_keymap[XDPAD_UP] = DPad_Up; -+ x11_keymap[XDPAD_DOWN] = DPad_Down; - -- x11_keymap[52] = Btn_Y; -- x11_keymap[53] = Btn_X; -- x11_keymap[54] = Btn_B; -- x11_keymap[55] = Btn_A; -+ x11_keymap[XBTN_Y] = Btn_Y; -+ x11_keymap[XBTN_X] = Btn_X; -+ x11_keymap[XBTN_B] = Btn_B; -+ x11_keymap[XBTN_A] = Btn_A; - - /* - //TODO: Fix sliders -@@ -822,7 +1017,7 @@ - x11_keymap[39] = DPad_Down; - */ - -- x11_keymap[36] = Btn_Start; -+ x11_keymap[XBTN_START] = Btn_Start; - #endif - - printf("Home dir is: %s\n",GetPath("/").c_str()); diff --git a/pcr/reicast-git/enable_multiplayer_support.patch b/pcr/reicast-git/enable_multiplayer_support.patch new file mode 100644 index 000000000..57794d1eb --- /dev/null +++ b/pcr/reicast-git/enable_multiplayer_support.patch @@ -0,0 +1,37 @@ +diff -Nur a/core/hw/maple/maple_cfg.cpp b/core/hw/maple/maple_cfg.cpp +--- a/core/hw/maple/maple_cfg.cpp 2015-08-27 12:17:34.718561243 -0300 ++++ b/core/hw/maple/maple_cfg.cpp 2015-08-27 15:57:10.233166402 -0300 +@@ -22,10 +22,12 @@ + */ + void UpdateInputState(u32 port); + +-extern u16 kcode[4]; +-extern u32 vks[4]; +-extern s8 joyx[4],joyy[4]; +-extern u8 rt[4],lt[4]; ++#define NUM_PORTS 4 ++ ++extern u16 kcode[NUM_PORTS]; ++extern u32 vks[NUM_PORTS]; ++extern s8 joyx[NUM_PORTS],joyy[NUM_PORTS]; ++extern u8 rt[NUM_PORTS],lt[NUM_PORTS]; + + u8 GetBtFromSgn(s8 val) + { +@@ -69,10 +71,13 @@ + void mcfg_CreateDevices() + { + #if DC_PLATFORM == DC_PLATFORM_DREAMCAST +- mcfg_Create(MDT_SegaController,0,5); ++ for (int i = 0; i < NUM_PORTS; i++) ++ { ++ mcfg_Create(MDT_SegaController,i,5); + +- mcfg_Create(MDT_SegaVMU,0,0); +- mcfg_Create(MDT_SegaVMU,0,1); ++ mcfg_Create(MDT_SegaVMU,i,0); ++ mcfg_Create(MDT_SegaVMU,i,1); ++ } + #else + mcfg_Create(MDT_NaomiJamma, 0, 5); + #endif diff --git a/pcr/reicast-git/wait_if_two_frames_already_in_flight.patch b/pcr/reicast-git/wait_if_two_frames_already_in_flight.patch index ff297365c..6b29b3d61 100644 --- a/pcr/reicast-git/wait_if_two_frames_already_in_flight.patch +++ b/pcr/reicast-git/wait_if_two_frames_already_in_flight.patch @@ -1,15 +1,15 @@ -diff -Nur reicast-emulator.orig/core/hw/pvr/Renderer_if.cpp reicast-emulator/core/hw/pvr/Renderer_if.cpp ---- reicast-emulator.orig/core/hw/pvr/Renderer_if.cpp 2015-06-20 02:04:02.180069939 -0300 -+++ reicast-emulator/core/hw/pvr/Renderer_if.cpp 2015-06-20 02:10:17.831402600 -0300 -@@ -184,6 +184,7 @@ +diff -Nur a/core/hw/pvr/Renderer_if.cpp b/core/hw/pvr/Renderer_if.cpp +--- a/core/hw/pvr/Renderer_if.cpp 2015-08-27 12:17:34.719561251 -0300 ++++ b/core/hw/pvr/Renderer_if.cpp 2015-08-27 12:21:45.917501578 -0300 +@@ -187,6 +187,7 @@ bool rend_frame(TA_context* ctx, bool draw_osd) { bool proc = renderer->Process(ctx); + FinishRender(_pvrrc); + #if !defined(TARGET_NO_THREADS) re.Set(); - - bool do_swp = proc && renderer->Render(); -@@ -207,7 +208,7 @@ + #endif +@@ -213,7 +214,7 @@ bool do_swp = rend_frame(_pvrrc, true); //clear up & free data .. @@ -18,15 +18,15 @@ diff -Nur reicast-emulator.orig/core/hw/pvr/Renderer_if.cpp reicast-emulator/cor _pvrrc=0; return do_swp; -@@ -260,6 +261,7 @@ - +@@ -267,6 +268,7 @@ + #endif bool pend_rend = false; +extern TA_context* rqueue; void rend_resize(int width, int height) { renderer->Resize(width, height); -@@ -268,6 +270,10 @@ +@@ -275,6 +277,10 @@ void rend_start_render() { @@ -37,34 +37,15 @@ diff -Nur reicast-emulator.orig/core/hw/pvr/Renderer_if.cpp reicast-emulator/cor pend_rend = false; bool is_rtt=(FB_W_SOF1& 0x1000000)!=0; TA_context* ctx = tactx_Pop(CORE_CURRENT_CTX); -@@ -314,7 +320,6 @@ - } - } - -- - void rend_end_render() - { - #if 1 //also disabled the printf, it takes quite some time ... -@@ -325,8 +330,9 @@ - #endif - #endif - -- if (pend_rend) -+ if (pend_rend) { - re.Wait(); -+ } - } - - /* -diff -Nur reicast-emulator.orig/core/hw/pvr/ta_ctx.cpp reicast-emulator/core/hw/pvr/ta_ctx.cpp ---- reicast-emulator.orig/core/hw/pvr/ta_ctx.cpp 2015-06-20 02:04:02.186736275 -0300 -+++ reicast-emulator/core/hw/pvr/ta_ctx.cpp 2015-06-20 02:07:44.202370584 -0300 -@@ -119,8 +119,6 @@ +diff -Nur a/core/hw/pvr/ta_ctx.cpp b/core/hw/pvr/ta_ctx.cpp +--- a/core/hw/pvr/ta_ctx.cpp 2015-08-27 12:17:34.720561259 -0300 ++++ b/core/hw/pvr/ta_ctx.cpp 2015-08-27 12:23:24.614248467 -0300 +@@ -153,8 +153,6 @@ mtx_rqueue.Lock(); rqueue = 0; mtx_rqueue.Unlock(); - - tactx_Recycle(ctx); + frame_finished.Set(); } - cMutex mtx_pool; diff --git a/pcr/reicast-multilib-git/PKGBUILD b/pcr/reicast-multilib-git/PKGBUILD deleted file mode 100644 index c675fa002..000000000 --- a/pcr/reicast-multilib-git/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# Maintainer (Arch): carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG -# Maintainer: André Silva <emulatorman@parabola.nu> -# Maintainer: Márcio Silva <coadde@parabola.nu> - -pkgname=reicast-multilib-git -pkgver=r1322.4b94e2f -pkgrel=1 -pkgdesc="A multiplatform Sega Dreamcast emulator" -arch=('x86_64') -url="http://reicast.com/" -license=('GPL2') -conflicts=('reicast') -provides=('reicast') -makedepends=('git') -makedepends_x86_64=('gcc-multilib') -depends_x86_64=('lib32-libgl' 'lib32-alsa-plugins') -optdepends=('xboxdrv: Userspace gamepad driver for Xbox and Xbox360 gamepads' - 'antimicro: Graphical program used to map keyboard keys and mouse controls to gamepad buttons') -source=(reicast::"git+https://github.com/reicast/reicast-emulator.git" - 'enable_joystick_support.patch' - 'wait_if_two_frames_already_in_flight.patch') -sha256sums=('SKIP' - '464946512ca4cffac104128a85dd174520caeaa0325afbf281b6cfdbc0120fc6' - 'f4d3b4ad7703da09dc59cae839ca225e1a21b89d905ede3519bf3174b40903da') - -pkgver() { - cd reicast - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" -} - -prepare () { - cd reicast - patch -Np1 -i "$srcdir"/enable_joystick_support.patch - patch -Np1 -i "$srcdir"/wait_if_two_frames_already_in_flight.patch - - # Fix pointer size on 64 bit arch: http://github.com/reicast-emulator/pull/768 - sed -i 's|verify((int)rbi);|verify((size_t)rbi);|' core/hw/sh4/dyna/driver.cpp - # Add experimental shadow support: http://github.com/reicast-emulator/issues/94 - sed -i 's|//DrawModVols|DrawModVols|' core/rend/gles/gldraw.cpp -} - -build () { - linux32 make -C reicast/shell/linux -} - -package () { - cd reicast - - install -Dm755 shell/linux/reicast.elf "$pkgdir"/usr/bin/reicast - install -Dm755 shell/linux/nosym-reicast.elf "$pkgdir"/usr/bin/reicast-nosym - install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE -} diff --git a/pcr/reicast-multilib-git/enable_joystick_support.patch b/pcr/reicast-multilib-git/enable_joystick_support.patch deleted file mode 100644 index 0fbb59ac7..000000000 --- a/pcr/reicast-multilib-git/enable_joystick_support.patch +++ /dev/null @@ -1,346 +0,0 @@ -diff -Nur reicast-emulator.orig/core/linux-dist/main.cpp reicast-emulator/core/linux-dist/main.cpp ---- reicast-emulator.orig/core/linux-dist/main.cpp 2015-06-29 21:42:22.674278849 -0300 -+++ reicast-emulator/core/linux-dist/main.cpp 2015-06-29 22:08:38.780500620 -0300 -@@ -22,6 +22,7 @@ - #include <X11/Xlib.h> - #include <X11/Xatom.h> - #include <X11/Xutil.h> -+ #include <X11/XKBlib.h> - - #if !defined(GLES) - #include <GL/gl.h> -@@ -49,6 +50,34 @@ - #endif - #define WINDOW_HEIGHT 480 - -+/*****************************************************************/ -+/****************** Configure Controls ***************************/ -+/*****************************************************************/ -+ -+// Use XEV in terminal window to find keycodes to configure buttons. -+#define XANA_UP (25) -+#define XANA_DOWN (39) -+#define XANA_LEFT (38) -+#define XANA_RIGHT (40) -+#define XANA_LT (79) -+#define XANA_RT (81) -+#define XDPAD_UP (31) -+#define XDPAD_DOWN (45) -+#define XDPAD_LEFT (44) -+#define XDPAD_RIGHT (46) -+#define XBTN_Y (80) -+#define XBTN_X (83) -+#define XBTN_B (85) -+#define XBTN_A (84) -+#define XBTN_START (36) -+ -+/*******************************************************************/ -+ -+u8 temp_joyx = 0; -+u8 temp_joyy = 0; -+u8 temp_lt = 0; -+u8 temp_rt = 0; -+ - void* x11_win=0,* x11_disp=0; - void* libPvr_GetRenderTarget() - { -@@ -124,8 +153,8 @@ - { Btn_A,Btn_B,Btn_X,Btn_Y,0,0,0,Btn_Start,0,0 }; - - const u32 JMapAxis_360[MAP_SIZE] = -- { Axis_X,Axis_Y,Axis_LT,0,0,Axis_RT,DPad_Left,DPad_Up,0,0 }; -- -+ //{ Axis_X,Axis_Y,Axis_LT,0,0,Axis_RT,DPad_Left,DPad_Up,0,0 }; -+ { Axis_X,Axis_Y,0,0,Axis_RT,Axis_LT,DPad_Left,DPad_Up,0,0 }; - const u32* JMapBtn=JMapBtn_USB; - const u32* JMapAxis=JMapAxis_USB; - -@@ -180,7 +209,7 @@ - - printf("SDK: Found '%s' joystick with %d axis and %d buttons\n",Name,AxisCount,ButtonCount); - -- if (strcmp(Name,"Microsoft X-Box 360 pad")==0) -+ if (strcmp(Name,"Microsoft X-Box 360 pad")==0 || strcmp(Name,"Xbox Gamepad (userspace driver)")==0) - { - JMapBtn=JMapBtn_360; - JMapAxis=JMapAxis_360; -@@ -414,9 +443,20 @@ - { - static char key = 0; - -- kcode[port]= x11_dc_buttons; -- rt[port]=0; -- lt[port]=0; -+ if (cfgLoadInt("config","usejoypad",0)==1) -+ { -+ HandleJoystick(port); -+ return; -+ } -+ else -+ { -+ kcode[port]= x11_dc_buttons; -+ joyx[0] = temp_joyx; -+ joyy[0] = temp_joyy; -+ lt[0] = temp_lt; -+ rt[0] = temp_rt; -+ return; -+ } - - #if defined(TARGET_GCW0) || defined(TARGET_PANDORA) - HandleJoystick(port); -@@ -472,7 +512,13 @@ - void os_DoEvents() - { - #if defined(SUPPORT_X11) -- if (x11_win) { -+ -+ static bool ana_up = false; -+ static bool ana_down = false; -+ static bool ana_left = false; -+ static bool ana_right = false; -+ -+ if (x11_win) { - //Handle X11 - XEvent e; - if(XCheckWindowEvent((Display*)x11_disp, (Window)x11_win, KeyPressMask | KeyReleaseMask, &e)) -@@ -483,6 +529,103 @@ - case KeyPress: - case KeyRelease: - { -+ -+ //Detect up press -+ if(e.xkey.keycode == XANA_UP) -+ { -+ if(e.type == KeyPress) -+ { -+ ana_up = true; -+ } -+ else if(e.type == KeyRelease) -+ { -+ ana_up = false; -+ } -+ else -+ { -+ } -+ } -+ -+ //Detect down Press -+ if(e.xkey.keycode == XANA_DOWN) -+ { -+ if(e.type == KeyPress) -+ { -+ ana_down = true; -+ } -+ else if(e.type == KeyRelease) -+ { -+ ana_down = false; -+ } -+ else -+ { -+ } -+ } -+ -+ //Detect left press -+ if(e.xkey.keycode == XANA_LEFT) -+ { -+ if(e.type == KeyPress) -+ { -+ ana_left = true; -+ } -+ else if(e.type == KeyRelease) -+ { -+ ana_left = false; -+ } -+ else -+ { -+ } -+ } -+ -+ //Detect right Press -+ if(e.xkey.keycode == XANA_RIGHT) -+ { -+ if(e.type == KeyPress) -+ { -+ ana_right = true; -+ } -+ else if(e.type == KeyRelease) -+ { -+ ana_right = false; -+ } -+ else -+ { -+ } -+ } -+ -+ //detect LT press -+ if (e.xkey.keycode == XANA_LT) -+ { -+ if (e.type == KeyPress) -+ { -+ temp_lt = 255; -+ } -+ else if (e.type == KeyRelease) -+ { -+ temp_lt = 0; -+ } -+ else -+ { -+ } -+ } -+ -+ //detect RT press -+ if (e.xkey.keycode == XANA_RT) -+ { -+ if (e.type == KeyPress) -+ { -+ temp_rt = 255; -+ } -+ else if (e.type == KeyRelease) -+ { -+ temp_rt = 0; -+ } -+ else -+ { -+ } -+ } -+ - int dc_key = x11_keymap[e.xkey.keycode]; - - if (e.type == KeyPress) -@@ -494,14 +637,44 @@ - } - break; - -- -+ default: - { - printf("KEYRELEASE\n"); - } - break; - - } -- } -+ } -+ -+ /* Check analogue control states (up/down) */ -+ if((ana_up == true) && (ana_down == false)) -+ { -+ temp_joyy = -127; -+ } -+ else if((ana_up == false) && (ana_down == true)) -+ { -+ temp_joyy = 127; -+ } -+ else -+ { -+ /* Either both pressed simultaniously or neither pressed */ -+ temp_joyy = 0; -+ } -+ -+ /* Check analogue control states (left/right) */ -+ if((ana_left == true) && (ana_right == false)) -+ { -+ temp_joyx = -127; -+ } -+ else if((ana_left == false) && (ana_right == true)) -+ { -+ temp_joyx = 127; -+ } -+ else -+ { -+ /* Either both pressed simultaniously or neither pressed */ -+ temp_joyx = 0; -+ } - } - #endif - } -@@ -527,6 +700,9 @@ - void os_CreateWindow() - { - #if defined(SUPPORT_X11) -+ -+ Bool ar_set, ar_supp = false; -+ - if (cfgLoadInt("pvr","nox11",0)==0) - { - XInitThreads(); -@@ -636,7 +812,8 @@ - int height=cfgLoadInt("x11","height", WINDOW_HEIGHT); - #endif - -- if (width==-1) -+ //if (width==-1) -+ if (cfgLoadInt("x11","fullscreen",0)==1) - { - width=XDisplayWidth(x11Display,x11Screen); - height=XDisplayHeight(x11Display,x11Screen); -@@ -653,8 +830,21 @@ - - XMapRaised(x11Display, x11Window); - #else -- XMapWindow(x11Display, x11Window); -- -+ -+ if (cfgLoadInt("x11","fullscreen",0)==1) -+ { -+ // fullscreen -+ Atom wmState = XInternAtom(x11Display, "_NET_WM_STATE", False); -+ Atom wmFullscreen = XInternAtom(x11Display, "_NET_WM_STATE_FULLSCREEN", False); -+ XChangeProperty(x11Display, x11Window, wmState, XA_ATOM, 32, PropModeReplace, (unsigned char *)&wmFullscreen, 1); -+ } -+ -+ XMapWindow(x11Display, x11Window); -+ -+ //This 1 second delay is important. Without it the GLX code can execute before the window -+ //resize completes causing a black border at the top of the screen.... -+ sleep(1); -+ - #if !defined(GLES) - - #define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091 -@@ -690,6 +880,11 @@ - //(EGLNativeDisplayType)x11Display; - x11_disp=(void*)x11Display; - x11_win=(void*)x11Window; -+ -+ ar_set = XkbSetDetectableAutoRepeat(x11Display, True, &ar_supp); -+ printf("XkbSetDetectableAutoRepeat returns %u, supported = %u\n",ar_set, ar_supp); -+ -+ - } - else - printf("Not creating X11 window ..\n"); -@@ -805,16 +1000,16 @@ - #endif - - #if defined(SUPPORT_X11) -- x11_keymap[113] = DPad_Left; -- x11_keymap[114] = DPad_Right; -+ x11_keymap[XDPAD_LEFT] = DPad_Left; -+ x11_keymap[XDPAD_RIGHT] = DPad_Right; - -- x11_keymap[111] = DPad_Up; -- x11_keymap[116] = DPad_Down; -+ x11_keymap[XDPAD_UP] = DPad_Up; -+ x11_keymap[XDPAD_DOWN] = DPad_Down; - -- x11_keymap[52] = Btn_Y; -- x11_keymap[53] = Btn_X; -- x11_keymap[54] = Btn_B; -- x11_keymap[55] = Btn_A; -+ x11_keymap[XBTN_Y] = Btn_Y; -+ x11_keymap[XBTN_X] = Btn_X; -+ x11_keymap[XBTN_B] = Btn_B; -+ x11_keymap[XBTN_A] = Btn_A; - - /* - //TODO: Fix sliders -@@ -822,7 +1017,7 @@ - x11_keymap[39] = DPad_Down; - */ - -- x11_keymap[36] = Btn_Start; -+ x11_keymap[XBTN_START] = Btn_Start; - #endif - - printf("Home dir is: %s\n",GetPath("/").c_str()); diff --git a/pcr/reicast-multilib-git/wait_if_two_frames_already_in_flight.patch b/pcr/reicast-multilib-git/wait_if_two_frames_already_in_flight.patch deleted file mode 100644 index ff297365c..000000000 --- a/pcr/reicast-multilib-git/wait_if_two_frames_already_in_flight.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff -Nur reicast-emulator.orig/core/hw/pvr/Renderer_if.cpp reicast-emulator/core/hw/pvr/Renderer_if.cpp ---- reicast-emulator.orig/core/hw/pvr/Renderer_if.cpp 2015-06-20 02:04:02.180069939 -0300 -+++ reicast-emulator/core/hw/pvr/Renderer_if.cpp 2015-06-20 02:10:17.831402600 -0300 -@@ -184,6 +184,7 @@ - - bool rend_frame(TA_context* ctx, bool draw_osd) { - bool proc = renderer->Process(ctx); -+ FinishRender(_pvrrc); - re.Set(); - - bool do_swp = proc && renderer->Render(); -@@ -207,7 +208,7 @@ - bool do_swp = rend_frame(_pvrrc, true); - - //clear up & free data .. -- FinishRender(_pvrrc); -+ tactx_Recycle(_pvrrc); - _pvrrc=0; - - return do_swp; -@@ -260,6 +261,7 @@ - - - bool pend_rend = false; -+extern TA_context* rqueue; - - void rend_resize(int width, int height) { - renderer->Resize(width, height); -@@ -268,6 +270,10 @@ - - void rend_start_render() - { -+ if (rqueue) { -+ rend_end_render(); -+ } -+ - pend_rend = false; - bool is_rtt=(FB_W_SOF1& 0x1000000)!=0; - TA_context* ctx = tactx_Pop(CORE_CURRENT_CTX); -@@ -314,7 +320,6 @@ - } - } - -- - void rend_end_render() - { - #if 1 //also disabled the printf, it takes quite some time ... -@@ -325,8 +330,9 @@ - #endif - #endif - -- if (pend_rend) -+ if (pend_rend) { - re.Wait(); -+ } - } - - /* -diff -Nur reicast-emulator.orig/core/hw/pvr/ta_ctx.cpp reicast-emulator/core/hw/pvr/ta_ctx.cpp ---- reicast-emulator.orig/core/hw/pvr/ta_ctx.cpp 2015-06-20 02:04:02.186736275 -0300 -+++ reicast-emulator/core/hw/pvr/ta_ctx.cpp 2015-06-20 02:07:44.202370584 -0300 -@@ -119,8 +119,6 @@ - mtx_rqueue.Lock(); - rqueue = 0; - mtx_rqueue.Unlock(); -- -- tactx_Recycle(ctx); - } - - cMutex mtx_pool; diff --git a/pcr/rsbep/PKGBUILD b/pcr/rsbep/PKGBUILD new file mode 100644 index 000000000..157cdf106 --- /dev/null +++ b/pcr/rsbep/PKGBUILD @@ -0,0 +1,23 @@ +# Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697 + +pkgname=rsbep +pkgver=0.1.0 +pkgrel=1 +pkgdesc="Tsiodras patched rsbep for error-resilient backups of data using the Reed-Solomon algorithm." +arch=('i686' 'x86_64') +url="http://arss.sourceforge.net/" +license=('GPL2') +makedepends=('gcc') +source=("http://distro.ibiblio.org/slitaz/sources/packages/r/$pkgname-$pkgver-ttsiodras.tar.bz2") +sha512sums=('df3b053468a7951dd3af35271b2e0fbd2b378521823eabb2bbd7b855dadc8a1f1b974c25df9f437765dd574df088a3d18ce9b73ea773181ea24d79e3ff7555cc') + +build() { + cd $pkgname-$pkgver-ttsiodras + ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc --sbindir=/usr/bin + make +} + +package() { + cd $pkgname-$pkgver-ttsiodras + make DESTDIR="$pkgdir/" install +}
\ No newline at end of file diff --git a/pcr/spl-git/PKGBUILD b/pcr/spl-git/PKGBUILD new file mode 100644 index 000000000..46700cc8c --- /dev/null +++ b/pcr/spl-git/PKGBUILD @@ -0,0 +1,68 @@ +# Maintainer (Arch): Jesus Alvarez <jeezusjr at gmail dot com> +# Contributor (Arch): Kyle Fuller <inbox at kylefuller dot co dot uk> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> +# +# This PKGBUILD was generated by the archzfs build scripts located at +# +# http://github.com/demizer/archzfs +# +# The build script generates and updates the pkgver and _kernel* variables. +# +pkgname="spl-git" +pkgver=0.6.4.2_r0_g04974ca_4.1.6_1 +pkgrel=1 +license=('GPL') + +# Used incase the i686 and x86_64 linux packages get out of sync with the +# PKGREL. This occurred on January 31, 2014 where i686 was versioned at +# 3.12.9-1 and x86_64 was versioned at 3.12.9-2. +_kernel_version_x32="4.1.6-1" +_kernel_version_x32_full="4.1.6-gnu-1" +_kernel_version_x64="4.1.6-1" +_kernel_version_x64_full="4.1.6-gnu-1" + +if [[ $CARCH == "i686" ]]; then + _kernel_version=${_kernel_version_x32} + _kernel_version_full=${_kernel_version_x32_full} +else + _kernel_version=${_kernel_version_x64} + _kernel_version_full=${_kernel_version_x64_full} +fi + +pkgdesc="Solaris Porting Layer kernel modules." +depends=("spl-utils-git" "linux=${_kernel_version}") +makedepends=("git" "linux-headers=${_kernel_version}") +arch=("i686" "x86_64") +url="http://zfsonlinux.org/" +source=("git+https://github.com/zfsonlinux/spl.git#commit=04974ca1") +groups=("archzfs-git") +md5sums=('SKIP') +replaces=("spl") +provides=("spl") +conflicts=("spl" "spl-lts") +install=spl.install + +build() { + cd "${srcdir}/spl" + ./autogen.sh + + _at_enable="" + [ "${CARCH}" == "i686" ] && _at_enable="--enable-atomic-spinlocks" + + ./configure --prefix=/usr \ + --libdir=/usr/lib \ + --sbindir=/usr/bin \ + --with-linux=/usr/lib/modules/${_kernel_version_full}/build \ + --with-config=kernel \ + ${_at_enable} + + make +} + +package() { + cd "${srcdir}/spl" + make DESTDIR="${pkgdir}" install + + mv "${pkgdir}/lib" "${pkgdir}/usr/" + sed -i "s+${srcdir}++" ${pkgdir}/usr/src/spl-*/${_kernel_version_full}/Module.symvers +} diff --git a/pcr/spl-git/spl.install b/pcr/spl-git/spl.install new file mode 100644 index 000000000..e316e7542 --- /dev/null +++ b/pcr/spl-git/spl.install @@ -0,0 +1,37 @@ +post_install() { + check_hostid + run_depmod +} + +post_remove() { + run_depmod +} + +post_upgrade() { + check_hostid + run_depmod +} + +check_hostid() { + # Check /etc/hostid to see if it set to the sentinel value, see + # https://wiki.archlinux.org/index.php/ZFS for more information. + HOSTID=$(hostid) + if [ "0x$HOSTID" == "0xffffffff" ]; then + # Generate a new hostid + : >/etc/hostid + HOSTID=$(hostid) + # hostid is 4 byte little endian + printf $(echo -n $HOSTID | sed 's/\(..\)\(..\)\(..\)\(..\)/\\x\4\\x\3\\x\2\\x\1/') >/etc/hostid + fi +} + +run_depmod() { + echo ">>> Updating module dependencies. Please wait ..." + + _kernel_version_x32_full="4.1.6-gnu-1" + _kernel_version_x64_full="4.1.6-gnu-1" + + [[ $CARCH == "i686" ]] && _kernel_version_full=${_kernel_version_x32_full} || _kernel_version_full=${_kernel_version_x64_full} + + depmod ${_kernel_version_full} +} diff --git a/pcr/spl-utils-git/PKGBUILD b/pcr/spl-utils-git/PKGBUILD new file mode 100644 index 000000000..d076a5813 --- /dev/null +++ b/pcr/spl-utils-git/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer (Arch): Jesus Alvarez <jeezusjr at gmail dot com> +# Contributor (Arch): Kyle Fuller <inbox at kylefuller dot co dot uk> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> +# +# This PKGBUILD was generated by the archzfs build scripts located at +# +# http://github.com/demizer/archzfs +# +# The build script generates and updates the pkgver and _kernel* variables. +# +pkgname="spl-utils-git" +pkgver=0.6.4.2_r0_g04974ca_4.1.6_1 +pkgrel=1 +license=('GPL') +pkgdesc="Solaris Porting Layer kernel module support files." +makedepends=("git") +arch=("i686" "x86_64") +url="http://zfsonlinux.org/" +source=("git+https://github.com/zfsonlinux/spl.git#commit=04974ca1" + "spl-utils.hostid") +groups=("archzfs-git") +md5sums=('SKIP' + 'a54f0041a9e15b050f25c463f1db7449') +replaces=("spl-utils") +provides=("spl-utils") +conflicts=("spl-utils" "spl-utils-lts") + +build() { + cd "${srcdir}/spl" + ./autogen.sh + + _at_enable="" + [ "${CARCH}" == "i686" ] && _at_enable="--enable-atomic-spinlocks" + + ./configure --prefix=/usr \ + --libdir=/usr/lib \ + --sbindir=/usr/bin \ + --with-config=user \ + ${_at_enable} + + make +} + +package() { + cd "${srcdir}/spl" + make DESTDIR="${pkgdir}" install + + install -D -m644 "${srcdir}"/spl-utils.hostid "${pkgdir}"/etc/hostid +} diff --git a/pcr/sqlcipher/PKGBUILD b/pcr/sqlcipher/PKGBUILD deleted file mode 100644 index 8bcdcd3f5..000000000 --- a/pcr/sqlcipher/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# Maintainer (Arch): flu -# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> - -pkgname=sqlcipher -pkgver=3.3.1 -pkgrel=1.1 -pkgdesc="SQLite extension that provides transparent 256-bit AES encryption of database files" -arch=('i686' 'x86_64') -url="https://www.zetetic.net/sqlcipher/" -license=('BSD') -makedepends=('openssl' 'sqlite3' 'git' 'tcl') -source=(https://github.com/sqlcipher/${pkgname}/archive/v${pkgver}.tar.gz) -sha512sums=('8bcbe0d46ec109788bf58ba53eaccad189338fb3caf551096ae166c71a72ba58331bc2d1198d6c7b3f62973e004be06c6189f2539e7da664b2e4b50c5637f989') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr \ - --enable-tempstore=yes \ - CFLAGS="$CFLAGS -DSQLITE_HAS_CODEC" LDFLAGS="-lcrypto" - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install - install -D -m 0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/pcr/tahoe-lafs/PKGBUILD b/pcr/tahoe-lafs/PKGBUILD index 6a09409ae..bd1da4931 100644 --- a/pcr/tahoe-lafs/PKGBUILD +++ b/pcr/tahoe-lafs/PKGBUILD @@ -1,11 +1,11 @@ # Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697 -# Contributor (Arch): Skydrome <skydrome@i2pmail.org> +# Contributor (Arch) : Skydrome <skydrome@i2pmail.org> # Contributor (Arch): DaNiMoTh <jjdanimoth@gmail.com> # Contributor (Arch): Peter Simons <simons@cryp.to> # Contributor (Arch): Nicolas Pouillard <nicolas.pouillard@gmail.com> pkgname=tahoe-lafs -pkgver=1.10.1 +pkgver=1.10.2 pkgrel=1 pkgdesc="Secure, decentralized, and fault-tolerant filesystem." url='https://tahoe-lafs.org/trac/tahoe-lafs' @@ -16,9 +16,8 @@ BUILDENV+=(!check) depends=('openssl>=1.0.2' 'python2-twisted>=13.0.0' - 'python2-mock>=1.0.1' 'python2-pyopenssl>=0.14' - 'python2-pyasn1>=0.1.4' + 'python2-pyasn1>=0.1.8' 'python2-pyasn1-modules>=0.0.5' 'python2-zope-interface>=4.0.5' 'python2-characteristic>=14.3.0' @@ -42,20 +41,20 @@ depends=('openssl>=1.0.2' optdepends=('python2-numpy: reliability test') source=("https://tahoe-lafs.org/source/tahoe-lafs/releases/allmydata-tahoe-$pkgver.tar.bz2" -"https://tahoe-lafs.org/source/tahoe-lafs/releases/allmydata-tahoe-1.10.1.tar.bz2.asc" +"https://tahoe-lafs.org/source/tahoe-lafs/releases/allmydata-tahoe-$pkgver.tar.bz2.asc" 'PKGBUILD' 'PKGBUILD.sig') validpgpkeys=('CB6E213A349B8DF9E96B622AC3F4FFCF3EAE8697' # PKGBUILD Maintainer's key 'E34E62D06D0E69CFCA4179FFBDE0D31D68666A7A') # Tahoe-LAFS Release-Signing Key -sha512sums=('1c8a94f07f6c1d832b7ea05f5a24b410a58d7058814215794d2d600e55774aa9f015208caf281e527547a8c12ff25a989ba26fbfd8b89c57c772880857d7dd88' -'1da1eeb1d2f61f836a2f514eaff73770fa8cf3dd18950de9e159af2a4c2f13b46033b10a6bf545e96c0cf8319a88923eb2792e4aebd17f048d6b0a364dd97737' +sha512sums=('79d4e3395aa7ef8e1e7c97eebdfcb75b3b36edb75aa5d5f805c568b842b9b2f4ea5f8529dbf32fbdd9cc467cf82f153aca09310bc3b69fa00efae7be8a7bc198' +'40e5c1cbf24e44a652aaff27f7c55016900cfca0659f6a9071e22b87d0ee281b8ab76005393c92e3eabb9b364eedbd0d108ba3ea29c7f46339c68865f3bb77fe' 'SKIP' 'SKIP') build(){ gpg --verify PKGBUILD.sig PKGBUILD echo "Note: If the GPG verification fails, import the PKGBUILD maintainer's GPG key. See: https://wiki.parabola.nu/GnuPG#Import_key" - whirlpoolsum=('4150961c179dd6537dc06e1c4423026df42cd04a62c9b2ec9af35034b5fd868342459d46195422fb9638017265ea8232b381df6b6678017463e06a2ae130581a') + whirlpoolsum=('d38a362105118113aaaf34c429c4b611e37ebf10d983dff1a4a117f6802671df78805ac1950b1c01279d36d1c87bc3976fec498580117d6f9bc46912a00b792f') [[ "$(openssl dgst -r -whirlpool allmydata-tahoe-$pkgver.tar.bz2 | awk '{print $1}')" = ${whirlpoolsum} ]] && echo "Whirlpool checksum passed." || { echo "Whirlpool checksum failed!!" ; exit 1; } # This is an added security layer. If SHA512 for some unlikely reason fails, whirlpool will check and abort if it too fails to match. gpg --verify allmydata-tahoe-$pkgver.tar.bz2.asc allmydata-tahoe-$pkgver.tar.bz2 cd "${srcdir}/allmydata-tahoe-${pkgver}" diff --git a/pcr/tahoe-lafs/PKGBUILD.sig b/pcr/tahoe-lafs/PKGBUILD.sig Binary files differindex 6a3f954a5..c84c3df9a 100644 --- a/pcr/tahoe-lafs/PKGBUILD.sig +++ b/pcr/tahoe-lafs/PKGBUILD.sig diff --git a/pcr/thermald/PKGBUILD b/pcr/thermald/PKGBUILD new file mode 100644 index 000000000..f17c32ffe --- /dev/null +++ b/pcr/thermald/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer (Arch): hadrons123 <piruthiviraj at gmail dot com> +# Contributor (Arch): WonderWoofy <sugar.and.scruffy@gmail.com>,wallnuss <v dot churavy at gmail dot com> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> + +pkgname=thermald +_pkgname=thermal_daemon +pkgver=1.4.3 +pkgrel=1 +pkgdesc="The Linux Thermal Daemon program from 01.org" +arch=('i686' 'x86_64') +url='https://github.com/01org/thermal_daemon' +license=('GPL2') +makedepends=('systemd') +depends=('dbus-glib>=0.94' 'libxml2>=2.4') +backup=('etc/thermald/thermal-conf.xml') +conflicts=('thermald') +provides=('thermald') +source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz" + 'modules-load-thermald.conf') +sha256sums=('566595eb2c56679d463be5a65d612de90968248054122bb390d0bc902ba7b762' + '0155e1eb459306d251a5a049ffc6c11e144fa8caa75901ac5fa20bd52e05d515') +build() { + cd "${_pkgname}-${pkgver}" + ./autogen.sh + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --sbindir=/usr/bin + make +} + +package() { + cd "${_pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 "${srcdir}/modules-load-thermald.conf" "${pkgdir}/usr/lib/modules-load.d/thermald.conf" + + # Remove Upstart related files + rm -r "${pkgdir}/etc/init" +} diff --git a/pcr/thermald/modules-load-thermald.conf b/pcr/thermald/modules-load-thermald.conf new file mode 100644 index 000000000..a8b98118a --- /dev/null +++ b/pcr/thermald/modules-load-thermald.conf @@ -0,0 +1,2 @@ +msr +coretemp diff --git a/pcr/trytond/PKGBUILD b/pcr/trytond/PKGBUILD index 73363c2cb..806e2b439 100644 --- a/pcr/trytond/PKGBUILD +++ b/pcr/trytond/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer (Arch): Robin Baumgartner <robin@baumgartners.ch> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=trytond -pkgver=3.6.1 +pkgver=3.6.2 _pkgdir=3.6 pkgrel=1 pkgdesc="A three-tiers high-level general purpose application platform (server application)" @@ -21,7 +21,7 @@ install="trytond.install" source=("http://downloads.tryton.org/$_pkgdir/$pkgname-$pkgver.tar.gz" 'trytond.install' 'trytond.service') -md5sums=('8e8925b147d7cd8ce7948fc96b9348b8' +md5sums=('1f559cc07307ace005c6034d73ae88ed' '768e68c01cb5913e36ea89c67fc98038' 'b1535a8528dfd8f655624bf6faea6985') diff --git a/pcr/ttf-montserrat/PKGBUILD b/pcr/ttf-montserrat/PKGBUILD new file mode 100644 index 000000000..1069ddb19 --- /dev/null +++ b/pcr/ttf-montserrat/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697 +# Maintainer (Arch): EEva <eeva+aur at marvid fr> +# Contributor (Arch): scolobb <scolobb at colimite fr> #THX for the mirror + +pkgname=ttf-montserrat +provides="ttf-montserrat" +pkgdesc="Gorgeous geometric font with extended latin support (Regular, Alternates, Subrayada)" +url="http://montserrat.zkysky.com.ar/en" +pkgver=1.0 +pkgrel=1 +arch=('i686' 'x86_64') +license=('SIL Open Font') +depends= +install=ttf.install +makedepends= +#source=('http://colimite.fr/aur-mirrors/Montserrat.tar.gz') #BACKUP +source=('http://marvid.fr/~eeva/mirror/Montserrat.tar.gz') +sha512sums=('1d36ad8eb439ee2a2eee405bab2535cdf1e798e10d2e1ad93e86abb93656033d9136bda0482fd0d0f1a41473aca2078f5969a1385cdafa4ac7f667ef54f1e30e') + +package() { + cd ${srcdir}/Montserrat-fontfamily + + install -Dm644 OFL.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" + + mkdir -p ${pkgdir}/usr/share/fonts/TTF + install -m644 Montserrat-Black.ttf "${pkgdir}/usr/share/fonts/TTF/Montserrat-Black.ttf" + install -m644 Montserrat-Bold.ttf "${pkgdir}/usr/share/fonts/TTF/Montserrat-Bold.ttf" + install -m644 Montserrat-Light.ttf "${pkgdir}/usr/share/fonts/TTF/Montserrat-Light.ttf" + install -m644 Montserrat-Regular.ttf "${pkgdir}/usr/share/fonts/TTF/Montserrat-Regular.ttf" + install -m644 Montserrat-Thin.ttf "${pkgdir}/usr/share/fonts/TTF/Montserrat-Thin.ttf" + install -m644 MontserratAlternates-Bold.ttf "${pkgdir}/usr/share/fonts/TTF/MontserratAlternates-Bold.ttf" + install -m644 MontserratAlternates-Regular.ttf "${pkgdir}/usr/share/fonts/TTF/MontserratAlternates-Regular.ttf" + install -m644 MontserratSubrayada-Bold.ttf "${pkgdir}/usr/share/fonts/TTF/MontserratSubrayada-Bold.ttf" + install -m644 MontserratSubrayada-Regular.ttf "${pkgdir}/usr/share/fonts/TTF/MontserratSubrayada-Regular.ttf" +}
\ No newline at end of file diff --git a/pcr/ttf-montserrat/ttf.install b/pcr/ttf-montserrat/ttf.install new file mode 100644 index 000000000..1df944e73 --- /dev/null +++ b/pcr/ttf-montserrat/ttf.install @@ -0,0 +1,15 @@ +post_install() { + echo -n "Updating font cache... " + fc-cache -sf > /dev/null + mkfontscale usr/share/fonts/TTF + mkfontdir usr/share/fonts/TTF + echo "done." +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +}
\ No newline at end of file diff --git a/pcr/twinkle/PKGBUILD b/pcr/twinkle/PKGBUILD deleted file mode 100644 index 24fd5e231..000000000 --- a/pcr/twinkle/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 68598 2012-03-29 08:03:13Z arodseth $ -# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor (Arch): Jeff Mickey <jeff@archlinux.org> -# Contributor (Arch): Alexander Baldeck <alexander@archlinux.org> -# Contributor (Arch): Federico Quagliata (quaqo) <quaqo@despammed.com> -# Contributor (Arch): Alexander Rødseth <rodseth@gmail.com> - -pkgname=twinkle -pkgver=1.4.2 -pkgrel=21 -pkgdesc="Softphone for voice over IP and IM communication using SIP" -arch=('x86_64' 'i686') -url="http://www.twinklephone.com/" -license=('GPL') -depends=('file' 'speex' 'boost-libs' 'libsndfile' 'qt3' 'libzrtpcpp' -'commoncpp2' 'libxml2') -makedepends=('pkg-config' 'boost') -source=("http://www.xs4all.nl/~mfnboer/$pkgname/download/$pkgname-$pkgver.tar.gz" - twinkle-1.4.2-ccrtp.patch) -md5sums=('d70c8972f296ffd998c7fb698774705b' - '934f59ff60a8ae29a152feb8bf131ae2') - -build() { - cd "$srcdir" - patch -p0 < ./twinkle-1.4.2-ccrtp.patch || return 1 - - cd "$pkgname-$pkgver" - aclocal - autoconf - automake -a - export QTDIR=/usr/lib/qt3 - export PATH=$QTDIR/bin:$PATH - CPPFLAGS="$CPPFLAGS -I/usr/include/qt3 -I/usr/include/libzrtpcpp/" \ - ./configure --prefix=/usr \ - --without-kde \ - --with-speex \ - --without-ilbc \ - --mandir=/usr/share/man - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - install -Dm644 "$pkgdir/usr/share/twinkle/twinkle48.png" \ - "$pkgdir/usr/share/pixmaps/twinkle.png" - install -Dm644 twinkle.desktop \ - "$pkgdir/usr/share/applications/twinkle.desktop" -} diff --git a/pcr/twinkle/twinkle-1.4.2-ccrtp.patch b/pcr/twinkle/twinkle-1.4.2-ccrtp.patch deleted file mode 100644 index fdb5f6260..000000000 --- a/pcr/twinkle/twinkle-1.4.2-ccrtp.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -pruN twinkle-1.4.2-o/configure.in twinkle-1.4.2/configure.in ---- twinkle-1.4.2-o/configure.in 2009-02-24 11:49:20.000000000 -0800 -+++ twinkle-1.4.2/configure.in 2012-05-19 09:20:51.151778516 -0700 -@@ -66,7 +66,7 @@ fi - - export PKG_CONFIG_PATH - --PKG_CHECK_MODULES(CCRTP, libccrtp1 >= 1.6.0) -+PKG_CHECK_MODULES(CCRTP, libccrtp >= 2.0.0) - - PKG_CHECK_MODULES(XML2, libxml-2.0) - # AC_CHECK_HEADER(libxml/tree.h, [], -diff -pruN twinkle-1.4.2-o/src/log.cpp twinkle-1.4.2/src/log.cpp ---- twinkle-1.4.2-o/src/log.cpp 2009-01-18 06:35:28.000000000 -0800 -+++ twinkle-1.4.2/src/log.cpp 2012-05-19 09:21:11.071594114 -0700 -@@ -161,7 +161,7 @@ void t_log::write_header(const string &f - - gettimeofday(&t, NULL); - date = t.tv_sec; -- localtime_r(&date, &tm); -+ ::localtime_r(&date, &tm); - - *log_stream << "+++ "; - *log_stream << tm.tm_mday; diff --git a/pcr/xf86-video-qxl/PKGBUILD b/pcr/xf86-video-qxl/PKGBUILD index 2ad0842ca..2f2d6c6ba 100644 --- a/pcr/xf86-video-qxl/PKGBUILD +++ b/pcr/xf86-video-qxl/PKGBUILD @@ -1,30 +1,44 @@ -# Contributor (Arch): Christian Hesse <mail@eworm.de> +# Maintainer (Arch): Christian Hesse <mail@eworm.de> # Contributor (Arch): Yonathan Dossow # Contributor (Arch): Ansgar Taflinski <ataflinski@uni-koblenz.de> -# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=xf86-video-qxl pkgver=0.1.4 -pkgrel=1 +pkgrel=3.1 pkgdesc='Xorg X11 qxl video driver' arch=('x86_64' 'i686') url='http://www.x.org' license=('MIT') groups=('xorg-drivers') -depends=('xf86dgaproto' 'xproto' 'fontsproto' 'randrproto' 'renderproto' 'videoproto' 'resourceproto' 'scrnsaverproto' 'spice') +depends=('spice') optdepends=('python2: for Xspice') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19' 'spice-protocol') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19' 'spice-protocol' + 'xf86dgaproto' 'xproto' 'fontsproto' 'randrproto' 'renderproto' + 'videoproto' 'resourceproto' 'scrnsaverproto') conflicts=('xf86-video-qxl-git' 'X-ABI-VIDEODRV_VERSION<19' 'X-ABI-VIDEODRV_VERSION>=20') -source=("http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2" +validpgpkeys=('94A9F75661F77A6168649B23A9D8C21429AC6C82') +source=("http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2"{,.sig} 'fix-cast.patch') +sha256sums=('e57ad22f0b1daf8979e722be0cc38d351bfcc2e41568edc566d2bade5a621105' + 'SKIP' + '30b09971562d82b5bc9dc26e43514ff38e5eaa680c15471194f07c9129e1e0ed') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}/" + # fix cast from pointer to integer of different size patch -Np1 < "${srcdir}/fix-cast.patch" + + # this is python 2.x sed -i '1c #!/usr/bin/python2' scripts/Xspice +} - ./configure --enable-xspice \ +build() { + cd "${srcdir}/${pkgname}-${pkgver}/" + + ./configure \ + --enable-xspice \ --prefix=/usr make } @@ -35,5 +49,3 @@ package() { make DESTDIR="${pkgdir}/" install } -sha256sums=('e57ad22f0b1daf8979e722be0cc38d351bfcc2e41568edc566d2bade5a621105' - '575243334f763c21282eccd7bd4eb713b90e96fdd46a882370925fa20d4acb70') diff --git a/pcr/xf86-video-qxl/fix-cast.patch b/pcr/xf86-video-qxl/fix-cast.patch index e51beec29..55f281f14 100644 --- a/pcr/xf86-video-qxl/fix-cast.patch +++ b/pcr/xf86-video-qxl/fix-cast.patch @@ -1,14 +1,5 @@ -From d17fd8b7b503fd5d247fe75432ad192414fa2bdd Mon Sep 17 00:00:00 2001 -From: Christian Hesse <mail@eworm.de> -Date: Tue, 7 Jan 2014 08:16:48 +0100 -Subject: [PATCH 1/1] fix cast - ---- - src/spiceqxl_display.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - diff --git a/src/spiceqxl_display.c b/src/spiceqxl_display.c -index a3a8978..7646efc 100644 +index a3a8978..748c2db 100644 --- a/src/spiceqxl_display.c +++ b/src/spiceqxl_display.c @@ -350,6 +350,6 @@ void qxl_add_spice_display_interface(qxl_screen_t *qxl) @@ -16,10 +7,6 @@ index a3a8978..7646efc 100644 void spiceqxl_display_monitors_config(qxl_screen_t *qxl) { - spice_qxl_monitors_config_async(&qxl->display_sin, (QXLPHYSICAL)qxl->monitors_config, -- MEMSLOT_GROUP, 0); -+ spice_qxl_monitors_config_async(&qxl->display_sin, -+ (QXLPHYSICAL)(uintptr_t)qxl->monitors_config, MEMSLOT_GROUP, 0); ++ spice_qxl_monitors_config_async(&qxl->display_sin, qxl->monitors_config, + MEMSLOT_GROUP, 0); } --- -1.8.5.2 - diff --git a/pcr/xfce-theme-greybird/PKGBUILD b/pcr/xfce-theme-greybird/PKGBUILD index ab153657a..f780a0de1 100644 --- a/pcr/xfce-theme-greybird/PKGBUILD +++ b/pcr/xfce-theme-greybird/PKGBUILD @@ -16,9 +16,9 @@ pkgname=xfce-theme-greybird _pkgname=Greybird -pkgver=1.6 -pkgrel=0 -pkgdesc="A grey and blue Xfce theme, used by default in Xubuntu 12.04" +pkgver=1.6.1 +pkgrel=1 +pkgdesc="A grey and blue Xfce theme" arch=(any) url=http://shimmerproject.org/projects/greybird/ license=(CCPL:by-sa-3.0 GPL) @@ -32,7 +32,7 @@ optdepends=('elementary-xfce-icons: matching icon set; use the dark icon theme' 'lib32-gtk-engine-murrine: required for multilib') conflicts=($pkgname-git) source=($pkgname-$pkgver.tar.gz::https://github.com/shimmerproject/$_pkgname/archive/v$pkgver.tar.gz) -sha512sums=('3a68d8c76998db5a25060185c7e5707b3b653f8b50883d38c66b7bdfc2dd4fdfd69537cc0a2bc86c8784815a4fcc877735f78562b80ee89f63e4311e7183f0d2') +sha512sums=('aa24688505567f31f62f830afd9fbcd2418571fd5a90e61dc71b6f3416352d3f549e2c5054ec8ecd20e83596b255ef262eccfcfc04761ac9dfab6323e3f6a383') diff --git a/pcr/yencode/PKGBUILD b/pcr/yencode/PKGBUILD new file mode 100644 index 000000000..50226a8e3 --- /dev/null +++ b/pcr/yencode/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697 + +pkgname=yencode +pkgver=0.46 +pkgrel=1 +pkgdesc="Powerful encoder/decoder for the Usenet yEnc file format. Features include easy configuration, internationalization, memory efficiency, and an intelligent decoder capable of finding and decoding input files, including out-of-order files." +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/yencode/" +license=('GPL2') +makedepends=('gcc') +source=("https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") +sha512sums=('5883ec76f2ef3b857f09c79c63f47e2a1cf0354dbc06ff11cafecfda1112c638283ea3a987f906286ccc9dbe9d57f5f35b06ec1c3404dfc46465e722410d34a8') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc --sbindir=/usr/bin + make +} + +package() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc --sbindir=/usr/bin + make DESTDIR="$pkgdir/" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +}
\ No newline at end of file diff --git a/pcr/zfs-utils-git/PKGBUILD b/pcr/zfs-utils-git/PKGBUILD new file mode 100644 index 000000000..dc032e2c5 --- /dev/null +++ b/pcr/zfs-utils-git/PKGBUILD @@ -0,0 +1,64 @@ +# Maintainer (Arch): Jesus Alvarez <jeezusjr at gmail dot com> +# Contributor (Arch): Kyle Fuller <inbox at kylefuller dot co dot uk> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> +# +# This PKGBUILD was generated by the archzfs build scripts located at +# +# http://github.com/demizer/archzfs +# +# The build script generates and updates the pkgver and _kernel* variables. +# +pkgname="zfs-utils-git" +pkgver=0.6.4.2_r0_g44b5ec8_4.1.6_1 +pkgrel=1 +license=('CDDL') +pkgdesc="Kernel module support files for the Zettabyte File System." +depends=("spl-git") +makedepends=("git") +arch=("i686" "x86_64") +url="http://zfsonlinux.org/" +source=("git+https://github.com/zfsonlinux/zfs.git#commit=44b5ec8f" + "zfs-utils.bash-completion-r1" + "zfs-utils.initcpio.install" + "zfs-utils.initcpio.hook") +groups=("archzfs-git") +md5sums=('SKIP' + '9ddb0c8a94861f929d0fa741fdc49950' + '9ef4841abb85dee611828cc7e6f5c6fe' + '62ba32c6853c315ff231c396cf8bfdbb') +replaces=("zfs-utils") +provides=("zfs-utils") +conflicts=("zfs-utils" "zfs-utils-lts") + +build() { + cd "${srcdir}/zfs" + ./autogen.sh + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --sbindir=/usr/bin \ + --libdir=/usr/lib \ + --datadir=/usr/share \ + --includedir=/usr/include \ + --with-udevdir=/lib/udev \ + --libexecdir=/usr/lib/zfs \ + --with-config=user + make +} + +package() { + cd "${srcdir}/zfs" + make DESTDIR="${pkgdir}" install + + # Remove uneeded files + rm -r "${pkgdir}"/etc/init.d + rm -r "${pkgdir}"/usr/lib/dracut + + # move module tree /lib -> /usr/lib + cp -r "${pkgdir}"/{lib,usr} + rm -r "${pkgdir}"/lib + + install -D -m644 "${srcdir}"/zfs-utils.initcpio.hook "${pkgdir}"/usr/lib/initcpio/hooks/zfs + install -D -m644 "${srcdir}"/zfs-utils.initcpio.install "${pkgdir}"/usr/lib/initcpio/install/zfs + install -D -m644 "${srcdir}"/zfs-utils.bash-completion-r1 "${pkgdir}"/usr/share/bash-completion/completions/zfs +} diff --git a/pcr/zfs-utils-git/zfs-utils.bash-completion-r1 b/pcr/zfs-utils-git/zfs-utils.bash-completion-r1 new file mode 100644 index 000000000..b1aded368 --- /dev/null +++ b/pcr/zfs-utils-git/zfs-utils.bash-completion-r1 @@ -0,0 +1,391 @@ +# Copyright (c) 2013, Aneurin Price <aneurin.price@gmail.com> + +# Permission is hereby granted, free of charge, to any person +# obtaining a copy of this software and associated documentation +# files (the "Software"), to deal in the Software without +# restriction, including without limitation the rights to use, +# copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following +# conditions: + +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +# OTHER DEALINGS IN THE SOFTWARE. + +#if [[ -w /dev/zfs ]]; then + __ZFS_CMD="zfs" + __ZPOOL_CMD="zpool" +#else +# __ZFS_CMD="sudo zfs" +# __ZPOOL_CMD="sudo zpool" +#fi + +__zfs_get_commands() +{ + $__ZFS_CMD 2>&1 | awk '/^\t[a-z]/ {print $1}' | cut -f1 -d '|' | uniq +} + +__zfs_get_properties() +{ + $__ZFS_CMD get 2>&1 | awk '$2 == "YES" || $2 == "NO" {print $1}'; echo all name space +} + +__zfs_get_editable_properties() +{ + $__ZFS_CMD get 2>&1 | awk '$2 == "YES" {print $1"="}' +} + +__zfs_get_inheritable_properties() +{ + $__ZFS_CMD get 2>&1 | awk '$3 == "YES" {print $1}' +} + +__zfs_list_datasets() +{ + $__ZFS_CMD list -H -o name -t filesystem,volume +} + +__zfs_list_filesystems() +{ + $__ZFS_CMD list -H -o name -t filesystem +} + +__zfs_match_snapshot() +{ + local base_dataset=${cur%@*} + if [[ $base_dataset != $cur ]] + then + $__ZFS_CMD list -H -o name -t snapshot -d 1 $base_dataset + else + $__ZFS_CMD list -H -o name -t filesystem,volume | awk '{print $1"@"}' + fi +} + +__zfs_match_explicit_snapshot() +{ + local base_dataset=${cur%@*} + if [[ $base_dataset != $cur ]] + then + $__ZFS_CMD list -H -o name -t snapshot -d 1 $base_dataset + fi +} + +__zfs_match_multiple_snapshots() +{ + local existing_opts=$(expr "$cur" : '\(.*\)[%,]') + if [[ $existing_opts ]] + then + local base_dataset=${cur%@*} + if [[ $base_dataset != $cur ]] + then + local cur=${cur##*,} + if [[ $cur =~ ^%|%.*% ]] + then + # correct range syntax is start%end + return 1 + fi + local range_start=$(expr "$cur" : '\(.*%\)') + $__ZFS_CMD list -H -o name -t snapshot -d 1 $base_dataset | sed 's$.*@$'$range_start'$g' + fi + else + __zfs_match_explicit_snapshot; __zfs_list_datasets + fi +} + +__zfs_list_volumes() +{ + $__ZFS_CMD list -H -o name -t volume +} + +__zfs_argument_chosen() +{ + local word property + for word in $(seq $((COMP_CWORD-1)) -1 2) + do + local prev="${COMP_WORDS[$word]}" + if [[ ${COMP_WORDS[$word-1]} != -[tos] ]] + then + if [[ "$prev" == [^,]*,* ]] || [[ "$prev" == *[@:]* ]] + then + return 0 + fi + for property in $@ + do + if [[ $prev == "$property" ]] + then + return 0 + fi + done + fi + done + return 1 +} + +__zfs_complete_ordered_arguments() +{ + local list1=$1 + local list2=$2 + local cur=$3 + local extra=$4 + if __zfs_argument_chosen $list1 + then + COMPREPLY=($(compgen -W "$list2 $extra" -- "$cur")) + else + COMPREPLY=($(compgen -W "$list1 $extra" -- "$cur")) + fi +} + +__zfs_complete_multiple_options() +{ + local options=$1 + local cur=$2 + + COMPREPLY=($(compgen -W "$options" -- "${cur##*,}")) + local existing_opts=$(expr "$cur" : '\(.*,\)') + if [[ $existing_opts ]] + then + COMPREPLY=( "${COMPREPLY[@]/#/${existing_opts}}" ) + fi +} + +__zfs_complete_switch() +{ + local options=$1 + if [[ ${cur:0:1} == - ]] + then + COMPREPLY=($(compgen -W "-{$options}" -- "$cur")) + return 0 + else + return 1 + fi +} + +__zfs_complete() +{ + local cur prev cmd cmds + COMPREPLY=() + # Don't split on colon + _get_comp_words_by_ref -n : -c cur -p prev -w COMP_WORDS -i COMP_CWORD + cmd="${COMP_WORDS[1]}" + + if [[ ${prev##*/} == zfs ]] + then + cmds=$(__zfs_get_commands) + COMPREPLY=($(compgen -W "$cmds -?" -- "$cur")) + return 0 + fi + + case "${cmd}" in + clone) + case "${prev}" in + -o) + COMPREPLY=($(compgen -W "$(__zfs_get_editable_properties)" -- "$cur")) + ;; + *) + if ! __zfs_complete_switch "o,p" + then + if __zfs_argument_chosen + then + COMPREPLY=($(compgen -W "$(__zfs_list_datasets)" -- "$cur")) + else + COMPREPLY=($(compgen -W "$(__zfs_match_snapshot)" -- "$cur")) + fi + fi + ;; + esac + ;; + get) + case "${prev}" in + -d) + COMPREPLY=($(compgen -W "" -- "$cur")) + ;; + -t) + __zfs_complete_multiple_options "filesystem volume snapshot all" "$cur" + ;; + -s) + __zfs_complete_multiple_options "local default inherited temporary none" "$cur" + ;; + -o) + __zfs_complete_multiple_options "name property value source received all" "$cur" + ;; + *) + if ! __zfs_complete_switch "H,r,p,d,o,t,s" + then + if __zfs_argument_chosen $(__zfs_get_properties) + then + COMPREPLY=($(compgen -W "$(__zfs_match_explicit_snapshot) $(__zfs_list_datasets)" -- "$cur")) + else + __zfs_complete_multiple_options "$(__zfs_get_properties)" "$cur" + fi + fi + ;; + esac + ;; + inherit) + if ! __zfs_complete_switch "r" + then + __zfs_complete_ordered_arguments "$(__zfs_get_inheritable_properties)" "$(__zfs_match_explicit_snapshot) $(__zfs_list_datasets)" $cur + fi + ;; + list) + case "${prev}" in + -d) + COMPREPLY=($(compgen -W "" -- "$cur")) + ;; + -t) + __zfs_complete_multiple_options "filesystem volume snapshot all" "$cur" + ;; + -o) + __zfs_complete_multiple_options "$(__zfs_get_properties)" "$cur" + ;; + -s|-S) + COMPREPLY=($(compgen -W "$(__zfs_get_properties)" -- "$cur")) + ;; + *) + if ! __zfs_complete_switch "H,r,d,o,t,s,S" + then + COMPREPLY=($(compgen -W "$(__zfs_match_explicit_snapshot) $(__zfs_list_datasets)" -- "$cur")) + fi + ;; + esac + ;; + promote) + COMPREPLY=($(compgen -W "$(__zfs_list_filesystems)" -- "$cur")) + ;; + rollback) + if ! __zfs_complete_switch "r,R,f" + then + COMPREPLY=($(compgen -W "$(__zfs_match_snapshot)" -- "$cur")) + fi + ;; + send) + if ! __zfs_complete_switch "d,n,P,p,R,v,i,I" + then + COMPREPLY=($(compgen -W "$(__zfs_match_snapshot)" -- "$cur")) + fi + ;; + snapshot) + case "${prev}" in + -o) + COMPREPLY=($(compgen -W "$(__zfs_get_editable_properties)" -- "$cur")) + ;; + *) + if ! __zfs_complete_switch "o,r" + then + COMPREPLY=($(compgen -W "$(__zfs_list_datasets | awk '{print $1"@"}')" -- "$cur")) + fi + ;; + esac + ;; + set) + __zfs_complete_ordered_arguments "$(__zfs_get_editable_properties)" "$(__zfs_match_explicit_snapshot) $(__zfs_list_datasets)" $cur + ;; + upgrade) + case "${prev}" in + -a|-V|-v) + COMPREPLY=($(compgen -W "" -- "$cur")) + ;; + *) + if ! __zfs_complete_switch "a,V,v,r" + then + COMPREPLY=($(compgen -W "$(__zfs_list_filesystems)" -- "$cur")) + fi + ;; + esac + ;; + destroy) + if ! __zfs_complete_switch "d,f,n,p,R,r,v" + then + __zfs_complete_multiple_options "$(__zfs_match_multiple_snapshots)" $cur + fi + ;; + *) + COMPREPLY=($(compgen -W "$(__zfs_match_explicit_snapshot) $(__zfs_list_datasets)" -- "$cur")) + ;; + esac + __ltrim_colon_completions "$cur" + return 0 +} + +__zpool_get_commands() +{ + $__ZPOOL_CMD 2>&1 | awk '/^\t[a-z]/ {print $1}' | uniq +} + +__zpool_get_properties() +{ + $__ZPOOL_CMD get 2>&1 | awk '$2 == "YES" || $2 == "NO" {print $1}'; echo all +} + +__zpool_get_editable_properties() +{ + $__ZPOOL_CMD get 2>&1 | awk '$2 == "YES" {print $1"="}' +} + +__zpool_list_pools() +{ + $__ZPOOL_CMD list -H -o name +} + +__zpool_complete() +{ + local cur prev cmd cmds + COMPREPLY=() + cur="${COMP_WORDS[COMP_CWORD]}" + prev="${COMP_WORDS[COMP_CWORD-1]}" + cmd="${COMP_WORDS[1]}" + + if [[ ${prev##*/} == zpool ]] + then + cmds=$(__zpool_get_commands) + COMPREPLY=($(compgen -W "$cmds" -- "$cur")) + return 0 + fi + + case "${cmd}" in + get) + __zfs_complete_ordered_arguments "$(__zpool_get_properties)" "$(__zpool_list_pools)" $cur + return 0 + ;; + import) + if [[ $prev == -d ]] + then + _filedir -d + else + COMPREPLY=($(compgen -W "$(__zpool_list_pools) -d" -- "$cur")) + fi + return 0 + ;; + set) + __zfs_complete_ordered_arguments "$(__zpool_get_editable_properties)" "$(__zpool_list_pools)" $cur + return 0 + ;; + add|attach|clear|create|detach|offline|online|remove|replace) + local pools="$(__zpool_list_pools)" + if __zfs_argument_chosen $pools + then + _filedir + else + COMPREPLY=($(compgen -W "$pools" -- "$cur")) + fi + return 0 + ;; + *) + COMPREPLY=($(compgen -W "$(__zpool_list_pools)" -- "$cur")) + return 0 + ;; + esac + +} + +complete -F __zfs_complete zfs +complete -F __zpool_complete zpool diff --git a/pcr/zfs-utils-git/zfs-utils.initcpio.hook b/pcr/zfs-utils-git/zfs-utils.initcpio.hook new file mode 100644 index 000000000..3a928944d --- /dev/null +++ b/pcr/zfs-utils-git/zfs-utils.initcpio.hook @@ -0,0 +1,100 @@ +ZPOOL_FORCE="" +ZPOOL_IMPORT_FLAGS="" + +zfs_get_bootfs () { + for zfs_dataset in $(/usr/bin/zpool list -H -o bootfs); do + case ${zfs_dataset} in + "" | "-") + # skip this line/dataset + ;; + "no pools available") + return 1 + ;; + *) + ZFS_DATASET=${zfs_dataset} + return 0 + ;; + esac + done + return 1 +} + +zfs_mount_handler () { + local node=$1 + if [ "$ZFS_DATASET" = "bootfs" ] ; then + if ! zfs_get_bootfs ; then + # Lets import everything and try again + /usr/bin/zpool import $ZPOOL_IMPORT_FLAGS -N -a $ZPOOL_FORCE + if ! zfs_get_bootfs ; then + echo "ZFS: Cannot find bootfs." + return 1 + fi + fi + fi + + local pool="${ZFS_DATASET%%/*}" + local rwopt_exp=${rwopt:-ro} + + if ! "/usr/bin/zpool" list -H $pool 2>&1 > /dev/null ; then + if [ "$rwopt_exp" != "rw" ]; then + msg "ZFS: Importing pool $pool readonly." + ZPOOL_IMPORT_FLAGS="$ZPOOL_IMPORT_FLAGS -o readonly=on" + else + msg "ZFS: Importing pool $pool." + fi + + if ! "/usr/bin/zpool" import $ZPOOL_IMPORT_FLAGS -N $pool $ZPOOL_FORCE ; then + echo "ZFS: Unable to import pool $pool." + return 1 + fi + fi + + local mountpoint=$("/usr/bin/zfs" get -H -o value mountpoint $ZFS_DATASET) + if [ "$mountpoint" = "legacy" ] ; then + mount -t zfs -o ${rwopt_exp} "$ZFS_DATASET" "$node" + else + mount -o zfsutil,${rwopt_exp} -t zfs "$ZFS_DATASET" "$node" + fi +} + +run_hook() { + # Force import the pools, useful if the pool has not properly been exported + # using 'zpool export <pool>' + [[ $zfs_force == 1 ]] && ZPOOL_FORCE='-f' + [[ "$zfs_import_dir" != "" ]] && ZPOOL_IMPORT_FLAGS="$ZPOOL_IMPORT_FLAGS -d $zfs_import_dir" + + if [ "$root" = 'zfs' ]; then + mount_handler='zfs_mount_handler' + fi + + case $zfs in + "") + # skip this line/dataset + ;; + auto|bootfs) + ZFS_DATASET='bootfs' + mount_handler="zfs_mount_handler" + ;; + *) + ZFS_DATASET=$zfs + mount_handler="zfs_mount_handler" + ;; + esac + + if [ ! -f "/etc/hostid" ] ; then + echo "ZFS: No hostid found on kernel command line or /etc/hostid. ZFS pools may not import correctly." + fi + + # Allow up to 10 seconds for zfs device to show up + for i in 1 2 3 4 5 6 7 8 9 10; do + [ -c "/dev/zfs" ] && break + sleep 1 + done +} + + +run_latehook () { + /usr/bin/zpool import -N -a $ZPOOL_FORCE +} + +# vim:set ts=4 sw=4 ft=sh et: diff --git a/pcr/zfs-utils-git/zfs-utils.initcpio.install b/pcr/zfs-utils-git/zfs-utils.initcpio.install new file mode 100644 index 000000000..c128d1006 --- /dev/null +++ b/pcr/zfs-utils-git/zfs-utils.initcpio.install @@ -0,0 +1,104 @@ +#!/bin/bash + +build() { + map add_module \ + zavl \ + znvpair \ + zunicode \ + zcommon \ + zfs \ + zpios \ + spl \ + splat \ + zlib_deflate + + map add_binary \ + arcstat.py \ + dbufstat.py \ + fsck.zfs \ + mount.zfs \ + zdb \ + zed \ + zfs \ + zhack \ + zinject \ + zpios \ + zpool \ + zstreamdump \ + ztest \ + splat \ + hostid \ + /lib/udev/vdev_id \ + /lib/udev/zvol_id + + map add_file \ + /lib/udev/rules.d/60-zvol.rules \ + /lib/udev/rules.d/69-vdev.rules \ + /lib/udev/rules.d/90-zfs.rules + + map add_dir \ + /etc/zfs/zed.d + + add_runscript + + # allow mount(8) to "autodetect" ZFS + echo 'zfs' >>"$BUILDROOT/etc/filesystems" + + [[ -f /etc/zfs/zpool.cache ]] && add_file "/etc/zfs/zpool.cache" + [[ -f /etc/modprobe.d/zfs.conf ]] && add_file "/etc/modprobe.d/zfs.conf" + [[ -f /etc/hostid ]] && add_file "/etc/hostid" +} + +help() { + cat<<HELPEOF +This hook allows you to use ZFS as your root filesystem. + +Command Line Setup: + + You can append the following arguments to your kernel parameters list. See + https://wiki.archlinux.org/index.php/Kernel_parameters for more information. + + To use ZFS as your boot filesystem: + + zfs=bootfs or zfs=auto or root=zfs + + To use a pool or dataset: + + zfs=<pool/dataset> + + To force importing of a ZFS pool: + + zfs_force=1 + + If set to 1, this will use "zpool import -f" when attempting to import + pools. + + To search for devices in a directory other than "/dev": + + zfs_import_dir=/dev/disk/by-uuid + or + zfs_import_dir=/dev/disk/by-partuuid + or + zfs_import_dir=/dev/disk/by-path + etc. + + Following initcpio convention, the 'rw' option must be specified to load the + pool as read/write. Pools are loaded as read only by default. + +Examples: + + To use bootfs on your pool, use + + zfs=bootfs rw + + This will setup your root using tank/root zfs pool. + + zfs=tank/root rw + +If you want to set properties for zfs-on-linux module, you should add them to +/etc/modprobe.d/zfs.conf and then rebuild initcpio. + +HELPEOF +} + +# vim: set ts=4 sw=4 ft=sh et: diff --git a/pcr/zpaq/LICENSE b/pcr/zpaq/LICENSE new file mode 100644 index 000000000..005cf5caa --- /dev/null +++ b/pcr/zpaq/LICENSE @@ -0,0 +1,4 @@ +I, Matt Mahoney, release this software into the public domain. This applies +worldwide. In some countries this may not be legally possible; if so: I grant +anyone the right to use this software for any purpose, without any conditions, +unless such conditions are required by law. diff --git a/pcr/zpaq/PKGBUILD b/pcr/zpaq/PKGBUILD new file mode 100644 index 000000000..5021656d1 --- /dev/null +++ b/pcr/zpaq/PKGBUILD @@ -0,0 +1,57 @@ +# Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697 +# Contributor (Arch): Marco Schulze <aur@ereski.org> +# Contributor (Arch): TuxSpirit<tuxpsiritATarchlinuxDOTfr> +# Contributor (Arch): Jan Stępień <jstepien@users.sourceforge.net> + + +pkgname=zpaq +pkgdesc='Programmable file compressor, library and utilities. Based on the PAQ compression algorithm' +url='http://mattmahoney.net/dc/zpaq.html' +pkgver=7.05 +pkgrel=1 + +_zpaq_ver=705 + +arch=(i686 x86_64) +license=(custom MIT) +makedepends=(perl) + +source=(http://mattmahoney.net/dc/zpaq${_zpaq_ver}.zip + LICENSE) +sha512sums=('1bcd22524b0433cc35ee28217eec04e1e743ec84e8ec7fe4392eb511873ff5c8571435da081de6b54a9675f206537f5d091a682383c84607905731ee132a9e66' + '7ae68096163998f926be15c16da9540fa32d052a02d73db10678d965db5dfdf7e958b2d474c509d622056cc844abceda15657f2b0b5e97f6b12cb552185748e4') + +build() +{ + cd "$srcdir" + + if [ -z "$CC" ] + then + CC=gcc + fi + if [ -z "$CXX" ] + then + CXX=g++ + fi + + msg 'Building libzpaq' + $CXX $CXXFLAGS $LDFLAGS -fPIC -shared -Dunix -DNDEBUG libzpaq.cpp -o libzpaq.so + + msg 'Building zpaq' + $CXX ${CXXFLAGS/-flto} ${LDFLAGS/-flto} -pthread -Dunix -DNDEBUG zpaq.cpp -L. -lzpaq -o zpaq + + msg 'Building man page' + pod2man zpaq.pod zpaq.1 + gzip -9 zpaq.1 +} + + +package() +{ + install -Dm 644 libzpaq.h "$pkgdir/usr/include/libzpaq.h" + install -Dm 644 libzpaq.so "$pkgdir/usr/lib/libzpaq.so" + install -Dm 755 zpaq "$pkgdir/usr/bin/zpaq" + install -Dm 644 zpaq.1.gz "$pkgdir/usr/share/man/man1/zpaq.1.gz" + install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" +} + |