From 48c7bc490b2dc9f41478d44557dd60c6ae2d241d Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Thu, 13 Aug 2015 12:46:27 -0300 Subject: entr: Run arbitrary commands when files change --- pcr/entr/PKGBUILD | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 pcr/entr/PKGBUILD diff --git a/pcr/entr/PKGBUILD b/pcr/entr/PKGBUILD new file mode 100644 index 000000000..6a7dd72e8 --- /dev/null +++ b/pcr/entr/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: Veeti Paananen +pkgname=entr +pkgver=3.2 +pkgrel=1 +pkgdesc="Run arbitrary commands when files change" +arch=('i686' 'x86_64' 'armv7h' 'armv6h') +url="http://entrproject.org/" +license=('custom:ISC', 'custom:BSD2') +depends=('glibc') +source=("http://entrproject.org/code/entr-$pkgver.tar.gz") +sha256sums=('b1eee00afbeccf03010c1c557436854be6aaf0ef9b72ab8d44b94affdd7d7146') + +# bad tar +_srcdir='eradman-entr-c20e34ec153a' + +build() { + cd "$srcdir/$_srcdir" + + ./configure + make +} + +check() { + cd "$srcdir/$_srcdir" + + make -k test +} + +package() { + cd "$srcdir/$_srcdir" + + make PREFIX="$pkgdir/usr" install + install -D -m 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} -- cgit v1.2.3 From a5b5bdbe0ab85e4d379d690e6a46d3434d84bb1f Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 21 Aug 2015 17:03:41 -0300 Subject: navit: add new package to [pcr] -> https://labs.parabola.nu/issues/759 --- pcr/navit/PKGBUILD | 42 +++++++++++++++++++++++++++++++++++++++ pcr/navit/freetype2_include.patch | 24 ++++++++++++++++++++++ pcr/navit/navit.install | 11 ++++++++++ 3 files changed, 77 insertions(+) create mode 100644 pcr/navit/PKGBUILD create mode 100644 pcr/navit/freetype2_include.patch create mode 100644 pcr/navit/navit.install 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 +# Contributor (Arch): György Balló +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 + #endif + #endif +-#include ++#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 + #include + #include FT_FREETYPE_H +-#include ++#include FT_GLYPH_H + #endif + #include + 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 +} -- cgit v1.2.3 From 53701b2cb9e9b1f61ac551926a2f64949789d2cb Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 21 Aug 2015 17:11:15 -0300 Subject: gws: add new package to [pcr] -> https://labs.parabola.nu/issues/785 --- pcr/gws/ChangeLog | 40 ++++++++++++++++++++++++++++++++++++++++ pcr/gws/PKGBUILD | 23 +++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 pcr/gws/ChangeLog create mode 100644 pcr/gws/PKGBUILD 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 + + * 0.1.7-1: + New upstream release + +2015-02-12 Fabien Dubosson + + * 0.1.5-1: + New upstream release + +2014-05-11 Fabien Dubosson + + * 0.1.4-1: + New upstream release + +2014-02-04 Fabien Dubosson + + * 0.1.3-3: + Uniformalize PKGBUILD notations + +2014-01-20 Fabien Dubosson + + * 0.1.3-2: + Patch minor bug, already patched upstream for future version + +2014-01-20 Fabien Dubosson + + * 0.1.3-1: + New upstream release + +2014-01-13 Fabien Dubosson + + * 0.1.2-1 : + New upstream release + +2014-01-09 Fabien Dubosson + + * 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 + +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: -- cgit v1.2.3 From 7669a3decb8d8ff23ae379d61f1d3236d191bdaa Mon Sep 17 00:00:00 2001 From: Gaming4JC Date: Fri, 21 Aug 2015 22:35:30 -0400 Subject: updating firejail --- pcr/firejail/001-addmoresecurity-firefox.patch | 34 +++++++++++++++++++++++++ pcr/firejail/PKGBUILD | 26 +++++++++++-------- pcr/firejail/PKGBUILD.sig | Bin 543 -> 543 bytes 3 files changed, 49 insertions(+), 11 deletions(-) create mode 100644 pcr/firejail/001-addmoresecurity-firefox.patch diff --git a/pcr/firejail/001-addmoresecurity-firefox.patch b/pcr/firejail/001-addmoresecurity-firefox.patch new file mode 100644 index 000000000..0b8d764be --- /dev/null +++ b/pcr/firejail/001-addmoresecurity-firefox.patch @@ -0,0 +1,34 @@ +*** 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}/.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..6475537ff 100644 --- a/pcr/firejail/PKGBUILD +++ b/pcr/firejail/PKGBUILD @@ -3,30 +3,34 @@ pkgname=firejail pkgver=0.9.28 -pkgrel=1 +pkgrel=2 pkgdesc="Linux namespaces sandbox program" -arch=(i686 x86_64) +arch=('i686' 'x86_64') 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') validpgpkeys=('CB6E213A349B8DF9E96B622AC3F4FFCF3EAE8697') # PKGBUILD Maintainer's key -sha512sums=('11343f51e1985483896a65dc21c4d9f82fe863649b817bab3cf748a198f67687114966558abb6029e0055984ce59262022f33a9bf74ba27ed2425592b32e5432' +sha512sums=('a0c6715cbaf1043f2ea92b33da5884b6ed0993b3e5d03a3edd181b6663a696a2a60a44e0ad39fc9fcfd50d79eb5acb2f0f33452467bf50912f558ec23ebfc125' + 'SKIP' + 'SKIP' + '09b42aa186b02fe59682e6c98c41a486a616b2e36f3a9daad2d778e7e30d0f89f2e29724d52981aa9b203c80412312b6dbe6748c1edd36accf95752d90cc4231') +whirlpoolsums=('84792b384d4e578347a859354d5639be24c3b370c3c6c07d245bbd35b7d6adcac8f5f382e92dec55a3a53cc68ea00fb7071be01aa390b37df5e0768f00efd90e' 'SKIP' -'SKIP') -whirlpoolsums=('02f9c641e91b4959383f3d61e03cc467a85f5bd7bdec52b137c061cec144573f7f3ecab47fa390aac6f497423fdac3adfd992e2851b32f9435c0e746fba730ca' 'SKIP' -'SKIP') +'a79506048c95d5dc6a3e3676075cf931c6c83c5a028e303e211efa9c5926aa186eab21770cdbbfde3419b401c88ab4816f6e7d9d42feb09c5d2d0c29a4c07c94') 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 } build() { - cd "${srcdir}/${pkgname}-${pkgver}-rc1" + cd "${srcdir}/${pkgname}-${pkgver}" # fix build export CFLAGS=${CFLAGS/-fsanitize=undefined/} ./configure --prefix=/usr @@ -34,6 +38,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 index 3704c880c..701949cb7 100644 Binary files a/pcr/firejail/PKGBUILD.sig and b/pcr/firejail/PKGBUILD.sig differ -- cgit v1.2.3 From 9b3019e41ca1f902cdbcab0adfe6d8336103d171 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Sat, 22 Aug 2015 09:40:09 -0500 Subject: mosquitto-1.4.3-1: updating version --- pcr/mosquitto/PKGBUILD | 6 +++--- pcr/mosquitto/mosquitto.install | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) 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 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() { -- cgit v1.2.3 From b5a242b4868afa0421058a6dbe0fa0b2053d8fb1 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Sat, 22 Aug 2015 16:39:47 -0500 Subject: Removing twinkle: Missing and deprecated dependencies --- pcr/twinkle/PKGBUILD | 50 ----------------------------------- pcr/twinkle/twinkle-1.4.2-ccrtp.patch | 24 ----------------- 2 files changed, 74 deletions(-) delete mode 100644 pcr/twinkle/PKGBUILD delete mode 100644 pcr/twinkle/twinkle-1.4.2-ccrtp.patch 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 -# Contributor (Arch): Jeff Mickey -# Contributor (Arch): Alexander Baldeck -# Contributor (Arch): Federico Quagliata (quaqo) -# Contributor (Arch): Alexander Rødseth - -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; -- cgit v1.2.3 From 0ed10c70d100fa9a4159b949a80c0425f39abb3c Mon Sep 17 00:00:00 2001 From: Gaming4JC Date: Sat, 22 Aug 2015 22:32:45 -0400 Subject: updating tahoe-lafs to latest version --- pcr/tahoe-lafs/PKGBUILD | 10 +++++----- pcr/tahoe-lafs/PKGBUILD.sig | Bin 543 -> 543 bytes 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pcr/tahoe-lafs/PKGBUILD b/pcr/tahoe-lafs/PKGBUILD index 6a09409ae..699cb45fa 100644 --- a/pcr/tahoe-lafs/PKGBUILD +++ b/pcr/tahoe-lafs/PKGBUILD @@ -5,7 +5,7 @@ # Contributor (Arch): Nicolas Pouillard 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' @@ -42,20 +42,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 index 6a3f954a5..7e96e02f6 100644 Binary files a/pcr/tahoe-lafs/PKGBUILD.sig and b/pcr/tahoe-lafs/PKGBUILD.sig differ -- cgit v1.2.3 From dde922714e32ed8a5e546bc0a4a6d9e73e8eb737 Mon Sep 17 00:00:00 2001 From: Gaming4JC Date: Sun, 23 Aug 2015 09:50:53 -0400 Subject: tahoe-lafs adjustment --- pcr/tahoe-lafs/PKGBUILD | 5 ++--- pcr/tahoe-lafs/PKGBUILD.sig | Bin 543 -> 543 bytes 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pcr/tahoe-lafs/PKGBUILD b/pcr/tahoe-lafs/PKGBUILD index 699cb45fa..bd1da4931 100644 --- a/pcr/tahoe-lafs/PKGBUILD +++ b/pcr/tahoe-lafs/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: Luke R. GPG: rsa4096/3EAE8697 -# Contributor (Arch): Skydrome +# Contributor (Arch) : Skydrome # Contributor (Arch): DaNiMoTh # Contributor (Arch): Peter Simons # Contributor (Arch): Nicolas Pouillard @@ -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' diff --git a/pcr/tahoe-lafs/PKGBUILD.sig b/pcr/tahoe-lafs/PKGBUILD.sig index 7e96e02f6..c84c3df9a 100644 Binary files a/pcr/tahoe-lafs/PKGBUILD.sig and b/pcr/tahoe-lafs/PKGBUILD.sig differ -- cgit v1.2.3 From d8b68c90300b1b63075c6097f983eb95d2dc55eb Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Sun, 23 Aug 2015 22:25:37 -0300 Subject: pcr/reicast{,-multilib}-git --- pcr/reicast-git/PKGBUILD | 27 +- pcr/reicast-git/enable_joystick_support.patch | 346 --------------------- pcr/reicast-git/enable_joystick_support_old.patch | 346 +++++++++++++++++++++ pcr/reicast-git/enable_x11_keyboard_support.patch | 233 ++++++++++++++ .../wait_if_two_frames_already_in_flight.patch | 47 +-- .../wait_if_two_frames_already_in_flight_old.patch | 70 +++++ pcr/reicast-multilib-git/PKGBUILD | 20 +- .../enable_joystick_support.patch | 346 --------------------- .../enable_joystick_support_old.patch | 346 +++++++++++++++++++++ .../enable_x11_keyboard_support.patch | 233 ++++++++++++++ .../wait_if_two_frames_already_in_flight.patch | 47 +-- .../wait_if_two_frames_already_in_flight_old.patch | 70 +++++ 12 files changed, 1350 insertions(+), 781 deletions(-) delete mode 100644 pcr/reicast-git/enable_joystick_support.patch create mode 100644 pcr/reicast-git/enable_joystick_support_old.patch create mode 100644 pcr/reicast-git/enable_x11_keyboard_support.patch create mode 100644 pcr/reicast-git/wait_if_two_frames_already_in_flight_old.patch delete mode 100644 pcr/reicast-multilib-git/enable_joystick_support.patch create mode 100644 pcr/reicast-multilib-git/enable_joystick_support_old.patch create mode 100644 pcr/reicast-multilib-git/enable_x11_keyboard_support.patch create mode 100644 pcr/reicast-multilib-git/wait_if_two_frames_already_in_flight_old.patch diff --git a/pcr/reicast-git/PKGBUILD b/pcr/reicast-git/PKGBUILD index e10d00c34..ddd9099e1 100644 --- a/pcr/reicast-git/PKGBUILD +++ b/pcr/reicast-git/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: Márcio Silva pkgname=reicast-git -pkgver=r1322.4b94e2f +pkgver=r1546.5fd66a1 pkgrel=1 pkgdesc="A multiplatform Sega Dreamcast emulator" arch=('i686' 'x86_64') @@ -12,15 +12,15 @@ license=('GPL2') conflicts=('reicast') provides=('reicast') makedepends=('git') -depends=('libgl' 'alsa-plugins') +depends=('libgl' 'alsa-plugins' 'libpulse') 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' + 'enable_x11_keyboard_support.patch' 'wait_if_two_frames_already_in_flight.patch') sha256sums=('SKIP' - '464946512ca4cffac104128a85dd174520caeaa0325afbf281b6cfdbc0120fc6' - 'f4d3b4ad7703da09dc59cae839ca225e1a21b89d905ede3519bf3174b40903da') + '095961538c13208b39ebb0b9d6b6e30c1225f218dcc67239a9d938a23aec601e' + '8f7b392ac6fac2d62e078a397f6b7c29ac3a23877d5c1a4566a58710b3383aef') pkgver() { cd reicast @@ -29,20 +29,21 @@ pkgver() { prepare () { cd reicast - patch -Np1 -i "$srcdir"/enable_joystick_support.patch + patch -Np1 -i "$srcdir"/enable_x11_keyboard_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 () { @@ -50,9 +51,5 @@ package () { 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 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 - #include - #include -+ #include - - #if !defined(GLES) - #include -@@ -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_joystick_support_old.patch b/pcr/reicast-git/enable_joystick_support_old.patch new file mode 100644 index 000000000..0fbb59ac7 --- /dev/null +++ b/pcr/reicast-git/enable_joystick_support_old.patch @@ -0,0 +1,346 @@ +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 + #include + #include ++ #include + + #if !defined(GLES) + #include +@@ -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_x11_keyboard_support.patch b/pcr/reicast-git/enable_x11_keyboard_support.patch new file mode 100644 index 000000000..1dfd41c72 --- /dev/null +++ b/pcr/reicast-git/enable_x11_keyboard_support.patch @@ -0,0 +1,233 @@ +diff -Nur a/core/linux-dist/main.cpp b/core/linux-dist/main.cpp +--- a/core/linux-dist/main.cpp 2015-08-23 00:16:33.930598582 -0300 ++++ b/core/linux-dist/main.cpp 2015-08-23 18:54:25.349048701 -0300 +@@ -157,6 +157,10 @@ + + void UpdateInputState(u32 port) + { ++ #if defined(SUPPORT_X11) ++ update_x11_input_state(); ++ #endif ++ + #if defined(TARGET_EMSCRIPTEN) + return; + #endif +diff -Nur a/core/linux-dist/x11.cpp b/core/linux-dist/x11.cpp +--- a/core/linux-dist/x11.cpp 2015-08-23 00:16:33.930598582 -0300 ++++ b/core/linux-dist/x11.cpp 2015-08-23 18:50:06.875072583 -0300 +@@ -3,6 +3,7 @@ + #include + #include + #include ++#include + + #if !defined(GLES) + #include +@@ -23,6 +24,18 @@ + #endif + #define DEFAULT_WINDOW_HEIGHT 480 + ++#define DC_KEY_AXIS_UP (25) ++#define DC_KEY_AXIS_DOWN (39) ++#define DC_KEY_AXIS_LEFT (38) ++#define DC_KEY_AXIS_RIGHT (40) ++#define DC_KEY_AXIS_LT (79) ++#define DC_KEY_AXIS_RT (81) ++ ++u8 axis_joyx = 0; ++u8 axis_joyy = 0; ++u8 axis_lt = 0; ++u8 axis_rt = 0; ++ + map x11_keymap; + int x11_dc_buttons = 0xFFFF; + int x11_keyboard_input = 0; +@@ -55,8 +68,27 @@ + XSendEvent((Display*)x11_disp, DefaultRootWindow((Display*)x11_disp), False, SubstructureNotifyMask, &xev); + } + ++void update_x11_input_state() ++{ ++ //static char key = 0; ++ ++ //kcode[port]=0xFFFF; ++ joyx[0] = axis_joyx; ++ joyy[0] = axis_joyy; ++ lt[0] = axis_lt; ++ rt[0] = axis_rt; ++ return; ++ ++ //HandleEvents(port); ++} ++ + void input_x11_handle() + { ++ static bool dc_axis_up = false; ++ static bool dc_axis_down = false; ++ static bool dc_axis_left = false; ++ static bool dc_axis_right = false; ++ + if (x11_win && x11_keyboard_input) + { + //Handle X11 +@@ -68,6 +100,90 @@ + { + case KeyPress: + case KeyRelease: ++ if (e.xkey.keycode == DC_KEY_AXIS_UP) ++ { ++ if (e.type == KeyPress) ++ { ++ dc_axis_up = true; ++ } ++ else if (e.type == KeyRelease) ++ { ++ dc_axis_up = false; ++ } ++ else ++ { ++ } ++ } ++ if (e.xkey.keycode == DC_KEY_AXIS_DOWN) ++ { ++ if (e.type == KeyPress) ++ { ++ dc_axis_down = true; ++ } ++ else if (e.type == KeyRelease) ++ { ++ dc_axis_down = false; ++ } ++ else ++ { ++ } ++ } ++ if (e.xkey.keycode == DC_KEY_AXIS_LEFT) ++ { ++ if (e.type == KeyPress) ++ { ++ dc_axis_left = true; ++ } ++ else if (e.type == KeyRelease) ++ { ++ dc_axis_left = false; ++ } ++ else ++ { ++ } ++ } ++ if (e.xkey.keycode == DC_KEY_AXIS_RIGHT) ++ { ++ if (e.type == KeyPress) ++ { ++ dc_axis_right = true; ++ } ++ else if (e.type == KeyRelease) ++ { ++ dc_axis_right = false; ++ } ++ else ++ { ++ } ++ } ++ if (e.xkey.keycode == DC_KEY_AXIS_LT) ++ { ++ if (e.type == KeyPress) ++ { ++ axis_lt = 255; ++ } ++ else if (e.type == KeyRelease) ++ { ++ axis_lt = 0; ++ } ++ else ++ { ++ } ++ } ++ if (e.xkey.keycode == DC_KEY_AXIS_RT) ++ { ++ if (e.type == KeyPress) ++ { ++ axis_rt = 255; ++ } ++ else if (e.type == KeyRelease) ++ { ++ axis_rt = 0; ++ } ++ else ++ { ++ } ++ } + if (e.type == KeyRelease && e.xkey.keycode == 95) // F11 button + { + x11_fullscreen = !x11_fullscreen; +@@ -89,26 +205,45 @@ + break; + } + } ++ if ((dc_axis_up == true) && (dc_axis_down == false)) ++ { ++ axis_joyy = -127; ++ } ++ else if ((dc_axis_up == false) && (dc_axis_down == true)) ++ { ++ axis_joyy = 127; ++ } ++ else ++ { ++ axis_joyy = 0; ++ } ++ if ((dc_axis_left == true) && (dc_axis_right == false)) ++ { ++ axis_joyx = -127; ++ } ++ else if ((dc_axis_left == false) && (dc_axis_right == true)) ++ { ++ axis_joyx = 127; ++ } ++ else ++ { ++ axis_joyx = 0; ++ } + } + } + + void input_x11_init() + { +- x11_keymap[113] = DC_DPAD_LEFT; +- x11_keymap[114] = DC_DPAD_RIGHT; ++ x11_keymap[44] = DC_DPAD_LEFT; ++ x11_keymap[46] = DC_DPAD_RIGHT; + +- x11_keymap[111] = DC_DPAD_UP; +- x11_keymap[116] = DC_DPAD_DOWN; ++ x11_keymap[31] = DC_DPAD_UP; ++ x11_keymap[45] = DC_DPAD_DOWN; + +- x11_keymap[53] = DC_BTN_X; +- x11_keymap[54] = DC_BTN_B; +- x11_keymap[55] = DC_BTN_A; +- +- /* +- //TODO: Fix sliders +- x11_keymap[38] = DPad_Down; +- x11_keymap[39] = DPad_Down; +- */ ++ x11_keymap[80] = DC_BTN_Y; ++ x11_keymap[83] = DC_BTN_X; ++ x11_keymap[85] = DC_BTN_B; ++ x11_keymap[84] = DC_BTN_A; + + x11_keymap[36] = DC_BTN_START; + +diff -Nur a/core/linux-dist/x11.h b/core/linux-dist/x11.h +--- a/core/linux-dist/x11.h 2015-08-23 00:16:33.930598582 -0300 ++++ b/core/linux-dist/x11.h 2015-08-23 18:58:04.534722602 -0300 +@@ -1,6 +1,7 @@ + #pragma once + + extern void* x11_glc; ++extern void update_x11_input_state(); + extern void input_x11_init(); + extern void input_x11_handle(); + extern void x11_window_create(); 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..56e774138 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-23 00:16:33.916598479 -0300 ++++ b/core/hw/pvr/Renderer_if.cpp 2015-08-23 02:25:28.932602664 -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,29 +37,10 @@ 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-23 00:16:33.917598487 -0300 ++++ b/core/hw/pvr/ta_ctx.cpp 2015-08-23 02:26:47.189293717 -0300 +@@ -127,8 +127,6 @@ mtx_rqueue.Lock(); rqueue = 0; mtx_rqueue.Unlock(); diff --git a/pcr/reicast-git/wait_if_two_frames_already_in_flight_old.patch b/pcr/reicast-git/wait_if_two_frames_already_in_flight_old.patch new file mode 100644 index 000000000..ff297365c --- /dev/null +++ b/pcr/reicast-git/wait_if_two_frames_already_in_flight_old.patch @@ -0,0 +1,70 @@ +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/reicast-multilib-git/PKGBUILD b/pcr/reicast-multilib-git/PKGBUILD index c675fa002..647a42e21 100644 --- a/pcr/reicast-multilib-git/PKGBUILD +++ b/pcr/reicast-multilib-git/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: Márcio Silva pkgname=reicast-multilib-git -pkgver=r1322.4b94e2f +pkgver=r1546.5fd66a1 pkgrel=1 pkgdesc="A multiplatform Sega Dreamcast emulator" arch=('x86_64') @@ -13,15 +13,15 @@ conflicts=('reicast') provides=('reicast') makedepends=('git') makedepends_x86_64=('gcc-multilib') -depends_x86_64=('lib32-libgl' 'lib32-alsa-plugins') +depends_x86_64=('lib32-libgl' 'lib32-alsa-plugins' 'lib32-libpulse') 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' + 'enable_x11_keyboard_support.patch' 'wait_if_two_frames_already_in_flight.patch') sha256sums=('SKIP' - '464946512ca4cffac104128a85dd174520caeaa0325afbf281b6cfdbc0120fc6' - 'f4d3b4ad7703da09dc59cae839ca225e1a21b89d905ede3519bf3174b40903da') + '095961538c13208b39ebb0b9d6b6e30c1225f218dcc67239a9d938a23aec601e' + '8f7b392ac6fac2d62e078a397f6b7c29ac3a23877d5c1a4566a58710b3383aef') pkgver() { cd reicast @@ -30,13 +30,17 @@ pkgver() { prepare () { cd reicast - patch -Np1 -i "$srcdir"/enable_joystick_support.patch + patch -Np1 -i "$srcdir"/enable_x11_keyboard_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 () { 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 - #include - #include -+ #include - - #if !defined(GLES) - #include -@@ -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/enable_joystick_support_old.patch b/pcr/reicast-multilib-git/enable_joystick_support_old.patch new file mode 100644 index 000000000..0fbb59ac7 --- /dev/null +++ b/pcr/reicast-multilib-git/enable_joystick_support_old.patch @@ -0,0 +1,346 @@ +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 + #include + #include ++ #include + + #if !defined(GLES) + #include +@@ -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/enable_x11_keyboard_support.patch b/pcr/reicast-multilib-git/enable_x11_keyboard_support.patch new file mode 100644 index 000000000..1dfd41c72 --- /dev/null +++ b/pcr/reicast-multilib-git/enable_x11_keyboard_support.patch @@ -0,0 +1,233 @@ +diff -Nur a/core/linux-dist/main.cpp b/core/linux-dist/main.cpp +--- a/core/linux-dist/main.cpp 2015-08-23 00:16:33.930598582 -0300 ++++ b/core/linux-dist/main.cpp 2015-08-23 18:54:25.349048701 -0300 +@@ -157,6 +157,10 @@ + + void UpdateInputState(u32 port) + { ++ #if defined(SUPPORT_X11) ++ update_x11_input_state(); ++ #endif ++ + #if defined(TARGET_EMSCRIPTEN) + return; + #endif +diff -Nur a/core/linux-dist/x11.cpp b/core/linux-dist/x11.cpp +--- a/core/linux-dist/x11.cpp 2015-08-23 00:16:33.930598582 -0300 ++++ b/core/linux-dist/x11.cpp 2015-08-23 18:50:06.875072583 -0300 +@@ -3,6 +3,7 @@ + #include + #include + #include ++#include + + #if !defined(GLES) + #include +@@ -23,6 +24,18 @@ + #endif + #define DEFAULT_WINDOW_HEIGHT 480 + ++#define DC_KEY_AXIS_UP (25) ++#define DC_KEY_AXIS_DOWN (39) ++#define DC_KEY_AXIS_LEFT (38) ++#define DC_KEY_AXIS_RIGHT (40) ++#define DC_KEY_AXIS_LT (79) ++#define DC_KEY_AXIS_RT (81) ++ ++u8 axis_joyx = 0; ++u8 axis_joyy = 0; ++u8 axis_lt = 0; ++u8 axis_rt = 0; ++ + map x11_keymap; + int x11_dc_buttons = 0xFFFF; + int x11_keyboard_input = 0; +@@ -55,8 +68,27 @@ + XSendEvent((Display*)x11_disp, DefaultRootWindow((Display*)x11_disp), False, SubstructureNotifyMask, &xev); + } + ++void update_x11_input_state() ++{ ++ //static char key = 0; ++ ++ //kcode[port]=0xFFFF; ++ joyx[0] = axis_joyx; ++ joyy[0] = axis_joyy; ++ lt[0] = axis_lt; ++ rt[0] = axis_rt; ++ return; ++ ++ //HandleEvents(port); ++} ++ + void input_x11_handle() + { ++ static bool dc_axis_up = false; ++ static bool dc_axis_down = false; ++ static bool dc_axis_left = false; ++ static bool dc_axis_right = false; ++ + if (x11_win && x11_keyboard_input) + { + //Handle X11 +@@ -68,6 +100,90 @@ + { + case KeyPress: + case KeyRelease: ++ if (e.xkey.keycode == DC_KEY_AXIS_UP) ++ { ++ if (e.type == KeyPress) ++ { ++ dc_axis_up = true; ++ } ++ else if (e.type == KeyRelease) ++ { ++ dc_axis_up = false; ++ } ++ else ++ { ++ } ++ } ++ if (e.xkey.keycode == DC_KEY_AXIS_DOWN) ++ { ++ if (e.type == KeyPress) ++ { ++ dc_axis_down = true; ++ } ++ else if (e.type == KeyRelease) ++ { ++ dc_axis_down = false; ++ } ++ else ++ { ++ } ++ } ++ if (e.xkey.keycode == DC_KEY_AXIS_LEFT) ++ { ++ if (e.type == KeyPress) ++ { ++ dc_axis_left = true; ++ } ++ else if (e.type == KeyRelease) ++ { ++ dc_axis_left = false; ++ } ++ else ++ { ++ } ++ } ++ if (e.xkey.keycode == DC_KEY_AXIS_RIGHT) ++ { ++ if (e.type == KeyPress) ++ { ++ dc_axis_right = true; ++ } ++ else if (e.type == KeyRelease) ++ { ++ dc_axis_right = false; ++ } ++ else ++ { ++ } ++ } ++ if (e.xkey.keycode == DC_KEY_AXIS_LT) ++ { ++ if (e.type == KeyPress) ++ { ++ axis_lt = 255; ++ } ++ else if (e.type == KeyRelease) ++ { ++ axis_lt = 0; ++ } ++ else ++ { ++ } ++ } ++ if (e.xkey.keycode == DC_KEY_AXIS_RT) ++ { ++ if (e.type == KeyPress) ++ { ++ axis_rt = 255; ++ } ++ else if (e.type == KeyRelease) ++ { ++ axis_rt = 0; ++ } ++ else ++ { ++ } ++ } + if (e.type == KeyRelease && e.xkey.keycode == 95) // F11 button + { + x11_fullscreen = !x11_fullscreen; +@@ -89,26 +205,45 @@ + break; + } + } ++ if ((dc_axis_up == true) && (dc_axis_down == false)) ++ { ++ axis_joyy = -127; ++ } ++ else if ((dc_axis_up == false) && (dc_axis_down == true)) ++ { ++ axis_joyy = 127; ++ } ++ else ++ { ++ axis_joyy = 0; ++ } ++ if ((dc_axis_left == true) && (dc_axis_right == false)) ++ { ++ axis_joyx = -127; ++ } ++ else if ((dc_axis_left == false) && (dc_axis_right == true)) ++ { ++ axis_joyx = 127; ++ } ++ else ++ { ++ axis_joyx = 0; ++ } + } + } + + void input_x11_init() + { +- x11_keymap[113] = DC_DPAD_LEFT; +- x11_keymap[114] = DC_DPAD_RIGHT; ++ x11_keymap[44] = DC_DPAD_LEFT; ++ x11_keymap[46] = DC_DPAD_RIGHT; + +- x11_keymap[111] = DC_DPAD_UP; +- x11_keymap[116] = DC_DPAD_DOWN; ++ x11_keymap[31] = DC_DPAD_UP; ++ x11_keymap[45] = DC_DPAD_DOWN; + +- x11_keymap[53] = DC_BTN_X; +- x11_keymap[54] = DC_BTN_B; +- x11_keymap[55] = DC_BTN_A; +- +- /* +- //TODO: Fix sliders +- x11_keymap[38] = DPad_Down; +- x11_keymap[39] = DPad_Down; +- */ ++ x11_keymap[80] = DC_BTN_Y; ++ x11_keymap[83] = DC_BTN_X; ++ x11_keymap[85] = DC_BTN_B; ++ x11_keymap[84] = DC_BTN_A; + + x11_keymap[36] = DC_BTN_START; + +diff -Nur a/core/linux-dist/x11.h b/core/linux-dist/x11.h +--- a/core/linux-dist/x11.h 2015-08-23 00:16:33.930598582 -0300 ++++ b/core/linux-dist/x11.h 2015-08-23 18:58:04.534722602 -0300 +@@ -1,6 +1,7 @@ + #pragma once + + extern void* x11_glc; ++extern void update_x11_input_state(); + extern void input_x11_init(); + extern void input_x11_handle(); + extern void x11_window_create(); 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 index ff297365c..56e774138 100644 --- 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 @@ -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-23 00:16:33.916598479 -0300 ++++ b/core/hw/pvr/Renderer_if.cpp 2015-08-23 02:25:28.932602664 -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,29 +37,10 @@ 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-23 00:16:33.917598487 -0300 ++++ b/core/hw/pvr/ta_ctx.cpp 2015-08-23 02:26:47.189293717 -0300 +@@ -127,8 +127,6 @@ mtx_rqueue.Lock(); rqueue = 0; mtx_rqueue.Unlock(); diff --git a/pcr/reicast-multilib-git/wait_if_two_frames_already_in_flight_old.patch b/pcr/reicast-multilib-git/wait_if_two_frames_already_in_flight_old.patch new file mode 100644 index 000000000..ff297365c --- /dev/null +++ b/pcr/reicast-multilib-git/wait_if_two_frames_already_in_flight_old.patch @@ -0,0 +1,70 @@ +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; -- cgit v1.2.3 From 24d1b6c68d6d5ac5a8b72b5390ec3a0eff940145 Mon Sep 17 00:00:00 2001 From: Gaming4JC Date: Sun, 23 Aug 2015 21:50:01 -0400 Subject: adding GNUAxiom grub2 theme --- pcr/grub2-theme-gnuaxiom/PKGBUILD | 24 ++++++++++++++++++++++ .../grub2-theme-gnuaxiom.install | 10 +++++++++ 2 files changed, 34 insertions(+) create mode 100644 pcr/grub2-theme-gnuaxiom/PKGBUILD create mode 100644 pcr/grub2-theme-gnuaxiom/grub2-theme-gnuaxiom.install diff --git a/pcr/grub2-theme-gnuaxiom/PKGBUILD b/pcr/grub2-theme-gnuaxiom/PKGBUILD new file mode 100644 index 000000000..2cdef15fc --- /dev/null +++ b/pcr/grub2-theme-gnuaxiom/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Luke R. GPG: rsa4096/3EAE8697 + +pkgname=grub2-theme-gnuaxiom +_pkgname=GNUAxiom +pkgver=1.0 +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=('3ffee3d205d7a85a5272b46d32d608d42844e5e3941262e5b59f88b193a1822fbe720cbaee1d30540a7b4034d267fcf533ca7a3b9f5124b627ba9538a7120d3c') + +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 -- cgit v1.2.3 From 27a174d8f488df1c0b1f05b8cdfcc63388f30a03 Mon Sep 17 00:00:00 2001 From: Gaming4JC Date: Sun, 23 Aug 2015 23:35:30 -0400 Subject: adding parabola-backgrounds --- pcr/parabola-backgrounds/PKGBUILD | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pcr/parabola-backgrounds/PKGBUILD 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. 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 +} -- cgit v1.2.3 From 0029f3517dc4b55f802321d5dc173489e887165e Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 24 Aug 2015 00:59:43 -0300 Subject: kdelibs-4.14.11-1.parabola1: updating version --- libre/kdelibs/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 # Contributor (Arch): Andrea Scarpino # Maintainer: André Silva 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') -- cgit v1.2.3 From d2e4c7d3e996cf0d922d4a059917d2fe64c12fa1 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 24 Aug 2015 01:17:55 -0300 Subject: kdebase-runtime-15.08.0-1.parabola1: updating version --- libre/kdebase-runtime/PKGBUILD | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libre/kdebase-runtime/PKGBUILD b/libre/kdebase-runtime/PKGBUILD index 09ca57226..c977f90be 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 # Contributor (Arch): Andrea Scarpino # Contributor (Arch): Pierre Schmitz @@ -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.parabola1 +pkgdesc="Plugins and applications necessary for the running of KDE applications, without nonfree system-wide search providers" 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") -- cgit v1.2.3 From ead1235139bee9969a322106999126366531ba4a Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 24 Aug 2015 01:21:38 -0300 Subject: kdebase-konqueror-15.08.0-2.parabola1: updating version --- libre/kdebase-konqueror/PKGBUILD | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libre/kdebase-konqueror/PKGBUILD b/libre/kdebase-konqueror/PKGBUILD index 662034484..510f6354d 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 244393 2015-08-19 18:37:15Z arojas $ # Maintainer (Arch): Felix Yan # Contributor (Arch): Andrea Scarpino # Contributor (Arch): Pierre Schmitz @@ -6,26 +6,26 @@ # Maintainer: André Silva pkgname='kdebase-konqueror' -pkgver=15.04.3 -pkgrel=1.parabola1 +pkgver=15.08.0 +pkgrel=2.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. -- cgit v1.2.3 From d024b1db0a6615f7cb77c367f5a4f2ea38b4eeaf Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 24 Aug 2015 01:40:34 -0300 Subject: kdenetwork-kopete-15.08.0-1.parabola1{,.nonprism1}: updating version --- libre/kdenetwork-kopete/PKGBUILD | 10 +++++----- nonprism/kdenetwork-kopete/PKGBUILD | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) 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 # Maintainer: André Silva 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/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 # Maintainer: André Silva 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() { -- cgit v1.2.3 From 56d0099baf3b14e1e77c962f02d55b4a3b826a4d Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 24 Aug 2015 02:35:13 -0300 Subject: ark-15.08.0-1.parabola1: updating version * rename KDE kdeutils-ark package --- libre/ark/PKGBUILD | 50 +++++++ libre/ark/ark-unar-06.patch | 236 ++++++++++++++++++++++++++++++++ libre/ark/ark.install | 13 ++ libre/kdeutils-ark/PKGBUILD | 45 ------ libre/kdeutils-ark/ark-unar-06.patch | 236 -------------------------------- libre/kdeutils-ark/kdeutils-ark.install | 12 -- 6 files changed, 299 insertions(+), 293 deletions(-) create mode 100644 libre/ark/PKGBUILD create mode 100644 libre/ark/ark-unar-06.patch create mode 100644 libre/ark/ark.install delete mode 100644 libre/kdeutils-ark/PKGBUILD delete mode 100644 libre/kdeutils-ark/ark-unar-06.patch delete mode 100644 libre/kdeutils-ark/kdeutils-ark.install 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 +# Maintainer (Arch): Felix Yan +# Contributor (Arch): Andrea Scarpino +# Maintainer: André Silva + +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/ark/ark-unar-06.patch b/libre/ark/ark-unar-06.patch new file mode 100644 index 000000000..ab2ef274f --- /dev/null +++ b/libre/ark/ark-unar-06.patch @@ -0,0 +1,236 @@ +diff --git a/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop b/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop +new file mode 100644 +index 0000000..2b5bd9e +--- /dev/null ++++ b/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop +@@ -0,0 +1,15 @@ ++[Desktop Entry] ++Type=Service ++X-KDE-ServiceTypes=Kerfuffle/Plugin ++X-KDE-Library=kerfuffle_cliunarchiver ++X-KDE-PluginInfo-Author=Luke Shumaker ++X-KDE-PluginInfo-Email=lukeshu@sbcglobal.net ++X-KDE-PluginInfo-Name= kerfuffle_cliunarchiver ++X-KDE-PluginInfo-Version=0.0.1 ++X-KDE-PluginInfo-Website=http://www.kde.org ++X-KDE-PluginInfo-License=GPLv2+ ++X-KDE-Priority=150 ++X-KDE-Kerfuffle-APIRevision=1 ++X-KDE-Kerfuffle-ReadWrite=false ++Name=The Unarchiver plugin ++MimeType=application/x-rar; +diff --git a/plugins/cliunarchiverplugin/cliplugin.cpp b/plugins/cliunarchiverplugin/cliplugin.cpp +new file mode 100644 +index 0000000..e0adcf7 +--- /dev/null ++++ b/plugins/cliunarchiverplugin/cliplugin.cpp +@@ -0,0 +1,170 @@ ++ /* ++ * ark -- archiver for the KDE project ++ * ++ * Copyright (C) 2011 Luke Shumaker ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version 2 ++ * of the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ * ++ */ ++ ++#include "kerfuffle/cliinterface.h" ++#include "kerfuffle/kerfuffle_export.h" ++ ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++using namespace Kerfuffle; ++ ++class CliPlugin: public CliInterface ++{ ++public: ++ explicit CliPlugin(QObject *parent, const QVariantList & args) ++ : CliInterface(parent, args) { ++ m_indentLevel = 0; ++ } ++ ++ virtual ~CliPlugin() { ++ } ++ ++ virtual ParameterList parameterList() const { ++ static ParameterList p; ++ if (p.isEmpty()) { ++ /* Limitations: ++ * 01 - creates an empty file upon entering wrong password ++ * 02 - unar detects if output is being redirected and then does not accept any input ++ */ ++ ++ ///////////////[ COMMON ]///////////// ++ ++ p[CaptureProgress] = false; ++ p[PasswordPromptPattern] = QLatin1String("Password (will not be shown): "); ++ ++ ///////////////[ LIST ]///////////// ++ ++ p[ListProgram] = QLatin1String("lsar"); ++ p[ListArgs] = QStringList() << QLatin1String("-json") << QLatin1String("$Archive"); ++ ++ ///////////////[ EXTRACT ]///////////// ++ ++ p[ExtractProgram] = QLatin1String("unar"); ++ p[ExtractArgs] = QStringList() << QLatin1String("$Archive") << QLatin1String("$Files") << QLatin1String("$PasswordSwitch") << QLatin1String("$RootNodeSwitch"); ++ p[NoTrailingSlashes] = true; ++ p[PasswordSwitch] = QStringList() << QLatin1String("-password") << QLatin1String("$Password"); ++ p[RootNodeSwitch] = QStringList() << QLatin1String("-output-directory") << QLatin1String("$Path"); ++ p[FileExistsExpression] = QLatin1String("^\\\"(.+)\\\" already exists."); ++ p[FileExistsInput] = QStringList() ++ << QLatin1String("o") //overwrite ++ << QLatin1String("s") //skip ++ << QLatin1String("O") //overwrite all ++ << QLatin1String("S") //autoskip ++ << QLatin1String("q") //cancel ++ ; ++ ++ ///////////////[ DELETE ]///////////// ++ ++ p[DeleteProgram] = QLatin1String("x-fakeprogram"); ++ //p[DeleteArgs] = ++ ++ ///////////////[ ADD ]///////////// ++ ++ p[AddProgram] = QLatin1String("x-fakeprogram"); ++ //p[AddArgs] = ++ ++ ///////////////[ ERRORS ]///////////// ++ ++ p[ExtractionFailedPatterns] = QStringList() ++ << QLatin1String("Failed! \\((.+)\\)$") ++ << QLatin1String("Segmentation fault$"); ++ ++ p[WrongPasswordPatterns] = QStringList() ++ << QLatin1String("Failed! \\((.+)\\)$"); ++ } ++ return p; ++ } ++ ++ QString m_entryFilename, m_internalId; ++ ArchiveEntry m_currentEntry; ++ int m_indentLevel; ++ ++ bool readListLine(const QString &line) { ++ /* lsar will give us JSON output. However, we actually parse based on ++ * the indentation. Ugly, I know, but ++ * 1. It's easier ++ * 2. lsar's JSON is invalid JSON, so actual parsers bork. ++ */ ++ ++ int spaces; ++ for(spaces=0;(spacesm_indentLevel) { ++ if (m_newIndentLevel==3) { ++ m_currentEntry.clear(); ++ m_currentEntry[IsDirectory] = false; ++ } ++ } else if (m_newIndentLevel=3) ) { ++ EntryMetaDataType index = IsDirectory; ++ if (m_currentEntry[index].toBool()) { ++ m_currentEntry[FileName].toString().append(QLatin1String("/")); ++ } ++ kDebug() << "Added entry:" << m_currentEntry; ++ entry(m_currentEntry); ++ } ++ } ++ m_indentLevel = m_newIndentLevel; ++ ++ QRegExp rx(QLatin1String("^\\s*\"([^\"]*)\": (.*),$")); ++ if (rx.indexIn(line) >= 0) { ++ QRegExp rx_unquote(QLatin1String("^\"(.*)\"$")); ++ QString key = rx.cap(1); ++ QString value = rx.cap(2); ++ ++ if (false) { ++ } else if (key==QLatin1String("XADFileName")) { ++ rx_unquote.indexIn(value); ++ m_currentEntry[FileName] = m_currentEntry[InternalID] = rx_unquote.cap(1); ++ } else if (key==QLatin1String("XADFileSize")) { ++ m_currentEntry[Size] = value.toInt(); ++ } else if (key==QLatin1String("XADCompressedSize")) { ++ m_currentEntry[CompressedSize] = value.toInt(); ++ } else if (key==QLatin1String("XADLastModificationDate")) { ++ QDateTime ts(QDate::fromString(value, QLatin1String("\"YYYY-MM-DD hh:mm:ss"))); ++ m_currentEntry[Timestamp] = ts; ++ } else if (key==QLatin1String("XADIsDirectory")) { ++ m_currentEntry[IsDirectory] = (value==QLatin1String("1")); ++ } else if (key==QLatin1String("RARCRC32")) { ++ m_currentEntry[CRC] = value.toInt(); ++ } else if (key==QLatin1String("RARCompressionMethod")) { ++ m_currentEntry[Method] = value.toInt(); ++ } else if (key==QLatin1String("Encrypted")) { ++ m_currentEntry[IsPasswordProtected] = (value.toInt() != 0); ++ } ++ // TODO: add RAR version. ([Version]) ++ } ++ ++ return true; ++ } ++}; ++ ++KERFUFFLE_EXPORT_PLUGIN(CliPlugin) ++ +diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt +index 3619412..6368839 100644 +--- a/plugins/CMakeLists.txt ++++ b/plugins/CMakeLists.txt +@@ -20,6 +20,7 @@ if (LIBARCHIVE_FOUND) + endif (LIBARCHIVE_FOUND) + + add_subdirectory( clirarplugin ) ++add_subdirectory( cliunarchiverplugin ) + add_subdirectory( cli7zplugin ) + add_subdirectory( clizipplugin ) + add_subdirectory( libsinglefileplugin ) +diff --git a/plugins/cliunarchiverplugin/CMakeLists.txt b/plugins/cliunarchiverplugin/CMakeLists.txt +new file mode 100644 +index 0000000..ccd52e7 +--- /dev/null ++++ b/plugins/cliunarchiverplugin/CMakeLists.txt +@@ -0,0 +1,21 @@ ++ ++include_directories( ++ ${CMAKE_CURRENT_SOURCE_DIR}/../.. ++ ${CMAKE_CURRENT_BINARY_DIR}/../.. ++ ) ++ ++########### next target ############### ++ ++set(kerfuffle_cliunarchiver_SRCS cliplugin.cpp) ++ ++kde4_add_plugin(kerfuffle_cliunarchiver ${kerfuffle_cliunarchiver_SRCS}) ++ ++target_link_libraries(kerfuffle_cliunarchiver ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} kerfuffle ) ++ ++ ++ ++########### install files ############### ++ ++install(TARGETS kerfuffle_cliunarchiver DESTINATION ${PLUGIN_INSTALL_DIR} ) ++install( FILES kerfuffle_cliunarchiver.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) ++ diff --git a/libre/ark/ark.install b/libre/ark/ark.install new file mode 100644 index 000000000..74ff488bc --- /dev/null +++ b/libre/ark/ark.install @@ -0,0 +1,13 @@ +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/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 -# Contributor (Arch): Andrea Scarpino -# Maintainer: André Silva - -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/kdeutils-ark/ark-unar-06.patch b/libre/kdeutils-ark/ark-unar-06.patch deleted file mode 100644 index ab2ef274f..000000000 --- a/libre/kdeutils-ark/ark-unar-06.patch +++ /dev/null @@ -1,236 +0,0 @@ -diff --git a/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop b/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop -new file mode 100644 -index 0000000..2b5bd9e ---- /dev/null -+++ b/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop -@@ -0,0 +1,15 @@ -+[Desktop Entry] -+Type=Service -+X-KDE-ServiceTypes=Kerfuffle/Plugin -+X-KDE-Library=kerfuffle_cliunarchiver -+X-KDE-PluginInfo-Author=Luke Shumaker -+X-KDE-PluginInfo-Email=lukeshu@sbcglobal.net -+X-KDE-PluginInfo-Name= kerfuffle_cliunarchiver -+X-KDE-PluginInfo-Version=0.0.1 -+X-KDE-PluginInfo-Website=http://www.kde.org -+X-KDE-PluginInfo-License=GPLv2+ -+X-KDE-Priority=150 -+X-KDE-Kerfuffle-APIRevision=1 -+X-KDE-Kerfuffle-ReadWrite=false -+Name=The Unarchiver plugin -+MimeType=application/x-rar; -diff --git a/plugins/cliunarchiverplugin/cliplugin.cpp b/plugins/cliunarchiverplugin/cliplugin.cpp -new file mode 100644 -index 0000000..e0adcf7 ---- /dev/null -+++ b/plugins/cliunarchiverplugin/cliplugin.cpp -@@ -0,0 +1,170 @@ -+ /* -+ * ark -- archiver for the KDE project -+ * -+ * Copyright (C) 2011 Luke Shumaker -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2 -+ * of the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ * -+ */ -+ -+#include "kerfuffle/cliinterface.h" -+#include "kerfuffle/kerfuffle_export.h" -+ -+#include -+ -+#include -+#include -+#include -+#include -+#include -+ -+using namespace Kerfuffle; -+ -+class CliPlugin: public CliInterface -+{ -+public: -+ explicit CliPlugin(QObject *parent, const QVariantList & args) -+ : CliInterface(parent, args) { -+ m_indentLevel = 0; -+ } -+ -+ virtual ~CliPlugin() { -+ } -+ -+ virtual ParameterList parameterList() const { -+ static ParameterList p; -+ if (p.isEmpty()) { -+ /* Limitations: -+ * 01 - creates an empty file upon entering wrong password -+ * 02 - unar detects if output is being redirected and then does not accept any input -+ */ -+ -+ ///////////////[ COMMON ]///////////// -+ -+ p[CaptureProgress] = false; -+ p[PasswordPromptPattern] = QLatin1String("Password (will not be shown): "); -+ -+ ///////////////[ LIST ]///////////// -+ -+ p[ListProgram] = QLatin1String("lsar"); -+ p[ListArgs] = QStringList() << QLatin1String("-json") << QLatin1String("$Archive"); -+ -+ ///////////////[ EXTRACT ]///////////// -+ -+ p[ExtractProgram] = QLatin1String("unar"); -+ p[ExtractArgs] = QStringList() << QLatin1String("$Archive") << QLatin1String("$Files") << QLatin1String("$PasswordSwitch") << QLatin1String("$RootNodeSwitch"); -+ p[NoTrailingSlashes] = true; -+ p[PasswordSwitch] = QStringList() << QLatin1String("-password") << QLatin1String("$Password"); -+ p[RootNodeSwitch] = QStringList() << QLatin1String("-output-directory") << QLatin1String("$Path"); -+ p[FileExistsExpression] = QLatin1String("^\\\"(.+)\\\" already exists."); -+ p[FileExistsInput] = QStringList() -+ << QLatin1String("o") //overwrite -+ << QLatin1String("s") //skip -+ << QLatin1String("O") //overwrite all -+ << QLatin1String("S") //autoskip -+ << QLatin1String("q") //cancel -+ ; -+ -+ ///////////////[ DELETE ]///////////// -+ -+ p[DeleteProgram] = QLatin1String("x-fakeprogram"); -+ //p[DeleteArgs] = -+ -+ ///////////////[ ADD ]///////////// -+ -+ p[AddProgram] = QLatin1String("x-fakeprogram"); -+ //p[AddArgs] = -+ -+ ///////////////[ ERRORS ]///////////// -+ -+ p[ExtractionFailedPatterns] = QStringList() -+ << QLatin1String("Failed! \\((.+)\\)$") -+ << QLatin1String("Segmentation fault$"); -+ -+ p[WrongPasswordPatterns] = QStringList() -+ << QLatin1String("Failed! \\((.+)\\)$"); -+ } -+ return p; -+ } -+ -+ QString m_entryFilename, m_internalId; -+ ArchiveEntry m_currentEntry; -+ int m_indentLevel; -+ -+ bool readListLine(const QString &line) { -+ /* lsar will give us JSON output. However, we actually parse based on -+ * the indentation. Ugly, I know, but -+ * 1. It's easier -+ * 2. lsar's JSON is invalid JSON, so actual parsers bork. -+ */ -+ -+ int spaces; -+ for(spaces=0;(spacesm_indentLevel) { -+ if (m_newIndentLevel==3) { -+ m_currentEntry.clear(); -+ m_currentEntry[IsDirectory] = false; -+ } -+ } else if (m_newIndentLevel=3) ) { -+ EntryMetaDataType index = IsDirectory; -+ if (m_currentEntry[index].toBool()) { -+ m_currentEntry[FileName].toString().append(QLatin1String("/")); -+ } -+ kDebug() << "Added entry:" << m_currentEntry; -+ entry(m_currentEntry); -+ } -+ } -+ m_indentLevel = m_newIndentLevel; -+ -+ QRegExp rx(QLatin1String("^\\s*\"([^\"]*)\": (.*),$")); -+ if (rx.indexIn(line) >= 0) { -+ QRegExp rx_unquote(QLatin1String("^\"(.*)\"$")); -+ QString key = rx.cap(1); -+ QString value = rx.cap(2); -+ -+ if (false) { -+ } else if (key==QLatin1String("XADFileName")) { -+ rx_unquote.indexIn(value); -+ m_currentEntry[FileName] = m_currentEntry[InternalID] = rx_unquote.cap(1); -+ } else if (key==QLatin1String("XADFileSize")) { -+ m_currentEntry[Size] = value.toInt(); -+ } else if (key==QLatin1String("XADCompressedSize")) { -+ m_currentEntry[CompressedSize] = value.toInt(); -+ } else if (key==QLatin1String("XADLastModificationDate")) { -+ QDateTime ts(QDate::fromString(value, QLatin1String("\"YYYY-MM-DD hh:mm:ss"))); -+ m_currentEntry[Timestamp] = ts; -+ } else if (key==QLatin1String("XADIsDirectory")) { -+ m_currentEntry[IsDirectory] = (value==QLatin1String("1")); -+ } else if (key==QLatin1String("RARCRC32")) { -+ m_currentEntry[CRC] = value.toInt(); -+ } else if (key==QLatin1String("RARCompressionMethod")) { -+ m_currentEntry[Method] = value.toInt(); -+ } else if (key==QLatin1String("Encrypted")) { -+ m_currentEntry[IsPasswordProtected] = (value.toInt() != 0); -+ } -+ // TODO: add RAR version. ([Version]) -+ } -+ -+ return true; -+ } -+}; -+ -+KERFUFFLE_EXPORT_PLUGIN(CliPlugin) -+ -diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt -index 3619412..6368839 100644 ---- a/plugins/CMakeLists.txt -+++ b/plugins/CMakeLists.txt -@@ -20,6 +20,7 @@ if (LIBARCHIVE_FOUND) - endif (LIBARCHIVE_FOUND) - - add_subdirectory( clirarplugin ) -+add_subdirectory( cliunarchiverplugin ) - add_subdirectory( cli7zplugin ) - add_subdirectory( clizipplugin ) - add_subdirectory( libsinglefileplugin ) -diff --git a/plugins/cliunarchiverplugin/CMakeLists.txt b/plugins/cliunarchiverplugin/CMakeLists.txt -new file mode 100644 -index 0000000..ccd52e7 ---- /dev/null -+++ b/plugins/cliunarchiverplugin/CMakeLists.txt -@@ -0,0 +1,21 @@ -+ -+include_directories( -+ ${CMAKE_CURRENT_SOURCE_DIR}/../.. -+ ${CMAKE_CURRENT_BINARY_DIR}/../.. -+ ) -+ -+########### next target ############### -+ -+set(kerfuffle_cliunarchiver_SRCS cliplugin.cpp) -+ -+kde4_add_plugin(kerfuffle_cliunarchiver ${kerfuffle_cliunarchiver_SRCS}) -+ -+target_link_libraries(kerfuffle_cliunarchiver ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} kerfuffle ) -+ -+ -+ -+########### install files ############### -+ -+install(TARGETS kerfuffle_cliunarchiver DESTINATION ${PLUGIN_INSTALL_DIR} ) -+install( FILES kerfuffle_cliunarchiver.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -+ diff --git a/libre/kdeutils-ark/kdeutils-ark.install b/libre/kdeutils-ark/kdeutils-ark.install deleted file mode 100644 index 8a26818d8..000000000 --- a/libre/kdeutils-ark/kdeutils-ark.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_update() { - post_install -} - -post_remove() { - post_install -} -- cgit v1.2.3 From 20c03404644c14d4229d7170711469fcfc91aa46 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 24 Aug 2015 02:52:07 -0300 Subject: kde-meta-kdepim-15.08-1.nonprism1: updating version --- nonprism/kde-applications-meta/PKGBUILD | 34 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 19 deletions(-) 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 # Maintainer (Arch): Antonio Rojas # Contributor (Arch): Andrea Scarpino @@ -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') } -- cgit v1.2.3 From 768a28c3383b31259999cc8bb664e88a60d3c2d2 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 24 Aug 2015 04:02:51 -0300 Subject: kdepim-runtime-15.08.0-1.nonprism1: updating version --- nonprism/kdepim-runtime/PKGBUILD | 39 ++++++++++++++++++++++++++ nonprism/kdepim-runtime/kdepim-runtime.install | 13 +++++++++ 2 files changed, 52 insertions(+) create mode 100644 nonprism/kdepim-runtime/PKGBUILD create mode 100644 nonprism/kdepim-runtime/kdepim-runtime.install diff --git a/nonprism/kdepim-runtime/PKGBUILD b/nonprism/kdepim-runtime/PKGBUILD new file mode 100644 index 000000000..920cf85f6 --- /dev/null +++ b/nonprism/kdepim-runtime/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 244411 2015-08-20 09:51:07Z arojas $ +# Maintainer (Arch): Felix Yan +# Contributor (Arch): Andrea Scarpino +# Contributor (Arch): Pierre Schmitz +# Maintainer: André Silva + +pkgname=kdepim-runtime +pkgver=15.08.0 +pkgrel=1.nonprism1 +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=(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 -p build +} + +build() { + cd build + cmake ../$pkgname-$pkgver \ + -DCMAKE_BUILD_TYPE=Release \ + -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 +} diff --git a/nonprism/kdepim-runtime/kdepim-runtime.install b/nonprism/kdepim-runtime/kdepim-runtime.install new file mode 100644 index 000000000..c77e68041 --- /dev/null +++ b/nonprism/kdepim-runtime/kdepim-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 +} -- cgit v1.2.3 From dcd093e53774c1747dc70db374a5b6850065c0f3 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 24 Aug 2015 05:21:02 -0300 Subject: kdepim-15.08.0-3.nonprism1: updating version --- nonprism/kdepim/PKGBUILD | 128 +++++++++++++++++++++++++++++++++++ nonprism/kdepim/akregator.install | 12 ++++ nonprism/kdepim/kaddressbook.install | 12 ++++ nonprism/kdepim/kdepim.install | 13 ++++ nonprism/kdepim/kmail.install | 12 ++++ nonprism/kdepim/knode.install | 12 ++++ nonprism/kdepim/korganizer.install | 12 ++++ 7 files changed, 201 insertions(+) create mode 100644 nonprism/kdepim/PKGBUILD create mode 100644 nonprism/kdepim/akregator.install create mode 100644 nonprism/kdepim/kaddressbook.install create mode 100644 nonprism/kdepim/kdepim.install create mode 100644 nonprism/kdepim/kmail.install create mode 100644 nonprism/kdepim/knode.install create mode 100644 nonprism/kdepim/korganizer.install diff --git a/nonprism/kdepim/PKGBUILD b/nonprism/kdepim/PKGBUILD new file mode 100644 index 000000000..5aed465a3 --- /dev/null +++ b/nonprism/kdepim/PKGBUILD @@ -0,0 +1,128 @@ +# $Id: PKGBUILD 244749 2015-08-23 19:34:12Z arojas $ +# Maintainer (Arch): Felix Yan +# Contributor (Arch): Andrea Scarpino +# Contributor (Arch): Pierre Schmitz +# Maintainer: André Silva +pkgbase=kdepim +pkgname=(akonadiconsole kaddressbook kmail knotes + korganizer libkdepim) +pkgver=15.08.0 +pkgrel=3.nonprism1 +arch=('i686' 'x86_64') +url='http://pim.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde-applications' 'kdepim') +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() { + cd build + cmake ../$pkgbase-$pkgver \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_TESTING=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DLIBEXEC_INSTALL_DIR=lib \ + -DKDEPIM_STORAGESERVICE_GDRIVE=OFF + make +} + +package_akonadiconsole() { + pkgdesc='Akonadi Management and Debugging Console, without Google Drive support' + depends=('libkdepim') + conflicts=("kdepim-$pkgname") + url='http://pim.kde.org' + install='kdepim.install' + cd build/akonadiconsole + make DESTDIR="$pkgdir" install +} + +package_kaddressbook() { + pkgdesc='Contact Manager, without Google Drive support' + depends=('libkdepim' 'kontactinterface') + conflicts=("kdepim-$pkgname") + url="http://kde.org/applications/office/kaddressbook/" + install='kaddressbook.install' + for _i in kaddressbook plugins/kaddressbook; do + cd "$srcdir"/build/$_i + make DESTDIR="$pkgdir" install + done +} + +package_kmail() { + pkgdesc='Mail Client, without Google Drive support' + depends=('libkdepim' 'kontactinterface' 'kio-pim') + conflicts=("kdepim-$pkgname") + url="http://kde.org/applications/internet/kmail/" + install='kmail.install' + for _i in kmail agents/archivemailagent agents/mailfilteragent \ + storageservicemanager importwizard libksieve messagelist grantleeeditor mboximporter; do + cd "$srcdir"/build/$_i + make DESTDIR="$pkgdir" install + done + for _i in akonadi_archivemail_agent kmail importwizard; do + cd "$srcdir"/build/doc/$_i + make DESTDIR="$pkgdir" install + done +} + +package_knotes() { + pkgdesc='Popup Notes, without Google Drive support' + depends=('libkdepim' 'kontactinterface') + conflicts=("kdepim-$pkgname") + url="http://kde.org/applications/utilities/knotes/" + install='kdepim.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_korganizer() { + pkgdesc='Calendar and Scheduling Program, without Google Drive support' + depends=('libkdepim' 'kontactinterface') + conflicts=("kdepim-$pkgname") + url="http://kde.org/applications/office/korganizer" + 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 +} + +package_libkdepim() { + pkgdesc='Common libraries and resources for KDE PIM applications, without Google Drive support' + groups=() + depends=('kdepim-runtime' 'gpgmepp' 'grantlee-qt5' 'akonadi-search' 'knewstuff' 'kldap' 'kdnssd') + conflicts=('kdepim-libkdepim' 'kdepim-kjots' 'kdepim-knode' 'kdepim-kresources' 'kdepim-ktimetracker') + url='http://pim.kde.org' + 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 sieveeditor kaddressbookgrantlee; do + cd "$srcdir"/build/$_i + make DESTDIR="$pkgdir" install + done + for _i in akonadi_sendlater_agent akonadi_followupreminder_agent contactthemeeditor headerthemeeditor pimsettingexporter sieveeditor; 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/akregator.install b/nonprism/kdepim/akregator.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/nonprism/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/kdepim/kaddressbook.install b/nonprism/kdepim/kaddressbook.install new file mode 100644 index 000000000..5c501dc49 --- /dev/null +++ b/nonprism/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/kdepim/kdepim.install b/nonprism/kdepim/kdepim.install new file mode 100644 index 000000000..e9e8b444b --- /dev/null +++ b/nonprism/kdepim/kdepim.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q + update-mime-database usr/share/mime +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/nonprism/kdepim/kmail.install b/nonprism/kdepim/kmail.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/nonprism/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/kdepim/knode.install b/nonprism/kdepim/knode.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/nonprism/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/kdepim/korganizer.install b/nonprism/kdepim/korganizer.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/nonprism/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 +} -- cgit v1.2.3 From 49c393972f3e9dc6a4db0931ddba04d6a1002634 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Mon, 24 Aug 2015 10:20:54 -0500 Subject: lives-2.4.1-1: updating version --- pcr/lives/PKGBUILD | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 # Maintainer: Omar Vega Ramos 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 -- cgit v1.2.3 From 3c61a6cbfdc219b6e626994e597e3132b72ac5ed Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Mon, 24 Aug 2015 11:32:07 -0500 Subject: emacs-git-25.0.50.r122479-1: updating version --- pcr/emacs-git/PKGBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 -- cgit v1.2.3 From 7357553cf7501fa5f482a417bf1b74fd692dbde6 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 25 Aug 2015 01:59:51 -0300 Subject: mesa-libcl-10.6.5-1: updating version --- libre/mesa-libcl/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 -- cgit v1.2.3 From bb219c7006c2b54ca8104dba3cc9c24b34a4e370 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 25 Aug 2015 02:24:06 -0300 Subject: lib32-mesa-libcl-10.6.5-1: updating version --- libre-multilib/lib32-mesa-libcl/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- cgit v1.2.3 From 667ece925a65759f35672457d5892ebec5f69bf1 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 25 Aug 2015 02:27:54 -0300 Subject: lib32-opencl-mesa-10.6.5-1: updating version --- libre-multilib/lib32-opencl-mesa/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- cgit v1.2.3 From 4a93a4035280ce8c9d622fbeeb4e671e3b39cb99 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 25 Aug 2015 03:43:04 -0300 Subject: sagemath-6.8-3.parabola1: fixes for IPython 4 and add Jupyter kernel file --- libre/sagemath/PKGBUILD | 24 +++++++++++++++++++----- libre/sagemath/c_lib.patch | 17 ----------------- libre/sagemath/ipython-4.patch | 35 +++++++++++++++++++++++++++++++++++ libre/sagemath/kernel.json | 1 + 4 files changed, 55 insertions(+), 22 deletions(-) delete mode 100644 libre/sagemath/c_lib.patch create mode 100644 libre/sagemath/ipython-4.patch create mode 100644 libre/sagemath/kernel.json diff --git a/libre/sagemath/PKGBUILD b/libre/sagemath/PKGBUILD index 199bb1d0a..872ceceb7 100644 --- a/libre/sagemath/PKGBUILD +++ b/libre/sagemath/PKGBUILD @@ -11,7 +11,7 @@ pkgname=sagemath pkgver=6.8 -pkgrel=2.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" @@ -21,7 +21,7 @@ depends=(ipython2 ppl mpfi palp polybori singular libcliquer maxima-ecl gfan sym 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' @@ -34,11 +34,12 @@ 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' 'cython-0.23.patch') +'pexpect-env.patch' 'pexpect-del.patch' 'disable-fes.patch' 'cython-0.23.patch' 'ipython-4.patch') md5sums=('943780ef4460e38f28fefe95e3138981' 'd9a3e113ed147dcee8f89962a8dccd43' + '4cee4f96bcd877587e7efc40c20adba7' 'a906a180d198186a39820b0a2f9a9c63' 'f72e544032b1a3f952b7ddafc3a49d63' '843a6cc3b17a1850604593813321418e' @@ -48,7 +49,8 @@ md5sums=('943780ef4460e38f28fefe95e3138981' 'a83a3b1bc7fcb7cbf752a83a8311fc42' 'f333939ea6c41377b66407c81016cee4' '4eb23a3c7363258bc9ba764d6e5512ba' - '1b8dfa047115180aa0afbeaf19d97762') + '1b8dfa047115180aa0afbeaf19d97762' + '41aa997ad9f00afdc3357b37fc70f0e6') prepare(){ cd sage-$pkgver @@ -79,6 +81,8 @@ 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 @@ -158,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/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}"]} -- cgit v1.2.3 From ff77eadc7f7ed3141118dac9fb49460ddb1537d0 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 25 Aug 2015 04:01:01 -0300 Subject: icedove-l10n-1:38.1.0.deb1-3: add Welsh, Lower Sorbian and Upper Sorbian language packs --- libre/icedove-l10n/PKGBUILD | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD index e79b34d40..3d57c4e32 100644 --- a/libre/icedove-l10n/PKGBUILD +++ b/libre/icedove-l10n/PKGBUILD @@ -6,7 +6,7 @@ _pkgbase=icedove pkgbase=$_pkgbase-l10n _pkgver=38.1.0 pkgver=38.1.0.deb1 -pkgrel=2 +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"' @@ -124,8 +127,10 @@ sha256sums=('49b419449431d8d64e20427a2e7105e3ac1ffc41e677a5f9a8eb276f5b82df4a' 'c976d2fdb520e178df568a5824f4416b043f9ebbe436ddbfb81ef5b5f972d6e9' '82a2eef48fefe335f1f8d53d21861a45f7b73b4ad8b65c912f9820bf69273309' 'a1e0b882b599705e1150a66139fee97dc009be2a8e64e6a7c2b1158373bfd3ca' + '877cbe5d9dba3f90c2754788baaa137fb45bf9e2d071a50df69e970f341a6365' 'fad0fc825311a1b546eb117c8cc838f542485ff87cb71c5a656c449366a71526' 'bc900b8f0f2db4c0e5527780db826789d61bf5b265ccf62033909fbb4f21e12e' + '06ebda860118ac5833c6d8884a4e94bab7265622a48978c0e1b472055f784314' 'd6df1e34d17723f2b52aecea1fab9af964bd936816f51e5dc0f335bbf59a9a6c' '07e443159860c85c82f01dbc57e0c83904fa7788dd69fb234970ef0484afdc81' 'ef68841d061f743ab199e087ab45c12a2f1c4b481d2017f535bcadab2e8902ad' @@ -141,6 +146,7 @@ sha256sums=('49b419449431d8d64e20427a2e7105e3ac1ffc41e677a5f9a8eb276f5b82df4a' 'ff3d29d1a050b74e64e0a4450b65edb247a5eb36a1b8df6b57dc3851b1658fd3' 'aab3240dca233f9e6ec9077be40a3d0033d75ccbd196a9ccce2726261c9d4c41' 'f368ccd53d7d405c07149b351f56d391142b40e8774d9d7fa623ff3318428b6a' + 'f47a8a2ff662acef03541ead6caf3e900706ce348b7577cd656222e9dcc2c47a' 'c8393cb2f5c8aab62fec71e53f19791e7ce4d3acc37814a4796e7b390a4e1fcf' '56454db77528fd2bc02abd4f4ecde69adbe278cbe807842e3e92d709d5df526c' '913db42b7530f55a8f3836d4dd493cf45df86509c77cfc64aca28c4bf60c6321' -- cgit v1.2.3 From 0cd722505592a736588b6f8b352429be2ed34c63 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 25 Aug 2015 05:03:14 -0300 Subject: icecat-38.2.0_gnu1-1: updating version --- libre-testing/icecat/PKGBUILD | 165 ++++ libre-testing/icecat/freetype26.patch | 30 + libre-testing/icecat/gnu_headshadow.png | Bin 0 -> 6785 bytes libre-testing/icecat/icecat-fixed-loading-icon.png | Bin 0 -> 12184 bytes libre-testing/icecat/icecat-install-dir.patch | 12 + libre-testing/icecat/icecat.desktop | 352 ++++++++ libre-testing/icecat/icecat.install | 13 + libre-testing/icecat/libre.patch | 890 +++++++++++++++++++++ libre-testing/icecat/mozconfig | 38 + libre-testing/icecat/vendor.js | 28 + 10 files changed, 1528 insertions(+) create mode 100644 libre-testing/icecat/PKGBUILD create mode 100644 libre-testing/icecat/freetype26.patch create mode 100644 libre-testing/icecat/gnu_headshadow.png create mode 100644 libre-testing/icecat/icecat-fixed-loading-icon.png create mode 100644 libre-testing/icecat/icecat-install-dir.patch create mode 100644 libre-testing/icecat/icecat.desktop create mode 100644 libre-testing/icecat/icecat.install create mode 100644 libre-testing/icecat/libre.patch create mode 100644 libre-testing/icecat/mozconfig create mode 100644 libre-testing/icecat/vendor.js diff --git a/libre-testing/icecat/PKGBUILD b/libre-testing/icecat/PKGBUILD new file mode 100644 index 000000000..9b0c72ba6 --- /dev/null +++ b/libre-testing/icecat/PKGBUILD @@ -0,0 +1,165 @@ +# Maintainer: André Silva +# Contributor: Márcio Silva +# Contributor (ConnochaetOS): Henry Jensen +# Contributor: Luke Shumaker +# Contributor: fauno +# Contributor: vando +# Contributor (Arch): Jakub Schmidtke +# Contributor: Figue +# Thank you very much to the older contributors: +# Contributor: evr +# Contributor: Muhammad 'MJ' Jassim + +_pgo=true + +pkgname=icecat +_pkgver=38.2.0-gnu1 +pkgver=${_pkgver//-/_} +pkgrel=1 + +pkgdesc="GNU IceCat, the standalone web browser based on Mozilla Firefox." +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) +options=(!emptydirs !makeflags debug) +if $_pgo; then + makedepends+=(xorg-server-xvfb) + options+=(!ccache) +fi +optdepends=('networkmanager: Location detection via available WiFi networks' + 'gst-plugins-good: h.264 video' + '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://jenkins.trisquel.info/$pkgname/$pkgname-$_pkgver.tar.bz2 + mozconfig + libre.patch + gnu_headshadow.png + $pkgname.desktop + $pkgname-install-dir.patch + freetype26.patch + vendor.js + $pkgname-fixed-loading-icon.png) +sha256sums=('eef4addf37f6fc885f28eea936cee7258d42f0cb11d79703ec7ec1fe2b80ef8d' + '33a8cf07373c63a0bea70ec2c3983d2cca990752c0f946cb5dbd91f1e2b6410f' + 'e333901df4fc8a881d08c9434e3c302885ed4a989316114e13af828417510410' + '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' + '52df9ffeb52166ed4abd9a132ee4a9017b9c4980f0725ba383610ccfb06d4745' + '5bdab2de5520fb4d3dbc453d9f73d20e0e077bf652bc780fc17184ba6c718a47' + 'b9c440406644fde5097da8717f0b5e5e973d11ec4dd6d4a0570ca7094d96dc85' + '977aa49b940f1da049cefa2878a63ac6669a78e63e9d55bb11db7b8f8fb64c33' + '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213') +#validpgpkeys=('A57369A8BABC2542B5A0368C3C76EED7D7E04784') # Ruben Rodriguez + +prepare() { + export GNU_BUILD="gnuzilla-release" + + mv $pkgname-${pkgver%_*} "$srcdir/$GNU_BUILD" + cd "$srcdir/$GNU_BUILD" + + # Put gnu_headshadow.png on the source code + install -m644 "$srcdir/gnu_headshadow.png" \ + browser/base/content/abouthome + + # Install to /usr/lib/$pkgname + patch -Np1 -i "$srcdir/$pkgname-install-dir.patch" + + # https://bugzilla.mozilla.org/show_bug.cgi?id=1143411 + patch -Np1 -i "$srcdir/freetype26.patch" + + # Patch and remove anything that's left + patch -Np1 -i "$srcdir/libre.patch" + rm -v browser/base/content/abouthome/snippet*.png || true + sed -i '\|abouthome/snippet|d + ' browser/base/jar.mn + + # Replace common URLs + sed -i '\|extensions[.]getAddons[.]get[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g; + \|extensions[.]getAddons[.]search[.]browseURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g; + \|extensions[.]getAddons[.]search[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g; + \|extensions[.]getAddons[.]search[.]url| s|https://directory[.]fsf[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g; + \|extensions[.]webservice[.]discoverURL| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g; + \|extensions[.]webservice[.]discoverURL| s|https://directory[.]fsf[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g; + \|browser[.]search[.]searchEnginesURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g; + \|browser[.]search[.]searchEnginesURL| s|https://mycroft[.]mozdev[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g; + \|plugins[.]update[.]url| s|https://www[.]mozilla[.]org/[%]LOCALE[%]/plugincheck/["][)][;]|https://trisquel.info/en/browser");|g; + \|plugins[.]update[.]url| s|https://www[.]gnu[.]org/software/gnuzilla/["][)][;]|https://trisquel.info/en/browser");|g; + ' browser/app/profile/icecat.js + + # Load our build config, disable SafeSearch + cp "$srcdir/mozconfig" .mozconfig + + mkdir "$srcdir/path" + + # WebRTC build tries to execute "python" and expects Python 2 + ln -s /usr/bin/python2 "$srcdir/path/python" + + # configure script misdetects the preprocessor without an optimization level + # https://bugs.archlinux.org/task/34644 + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + + # Fix tab loading icon (doesn't work with libpng 1.6) + # https://bugzilla.mozilla.org/show_bug.cgi?id=841734 + cp "$srcdir/$pkgname-fixed-loading-icon.png" \ + browser/themes/linux/tabbrowser/loading.png +} + +build() { + export GNU_BUILD="gnuzilla-release" + + cd "$srcdir/$GNU_BUILD" + + export PATH="$srcdir/path:$PATH" + export PYTHON="/usr/bin/python2" + + if $_pgo; then + # Do PGO + xvfb-run -a -s "-extension GLX -screen 0 1280x1024x24" \ + make -f client.mk build MOZ_PGO=1 + else + make -f client.mk build + fi +} + +package() { + export GNU_BUILD="gnuzilla-release" + + cd "$srcdir/$GNU_BUILD" + make -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install + + install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js" + + + brandingdir=browser/branding/official + icondir="$pkgdir/usr/share/icons/hicolor" + for i in 16x16 32x32 48x48; do + install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$pkgname.png" + done + install -Dm644 "$brandingdir/content/icon64.png" \ + "$icondir/64x64/apps/$pkgname.png" + install -Dm644 "$brandingdir/mozicon128.png" \ + "$icondir/128x128/apps/$pkgname.png" + install -Dm644 "$brandingdir/content/about-logo.png" \ + "$icondir/192x192/apps/$pkgname.png" + install -Dm644 "$brandingdir/content/about-logo@2x.png" \ + "$icondir/384x384/apps/$pkgname.png" + + install -d "$pkgdir/usr/share/applications" + install -m644 "$srcdir/$pkgname.desktop" \ + "$pkgdir/usr/share/applications" + + # Use system-provided dictionaries + rm -rf "$pkgdir/usr/lib/$pkgname/"{dictionaries,hyphenation} + 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-testing/icecat/freetype26.patch b/libre-testing/icecat/freetype26.patch new file mode 100644 index 000000000..c1eb49497 --- /dev/null +++ b/libre-testing/icecat/freetype26.patch @@ -0,0 +1,30 @@ + +# HG changeset patch +# User NiLuJe +# Date 1426721573 14400 +# Node ID afd840d66e6a775dc2ed35dd3add01ff07f950fe +# Parent 35515400af363bfc141353acd474814567c43c54 +Bug 1143411 - Fix build against latest freetype code. r=glandium + +diff --git a/config/system-headers b/config/system-headers +--- a/config/system-headers ++++ b/config/system-headers +@@ -465,16 +465,17 @@ freetype/tttables.h + freetype/t1tables.h + freetype/ftlcdfil.h + freetype/ftsizes.h + freetype/ftadvanc.h + freetype/ftbitmap.h + freetype/ftxf86.h + freetype.h + ftcache.h ++ftfntfmt.h + ftglyph.h + ftsynth.h + ftoutln.h + ttnameid.h + tttables.h + t1tables.h + ftlcdfil.h + ftsizes.h + diff --git a/libre-testing/icecat/gnu_headshadow.png b/libre-testing/icecat/gnu_headshadow.png new file mode 100644 index 000000000..e0f73a3bf Binary files /dev/null and b/libre-testing/icecat/gnu_headshadow.png differ diff --git a/libre-testing/icecat/icecat-fixed-loading-icon.png b/libre-testing/icecat/icecat-fixed-loading-icon.png new file mode 100644 index 000000000..55f25e591 Binary files /dev/null and b/libre-testing/icecat/icecat-fixed-loading-icon.png differ diff --git a/libre-testing/icecat/icecat-install-dir.patch b/libre-testing/icecat/icecat-install-dir.patch new file mode 100644 index 000000000..e15bf0b68 --- /dev/null +++ b/libre-testing/icecat/icecat-install-dir.patch @@ -0,0 +1,12 @@ +diff -Nur a/config/baseconfig.mk c/config/baseconfig.mk +--- a/config/baseconfig.mk 2014-10-09 12:52:39.000000000 -0200 ++++ b/config/baseconfig.mk 2014-10-21 18:34:35.803894661 -0200 +@@ -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-testing/icecat/icecat.desktop b/libre-testing/icecat/icecat.desktop new file mode 100644 index 000000000..d2c0ccb03 --- /dev/null +++ b/libre-testing/icecat/icecat.desktop @@ -0,0 +1,352 @@ +[Desktop Entry] +Name=GNU IceCat +GenericName=Web Browser +GenericName[ar]=متصفح ويب +GenericName[ast]=Restolador Web +GenericName[bn]=ওয়েব ব্রাউজার +GenericName[ca]=Navegador web +GenericName[cs]=Webový prohlížeč +GenericName[da]=Webbrowser +GenericName[el]=Περιηγητής διαδικτύου +GenericName[es]=Navegador web +GenericName[et]=Veebibrauser +GenericName[fa]=مرورگر اینترنتی +GenericName[fi]=WWW-selain +GenericName[fr]=Navigateur Web +GenericName[gl]=Navegador Web +GenericName[he]=דפדפן אינטרנט +GenericName[hr]=Web preglednik +GenericName[hu]=Webböngésző +GenericName[it]=Browser web +GenericName[ja]=ウェブ・ブラウザ +GenericName[ko]=웹 브라우저 +GenericName[ku]=Geroka torê +GenericName[lt]=Interneto naršyklė +GenericName[nb]=Nettleser +GenericName[nl]=Webbrowser +GenericName[nn]=Nettlesar +GenericName[no]=Nettleser +GenericName[pl]=Przeglądarka WWW +GenericName[pt]=Navegador Web +GenericName[pt_BR]=Navegador Web +GenericName[ro]=Navigator Internet +GenericName[ru]=Веб-браузер +GenericName[sk]=Internetový prehliadač +GenericName[sl]=Spletni brskalnik +GenericName[sv]=Webbläsare +GenericName[tr]=Web Tarayıcı +GenericName[ug]=توركۆرگۈ +GenericName[uk]=Веб-браузер +GenericName[vi]=Trình duyệt Web +GenericName[zh_CN]=网络浏览器 +GenericName[zh_TW]=網路瀏覽器 +Comment=Browse the World Wide Web +Comment[ar]=تصفح الشبكة العنكبوتية العالمية +Comment[ast]=Restola pela Rede +Comment[bn]=ইন্টারনেট ব্রাউজ করুন +Comment[ca]=Navegueu per la web +Comment[cs]=Prohlížení stránek World Wide Webu +Comment[da]=Surf på internettet +Comment[de]=Im Internet surfen +Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web) +Comment[es]=Navegue por la web +Comment[et]=Lehitse veebi +Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید +Comment[fi]=Selaa Internetin WWW-sivuja +Comment[fr]=Naviguer sur le Web +Comment[gl]=Navegar pola rede +Comment[he]=גלישה ברחבי האינטרנט +Comment[hr]=Pretražite web +Comment[hu]=A világháló böngészése +Comment[it]=Esplora il web +Comment[ja]=ウェブを閲覧します +Comment[ko]=웹을 돌아 다닙니다 +Comment[ku]=Li torê bigere +Comment[lt]=Naršykite internete +Comment[nb]=Surf på nettet +Comment[nl]=Verken het internet +Comment[nn]=Surf på nettet +Comment[no]=Surf på nettet +Comment[pl]=Przeglądanie stron WWW +Comment[pt]=Navegue na Internet +Comment[pt_BR]=Navegue na Internet +Comment[ro]=Navigați pe Internet +Comment[ru]=Доступ в Интернет +Comment[sk]=Prehliadanie internetu +Comment[sl]=Brskajte po spletu +Comment[sv]=Surfa på webben +Comment[tr]=İnternet'te Gezinin +Comment[ug]=دۇنيادىكى توربەتلەرنى كۆرگىلى بولىدۇ +Comment[uk]=Перегляд сторінок Інтернету +Comment[vi]=Để duyệt các trang web +Comment[zh_CN]=浏览互联网 +Comment[zh_TW]=瀏覽網際網路 +Exec=icecat %u +Terminal=false +Type=Application +Icon=icecat +Categories=Network;WebBrowser; +MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp; +StartupNotify=true +Actions=NewTab;NewWindow;NewPrivateWindow; + +[Desktop Action NewTab] +Name=Open new tab +Name[ach]=Yab dirica matidi manyen +Name[af]=Open nuwe oortjie +Name[an]=Ubrir una pestanya nueva +Name[ar]=افتح لسانًا جديدًا +Name[as]=নতুন টেব খোলক +Name[ast]=Abrir llingüeta nueva +Name[az]=Yeni vərəq aç +Name[be]=Адкрыць новую ўстаўку +Name[bg]=Отваряне на нов подпрозорец +Name[bn_BD]=নতুন ট্যাব খুলুন +Name[bn_IN]=নতুন ট্যাব খুলুন +Name[br]=Digeriñ un ivinell nevez +Name[bs]=Otvori novi tab +Name[ca]=Obre una pestanya nova +Name[cs]=Otevřít nový panel +Name[cy]=Agor tab newydd +Name[da]=Åbn nyt faneblad +Name[de]=Neuen Tab öffnen +Name[dsb]=Nowy rejtark wócyniś +Name[el]=Άνοιγμα νέας καρτέλας +Name[eo]=Malfermi novan langeton +Name[es_AR]=Abrir nueva pestaña +Name[es_CL]=Abrir nueva pestaña +Name[es_ES]=Abrir pestaña nueva +Name[es_MX]=Abrir una pestaña nueva +Name[et]=Ava uus kaart +Name[eu]=Ireki fitxa berria +Name[ff]=Uddit tabbere hesere +Name[fi]=Avaa uusi välilehti +Name[fr]=Ouvrir un nouvel onglet +Name[fy_NL]=Iepenje nij ljepblêd +Name[ga_IE]=Oscail i gcluaisín nua +Name[gd]=Fosgail taba ùr +Name[gl]=Abrir unha nova lapela +Name[gu_IN]=નવી ટૅબને ખોલો +Name[he]=פתיחת לשונית חדשה +Name[hi_IN]=नया टैब खोलें +Name[hr]=Otvori novu karticu +Name[hsb]=Nowy rajtark wočinić +Name[hu]=Új lap megnyitása +Name[hy_AM]=Բացել նոր ներդիր +Name[id]=Buka tab baru +Name[is]=Opna nýjan flipa +Name[it]=Apri nuova scheda +Name[ja]=新しいタブ +Name[kk]=Жаңа бетті ашу +Name[kn]=ಹೊಸ ಹಾಳೆಯನ್ನು ತೆರೆ +Name[ko]=새 탭 열기 +Name[lij]=Àrvi nêuvo féuggio +Name[lt]=Atverti naują kortelę +Name[mai]=नव टैब खोलू +Name[mk]=Отвори ново јазиче +Name[ml]=പുതിയ റ്റാബ് തുറക്കുക +Name[mr]=नवीन टॅब उघडा +Name[ms]=Buka tab baru +Name[nb_NO]=Åpne ny fane +Name[nl]=Nieuw tabblad openen +Name[nn_NO]=Opna ny fane +Name[or]=ନୂତନ ଟ୍ୟାବ ଖୋଲନ୍ତୁ +Name[pa_IN]=ਨਵੀਂ ਟੈਬ ਖੋਲ੍ਹੋ +Name[pl]=Otwórz nową kartę +Name[pt_BR]=Nova aba +Name[pt_PT]=Abrir novo separador +Name[rm]=Avrir in nov tab +Name[ro]=Deschide o filă nouă +Name[ru]=Открыть новую вкладку +Name[si]=නව ටැබය විවෘත කරන්න +Name[sk]=Otvoriť novú kartu +Name[sl]=Odpri nov zavihek +Name[son]=Nor loku taaga feeri +Name[sq]=Hap skedë të re +Name[sr]=Отвори нови језичак +Name[sv_SE]=Öppna ny flik +Name[ta]=புதிய கீற்றைத் திற +Name[te]=కొత్త టాబ్ తెరువుము +Name[th]=เปิดแท็บใหม่ +Name[tr]=Yeni sekme aç +Name[uk]=Відкрити нову вкладку +Name[uz]=Yangi ichki oyna ochish +Name[vi]=Mở thẻ mới +Name[xh]=Vula ithebhu entsha +Name[zh_CN]=打开新标签页 +Name[zh_TW]=開啟新分頁 +Exec=icecat -new-tab about:newtab + +[Desktop Action NewWindow] +Name=Open new window +Name[ach]=Yab dirica manyen +Name[af]=Open nuwe venster +Name[an]=Ubrir una nueva finestra +Name[ar]=افتح نافذة جديدة +Name[as]=নতুন উইন্ডো খোলক +Name[ast]=Abrir ventana nueva +Name[az]=Yeni pəncərə aç +Name[be]=Адкрыць новае акно +Name[bg]=Отваряне на нов прозорец +Name[bn_BD]=নতুন উইন্ডো খুলুন +Name[bn_IN]=নতুন উইন্ডো খুলুন +Name[br]=Digeriñ ur prenestr nevez +Name[bs]=Otvori novi prozor +Name[ca]=Obre una finestra nova +Name[cs]=Otevřít nové okno +Name[cy]=Agor ffenestr newydd +Name[da]=Åbn nyt vindue +Name[de]=Neues Fenster öffnen +Name[dsb]=Nowe wokno wócyniś +Name[el]=Άνοιγμα νέου παραθύρου +Name[eo]=Malfermi novan fenestron +Name[es_AR]=Abrir nueva ventana +Name[es_CL]=Abrir nueva ventana +Name[es_ES]=Abrir nueva ventana +Name[es_MX]=Abrir nueva ventana +Name[et]=Ava uus aken +Name[eu]=Ireki leiho berria +Name[ff]=Uddit henorde hesere +Name[fi]=Avaa uusi ikkuna +Name[fr]=Ouvrir une nouvelle fenêtre +Name[fy_NL]=Iepenje nij finster +Name[ga_IE]=Oscail fuinneog nua +Name[gd]=Fosgail uinneag ùr +Name[gl]=Abrir unha nova xanela +Name[gu_IN]=નવી વિન્ડોને ખોલો +Name[he]=פתח חלון חדש +Name[hi_IN]=नई विंडो खोलें +Name[hr]=Otvori novi prozor +Name[hsb]=Nowe wokno wočinić +Name[hu]=Új ablak megnyitása +Name[hy_AM]=Բացել նոր պատուհան +Name[id]=Buka jendela baru +Name[is]=Opna nýjan glugga +Name[it]=Apri nuova finestra +Name[ja]=新しいウィンドウ +Name[kk]=Жаңа терезені ашу +Name[kn]=ಹೊಸ ವಿಂಡೊವನ್ನು ತೆರೆ +Name[ko]=새 창 열기 +Name[lij]=Àrvi nêuvo barcón +Name[lt]=Atverti naują langą +Name[mai]=नई विंडो खोलू +Name[mk]=Отвори нов прозорец +Name[ml]=പുതിയ ജാലകം തുറക്കുക +Name[mr]=नवीन पटल उघडा +Name[ms]=Buka tetingkap baru +Name[nb_NO]=Åpne nytt vindu +Name[nl]=Een nieuw venster openen +Name[nn_NO]=Opna nytt vindauge +Name[or]=ନୂତନ ୱିଣ୍ଡୋ ଖୋଲନ୍ତୁ +Name[pa_IN]=ਨਵੀਂ ਵਿੰਡੋ ਖੋਲ੍ਹੋ +Name[pl]=Otwórz nowe okno +Name[pt_BR]=Nova janela +Name[pt_PT]=Abrir nova janela +Name[rm]=Avrir ina nova fanestra +Name[ro]=Deschide o nouă fereastră +Name[ru]=Открыть новое окно +Name[si]=නව කවුළුවක් විවෘත කරන්න +Name[sk]=Otvoriť nové okno +Name[sl]=Odpri novo okno +Name[son]=Zanfun taaga feeri +Name[sq]=Hap dritare të re +Name[sr]=Отвори нови прозор +Name[sv_SE]=Öppna nytt fönster +Name[ta]=புதிய சாளரத்தை திற +Name[te]=కొత్త విండో తెరువుము +Name[th]=เปิดหน้าต่างใหม่ +Name[tr]=Yeni pencere aç +Name[uk]=Відкрити нове вікно +Name[uz]=Yangi oyna ochish +Name[vi]=Mở cửa sổ mới +Name[xh]=Vula iwindow entsha +Name[zh_CN]=打开新窗口 +Name[zh_TW]=開啟新視窗 +Exec=icecat -new-window + +[Desktop Action NewPrivateWindow] +Name=New private window +Name[ach]=Dirica manyen me mung +Name[af]=Nuwe privaatvenster +Name[an]=Nueva finestra de navegación privada +Name[ar]=نافذة خاصة جديدة +Name[as]=নতুন ব্যক্তিগত উইন্ডো +Name[ast]=Ventana privada nueva +Name[az]=Yeni məxfi pəncərə +Name[be]=Новае акно адасаблення +Name[bg]=Нов прозорец за поверително сърфиране +Name[bn_BD]=নতুন ব্যক্তিগত উইন্ডো +Name[bn_IN]=নতুন ব্যাক্তিগত উইন্ডো +Name[br]=Prenestr merdeiñ prevez nevez +Name[bs]=Novi privatni prozor +Name[ca]=Finestra privada nova +Name[cs]=Nové anonymní okno +Name[cy]=Ffenestr breifat newydd +Name[da]=Nyt privat vindue +Name[de]=Neues privates Fenster öffnen +Name[dsb]=Nowe priwatne wokno +Name[el]=Νέο παράθυρο ιδιωτικής περιήγησης +Name[eo]=Nova privata fenestro +Name[es_AR]=Nueva ventana privada +Name[es_CL]=Nueva ventana privada +Name[es_ES]=Nueva ventana privada +Name[es_MX]=Nueva ventana privada +Name[et]=Uus privaatne aken +Name[eu]=Leiho pribatu berria +Name[ff]=Henorde suturo hesere +Name[fi]=Uusi yksityinen ikkuna +Name[fr]=Nouvelle fenêtre de navigation privée +Name[fy_NL]=Nij priveefinster +Name[ga_IE]=Fuinneog nua phríobháideach +Name[gd]=Uinneag phrìobhaideach ùr +Name[gl]=Nova xanela privada +Name[gu_IN]=નવી ખાનગી વિન્ડો +Name[he]=חלון פרטי חדש +Name[hi_IN]=नया निजी विंडो +Name[hr]=Novi privatni prozor +Name[hsb]=Nowe priwatne wokno +Name[hu]=Új privát ablak +Name[hy_AM]=Գաղտնի դիտարկում +Name[id]=Jendela mode pribadi baru +Name[is]=Nýr einkagluggi +Name[it]=Nuova finestra anonima +Name[ja]=新しいプライベートウィンドウ +Name[kk]=Жаңа жекелік терезе +Name[kn]=ಹೊಸ ಖಾಸಗಿ ಕಿಟಕಿ +Name[ko]=새 사생활 보호 창 +Name[lij]=Nêuvo barcón privòu +Name[lt]=Atverti privačiojo naršymo langą +Name[mai]=नव निज विंडो +Name[mk]=Нов прозорец за приватно сурфање +Name[ml]=പുതിയ സ്വകാര്യ ജാലകം +Name[mr]=नवीन वैयक्तिक पटल +Name[ms]=Tetingkap peribadi baharu +Name[nb_NO]=Nytt privat vindu +Name[nl]=Nieuw privévenster +Name[nn_NO]=Nytt privat vindauge +Name[or]=ନୂତନ ବ୍ୟକ୍ତିଗତ ୱିଣ୍ଡୋ +Name[pa_IN]=ਨਵੀਂ ਪ੍ਰਾਈਵੇਟ ਵਿੰਡੋ +Name[pl]=Nowe okno w trybie prywatnym +Name[pt_BR]=Nova janela privativa +Name[pt_PT]=Nova janela privada +Name[rm]=Nova fanestra privata +Name[ro]=Fereastră fără urme nouă +Name[ru]=Новое приватное окно +Name[si]=නව පුද්ගලික කවුළුව +Name[sk]=Nové okno v režime Súkromné prehliadanie +Name[sl]=Novo zasebno okno +Name[son]=Sutura zanfun taaga +Name[sq]=Dritare e re private +Name[sr]=Нови приватни прозор +Name[sv_SE]=Nytt privat fönster +Name[ta]=புதிய தனிப்பட்ட சாளரம் +Name[te]=కొత్త ఆంతరంగిక విండో +Name[th]=หน้าต่างท่องเว็บแบบส่วนตัวใหม่ +Name[tr]=Yeni gizli pencere +Name[uk]=Нове приватне вікно +Name[uz]=Yangi shaxsiy oyna +Name[vi]=Cửa sổ riêng tư mới +Name[xh]=Ifestile yangasese entsha +Name[zh_CN]=新建隐私浏览窗口 +Name[zh_TW]=新增隱私視窗 +Exec=icecat -private-window diff --git a/libre-testing/icecat/icecat.install b/libre-testing/icecat/icecat.install new file mode 100644 index 000000000..1a1f4b16b --- /dev/null +++ b/libre-testing/icecat/icecat.install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + diff --git a/libre-testing/icecat/libre.patch b/libre-testing/icecat/libre.patch new file mode 100644 index 000000000..ee88c6d56 --- /dev/null +++ b/libre-testing/icecat/libre.patch @@ -0,0 +1,890 @@ +diff -Nur a/browser/app/profile/icecat.js b/browser/app/profile/icecat.js +--- 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.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); +@@ -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 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; + } + +-#searchForm, +-#snippets { +- width: 470px; +-} +- + #searchForm { + display: -moz-box; + } +@@ -72,8 +67,7 @@ + #searchEngineLogo { + display: inline-block; + height: 28px; +- width: 70px; +- min-width: 70px; ++ width: 28px; + } + + #searchText { +@@ -145,48 +139,6 @@ + transition-duration: 0ms; + } + +-#defaultSnippet1, +-#defaultSnippet2, +-#rightsSnippet { +- display: block; +- min-height: 38px; +- background: 30px center no-repeat; +- padding: 6px 0; +- -moz-padding-start: 79px; +-} +- +-#rightsSnippet[hidden] { +- display: none; +-} +- +-#defaultSnippet1:-moz-dir(rtl), +-#defaultSnippet2:-moz-dir(rtl), +-#rightsSnippet:-moz-dir(rtl) { +- background-position: right 30px center; +-} +- +-#defaultSnippet1 { +- background-image: url("chrome://browser/content/abouthome/snippet1.png"); +-} +- +-#defaultSnippet2 { +- background-image: url("chrome://browser/content/abouthome/snippet2.png"); +-} +- +-#snippets { +- display: inline-block; +- text-align: start; +- margin: 12px 0; +- color: #3c3c3c; +- font-size: 75%; +- /* 12px is the computed font size, 15px the computed line height of the snippets +- with Segoe UI on a default Windows 7 setup. The 15/12 multiplier approximately +- converts em from units of font-size to units of line-height. The goal is to +- preset the height of a three-line snippet to avoid visual moving/flickering as +- the snippets load. */ +- min-height: calc(15/12 * 3em); +-} +- + #launcher { + display: -moz-box; + -moz-box-align: center; +@@ -335,26 +287,25 @@ + width: 32px; + } + +-#aboutMozilla { ++#aboutGNU { + display: block; +- position: relative; /* pin wordmark to edge of document, not of viewport */ + -moz-box-ordinal-group: 0; + opacity: .5; + transition: opacity 150ms; + } + +-#aboutMozilla:hover { ++#aboutGNU:hover { + opacity: 1; + } + +-#aboutMozilla::before { +- content: url("chrome://browser/content/abouthome/mozilla.png"); ++#aboutGNU::before { ++ content: url("chrome://browser/content/abouthome/gnu_headshadow.png"); + display: block; + position: absolute; + top: 12px; + right: 12px; +- width: 69px; +- height: 19px; ++ width: 200px; ++ height: 110px; + } + + /* [HiDPI] +@@ -366,26 +317,6 @@ + background-image: url("chrome://branding/content/about-logo@2x.png"); + } + +- #defaultSnippet1, +- #defaultSnippet2, +- #rightsSnippet { +- background-size: 40px; +- } +- +- #defaultSnippet1 { +- background-image: url("chrome://browser/content/abouthome/snippet1@2x.png"); +- } +- +- #defaultSnippet2 { +- background-image: url("chrome://browser/content/abouthome/snippet2@2x.png"); +- } +- +- .launchButton::before, +- #aboutMozilla::before { +- transform: scale(.5); +- transform-origin: 0 0; +- } +- + #downloads::before { + content: url("chrome://browser/content/abouthome/downloads@2x.png"); + } +@@ -421,9 +352,5 @@ + body[narrow] #restorePreviousSession::before { + content: url("chrome://browser/content/abouthome/restore@2x.png"); + } +- +- #aboutMozilla::before { +- content: url("chrome://browser/content/abouthome/mozilla@2x.png"); +- } + } + +diff -Nur a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js +--- 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 = { +- "Google": { +- // This is the "2x" image designed for OS X retina resolution, Windows at 192dpi, etc.; +- // it will be scaled down as necessary on lower-dpi displays. +- image: "data:image/png;base64," + +- "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" ++ "searx": { ++ image: "data:image/png;base64,\ ++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" + } + }; + +-// The process of adding a new default snippet involves: +-// * add a new entity to aboutHome.dtd +-// * add a for it in aboutHome.xhtml +-// * add an entry here in the proper ordering (based on spans) +-// The part of the snippet will be linked to the corresponding url. +-const DEFAULT_SNIPPETS_URLS = [ "" ]; +- +-const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day. +- +-// IndexedDB storage constants. +-const DATABASE_NAME = "abouthome"; +-const DATABASE_VERSION = 1; +-const SNIPPETS_OBJECTSTORE_NAME = "snippets"; +- + // 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 +58,6 @@ + if (mutation.attributeName == "searchEngineName") { + setupSearchEngine(); + if (!gInitialized) { +-// ensureSnippetsMapThen(loadSnippets); + gInitialized = true; + } + return; +@@ -178,118 +82,6 @@ + window.removeEventListener("resize", fitToWidth); + }); + +-// This object has the same interface as Map and is used to store and retrieve +-// the snippets data. It is lazily initialized by ensureSnippetsMapThen(), so +-// be sure its callback returned before trying to use it. +-let gSnippetsMap; +-let gSnippetsMapCallbacks = []; +- +-/** +- * Ensure the snippets map is properly initialized. +- * +- * @param aCallback +- * Invoked once the map has been initialized, gets the map as argument. +- * @note Snippets should never directly manage the underlying storage, since +- * it may change inadvertently. +- */ +-function ensureSnippetsMapThen(aCallback) +-{ +-return; +- if (gSnippetsMap) { +- aCallback(gSnippetsMap); +- return; +- } +- +- // Handle multiple requests during the async initialization. +- gSnippetsMapCallbacks.push(aCallback); +- if (gSnippetsMapCallbacks.length > 1) { +- // We are already updating, the callbacks will be invoked when done. +- return; +- } +- +- let invokeCallbacks = function () { +- if (!gSnippetsMap) { +- gSnippetsMap = Object.freeze(new Map()); +- } +- +- for (let callback of gSnippetsMapCallbacks) { +- callback(gSnippetsMap); +- } +- gSnippetsMapCallbacks.length = 0; +- } +- +- let openRequest = indexedDB.open(DATABASE_NAME, DATABASE_VERSION); +- +- openRequest.onerror = function (event) { +- // Try to delete the old database so that we can start this process over +- // next time. +- indexedDB.deleteDatabase(DATABASE_NAME); +- invokeCallbacks(); +- }; +- +- openRequest.onupgradeneeded = function (event) { +- let db = event.target.result; +- if (!db.objectStoreNames.contains(SNIPPETS_OBJECTSTORE_NAME)) { +- db.createObjectStore(SNIPPETS_OBJECTSTORE_NAME); +- } +- } +- +- openRequest.onsuccess = function (event) { +- let db = event.target.result; +- +- db.onerror = function (event) { +- invokeCallbacks(); +- } +- +- db.onversionchange = function (event) { +- event.target.close(); +- invokeCallbacks(); +- } +- +- let cache = new Map(); +- let cursorRequest = db.transaction(SNIPPETS_OBJECTSTORE_NAME) +- .objectStore(SNIPPETS_OBJECTSTORE_NAME).openCursor(); +- cursorRequest.onerror = function (event) { +- invokeCallbacks(); +- } +- +- cursorRequest.onsuccess = function(event) { +- let cursor = event.target.result; +- +- // Populate the cache from the persistent storage. +- if (cursor) { +- cache.set(cursor.key, cursor.value); +- cursor.continue(); +- return; +- } +- +- // The cache has been filled up, create the snippets map. +- gSnippetsMap = Object.freeze({ +- get: function (aKey) cache.get(aKey), +- set: function (aKey, aValue) { +- db.transaction(SNIPPETS_OBJECTSTORE_NAME, "readwrite") +- .objectStore(SNIPPETS_OBJECTSTORE_NAME).put(aValue, aKey); +- return cache.set(aKey, aValue); +- }, +- has: function (aKey) cache.has(aKey), +- delete: function (aKey) { +- db.transaction(SNIPPETS_OBJECTSTORE_NAME, "readwrite") +- .objectStore(SNIPPETS_OBJECTSTORE_NAME).delete(aKey); +- return cache.delete(aKey); +- }, +- clear: function () { +- db.transaction(SNIPPETS_OBJECTSTORE_NAME, "readwrite") +- .objectStore(SNIPPETS_OBJECTSTORE_NAME).clear(); +- return cache.clear(); +- }, +- get size() cache.size +- }); +- +- setTimeout(invokeCallbacks, 0); +- } +- } +-} +- + function onSearchSubmit(aEvent) + { + let searchTerms = document.getElementById("searchText").value; +@@ -339,159 +131,6 @@ + + } + +-/** +- * Inform the test harness that we're done loading the page. +- */ +-function loadSucceeded() +-{ +- var event = new CustomEvent("AboutHomeLoadSnippetsSucceeded", {bubbles:true}); +- document.dispatchEvent(event); +-} +- +-/** +- * Update the local snippets from the remote storage, then show them through +- * showSnippets. +- */ +-function loadSnippets() +-{ +-return; +- if (!gSnippetsMap) +- throw new Error("Snippets map has not properly been initialized"); +- +- // Allow tests to modify the snippets map before using it. +- var event = new CustomEvent("AboutHomeLoadSnippets", {bubbles:true}); +- document.dispatchEvent(event); +- +- // Check cached snippets version. +- let cachedVersion = gSnippetsMap.get("snippets-cached-version") || 0; +- let currentVersion = document.documentElement.getAttribute("snippetsVersion"); +- if (cachedVersion < currentVersion) { +- // The cached snippets are old and unsupported, restart from scratch. +- gSnippetsMap.clear(); +- } +- +- // Check last snippets update. +- let lastUpdate = gSnippetsMap.get("snippets-last-update"); +- let updateURL = document.documentElement.getAttribute("snippetsURL"); +- let shouldUpdate = !lastUpdate || +- Date.now() - lastUpdate > SNIPPETS_UPDATE_INTERVAL_MS; +- if (updateURL && shouldUpdate) { +- // Try to update from network. +- let xhr = new XMLHttpRequest(); +- try { +- xhr.open("GET", updateURL, true); +- } catch (ex) { +- showSnippets(); +- loadSucceeded(); +- return; +- } +- // Even if fetching should fail we don't want to spam the server, thus +- // set the last update time regardless its results. Will retry tomorrow. +- gSnippetsMap.set("snippets-last-update", Date.now()); +- xhr.onerror = function (event) { +- showSnippets(); +- }; +- xhr.onload = function (event) +- { +- if (xhr.status == 200) { +- gSnippetsMap.set("snippets", xhr.responseText); +- gSnippetsMap.set("snippets-cached-version", currentVersion); +- } +- showSnippets(); +- loadSucceeded(); +- }; +- xhr.send(null); +- } else { +- showSnippets(); +- loadSucceeded(); +- } +-} +- +-/** +- * Shows locally cached remote snippets, or default ones when not available. +- * +- * @note: snippets should never invoke showSnippets(), or they may cause +- * a "too much recursion" exception. +- */ +-let _snippetsShown = false; +-function showSnippets() +-{ +-return; +- let snippetsElt = document.getElementById("snippets"); +- +- // Show about:rights notification, if needed. +- let showRights = document.documentElement.getAttribute("showKnowYourRights"); +- if (showRights) { +- let rightsElt = document.getElementById("rightsSnippet"); +- let anchor = rightsElt.getElementsByTagName("a")[0]; +- anchor.href = "about:rights"; +- snippetsElt.appendChild(rightsElt); +- rightsElt.removeAttribute("hidden"); +- return; +- } +- +- if (!gSnippetsMap) +- throw new Error("Snippets map has not properly been initialized"); +- if (_snippetsShown) { +- // There's something wrong with the remote snippets, just in case fall back +- // to the default snippets. +- showDefaultSnippets(); +- throw new Error("showSnippets should never be invoked multiple times"); +- } +- _snippetsShown = true; +- +- let snippets = gSnippetsMap.get("snippets"); +- // If there are remotely fetched snippets, try to to show them. +- if (snippets) { +- // Injecting snippets can throw if they're invalid XML. +- try { +- snippetsElt.innerHTML = snippets; +- // Scripts injected by innerHTML are inactive, so we have to relocate them +- // through DOM manipulation to activate their contents. +- Array.forEach(snippetsElt.getElementsByTagName("script"), function(elt) { +- let relocatedScript = document.createElement("script"); +- relocatedScript.type = "text/javascript;version=1.8"; +- relocatedScript.text = elt.text; +- elt.parentNode.replaceChild(relocatedScript, elt); +- }); +- return; +- } catch (ex) { +- // Bad content, continue to show default snippets. +- } +- } +- +- showDefaultSnippets(); +-} +- +-/** +- * Clear snippets element contents and show default snippets. +- */ +-function showDefaultSnippets() +-{ +-return; +- // Clear eventual contents... +- let snippetsElt = document.getElementById("snippets"); +- snippetsElt.innerHTML = ""; +- +- // ...then show default snippets. +- let defaultSnippetsElt = document.getElementById("defaultSnippets"); +- let entries = defaultSnippetsElt.querySelectorAll("span"); +- // Choose a random snippet. Assume there is always at least one. +- let randIndex = Math.floor(Math.random() * entries.length); +- let entry = entries[randIndex]; +- // Inject url in the eventual link. +- if (DEFAULT_SNIPPETS_URLS[randIndex]) { +- let links = entry.getElementsByTagName("a"); +- // Default snippets can have only one link, otherwise something is messed +- // up in the translation. +- if (links.length == 1) { +- links[0].href = DEFAULT_SNIPPETS_URLS[randIndex]; +- } +- } +- // Move the default snippet to the snippets element. +- snippetsElt.appendChild(entry); +-} +- + function fitToWidth() { + 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 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 @@ + + +
+-
++ + +- ++ +
+
+ +@@ -101,6 +101,7 @@ + +
+ ++ + + + +diff -Nur a/browser/base/jar.mn b/browser/base/jar.mn +--- a/browser/base/jar.mn 2014-10-09 12:53:30.000000000 -0200 ++++ b/browser/base/jar.mn 2014-10-21 14:24:18.198691296 -0200 +@@ -32,6 +32,7 @@ + content/browser/abouthome/settings.png (content/abouthome/settings.png) + content/browser/abouthome/restore.png (content/abouthome/restore.png) + content/browser/abouthome/restore-large.png (content/abouthome/restore-large.png) ++ content/browser/abouthome/gnu_headshadow.png (content/abouthome/gnu_headshadow.png) + content/browser/abouthome/snippet1@2x.png (content/abouthome/snippet1@2x.png) + 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-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 @@ + + + +- +-latest features."> +- +-Choose from thousands of add-ons."> +- +-Know your rights…"> +- + + + never show, false --> always show) +- try { +- return !Services.prefs.getBoolPref("browser.rights.override"); +- } catch (e) { } +- // Ditto, for the legacy EULA pref. +- try { +- return !Services.prefs.getBoolPref("browser.EULA.override"); +- } catch (e) { } +- +-#ifndef MOZILLA_OFFICIAL +- // Non-official builds shouldn't show the notification. +- return false; +-#endif +- +- // Look to see if the user has seen the current version or not. +- var currentVersion = Services.prefs.getIntPref("browser.rights.version"); +- try { +- return !Services.prefs.getBoolPref("browser.rights." + currentVersion + ".shown"); +- } catch (e) { } +- +- // Legacy: If the user accepted a EULA, we won't annoy them with the +- // equivalent about:rights page until the version changes. +- try { +- return !Services.prefs.getBoolPref("browser.EULA." + currentVersion + ".accepted"); +- } catch (e) { } +- +- // We haven't shown the notification before, so do so now. +- return true; +- } +-}; +- +-/** +- * Returns the URL to fetch snippets from, in the urlFormatter service format. +- */ +-XPCOMUtils.defineLazyGetter(AboutHomeUtils, "snippetsURL", function() { +- let updateURL = Services.prefs +- .getCharPref(SNIPPETS_URL_PREF) +- .replace("%STARTPAGE_VERSION%", STARTPAGE_VERSION); +- return Services.urlFormatter.formatURL(updateURL); +-}); +- + /** + * This code provides services to the about:home page. Whenever + * about:home needs to do something chrome-privileged, it sends a +@@ -246,18 +184,9 @@ + }).then(function(engineName) { + let data = { + showRestoreLastSession: ss.canRestoreLastSession, +- snippetsURL: AboutHomeUtils.snippetsURL, +- showKnowYourRights: AboutHomeUtils.showKnowYourRights, +- snippetsVersion: AboutHomeUtils.snippetsVersion, + defaultEngineName: engineName + }; + +- if (AboutHomeUtils.showKnowYourRights) { +- // Set pref to indicate we've shown the notification. +- let currentVersion = Services.prefs.getIntPref("browser.rights.version"); +- Services.prefs.setBoolPref("browser.rights." + currentVersion + ".shown", true); +- } +- + if (target && target.messageManager) { + target.messageManager.sendAsyncMessage("AboutHome:Update", data); + } else { diff --git a/libre-testing/icecat/mozconfig b/libre-testing/icecat/mozconfig new file mode 100644 index 000000000..d85989194 --- /dev/null +++ b/libre-testing/icecat/mozconfig @@ -0,0 +1,38 @@ +. $topsrcdir/browser/config/mozconfig + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib +ac_add_options --enable-pie + +ac_add_options --enable-official-branding + +# System libraries +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +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-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 + +# Features +ac_add_options --enable-startup-notification +ac_add_options --enable-pulseaudio +ac_add_options --enable-gstreamer=1.0 + +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-installer +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-testing/icecat/vendor.js b/libre-testing/icecat/vendor.js new file mode 100644 index 000000000..32fddb8db --- /dev/null +++ b/libre-testing/icecat/vendor.js @@ -0,0 +1,28 @@ +// Use LANG environment variable to choose locale +pref("intl.locale.matchOS", true); + +// Disable default browser checking. +pref("browser.shell.checkDefaultBrowser", false); + +// Don't disable our bundled extensions in the application directory +pref("extensions.autoDisableScopes", 11); +pref("extensions.shownSelectionUI", true); + +// Disable "alt" as a shortcut key to open full menu bar. Conflicts with "alt" as a modifier +pref("ui.key.menuAccessKeyFocuses", false); + +// Make sure that Firefox Social stuff are empty +pref("social.whitelist", ""); +pref("social.directories", ""); + +// Disable the GeoLocation API for content +pref("geo.enabled", false); + +// Make sure that the request URL of the GeoLocation backend is empty +pref("geo.wifi.uri", ""); + +// Disable the least secure encryption protocols +pref("security.ssl3.ecdhe_ecdsa_rc4_128_sha", false); +pref("security.ssl3.ecdhe_rsa_rc4_128_sha", false); +pref("security.ssl3.rsa_rc4_128_md5", false); +pref("security.ssl3.rsa_rc4_128_sha", false); -- cgit v1.2.3 From 29522386e9d8b77e721526b3cc3375e07299ea74 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 25 Aug 2015 05:07:03 -0300 Subject: java8-openjdk-8.u60-1.parabola1: updating version --- libre/java8-openjdk/JDK-8074312-hotspot.patch | 12 ------ ...d_with_GCC_5_asserts_with_widen_increases.patch | 46 ---------------------- libre/java8-openjdk/PKGBUILD | 38 +++++++----------- 3 files changed, 14 insertions(+), 82 deletions(-) delete mode 100644 libre/java8-openjdk/JDK-8074312-hotspot.patch delete mode 100644 libre/java8-openjdk/JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch 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() { -- cgit v1.2.3 From e26a0d7c44921fb0323804fac6e14cc9a6c4ecbb Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 25 Aug 2015 05:24:04 -0300 Subject: iceweasel-theme-adwaita-40.1-1: updating version --- libre/iceweasel-theme-adwaita/PKGBUILD | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) 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 # Maintainer: Omar Vega Ramos +# Maintainer: André Silva # Contributor: Daniel Milewski -# Contributor: André Silva 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_\(\)35.1\(\)_\1${pkgver}\2_" "install.rdf" } package() { -- cgit v1.2.3 From 3154dfb0d81540ac16850356f688de0036479864 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 25 Aug 2015 05:25:07 -0300 Subject: ice{cat,weasel}-noscript-2.6.9.36-1: updating version --- libre/icecat-noscript/PKGBUILD | 6 +++--- libre/iceweasel-noscript/PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) 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 # Maintainer: André Silva 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/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 # Maintainer: André Silva 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") -- cgit v1.2.3 From 7809556ef483f5792255c090457abc6374b9d001 Mon Sep 17 00:00:00 2001 From: Gaming4JC Date: Tue, 25 Aug 2015 22:15:38 -0400 Subject: update background in grub2 theme --- pcr/grub2-theme-gnuaxiom/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pcr/grub2-theme-gnuaxiom/PKGBUILD b/pcr/grub2-theme-gnuaxiom/PKGBUILD index 2cdef15fc..f3aa8b887 100644 --- a/pcr/grub2-theme-gnuaxiom/PKGBUILD +++ b/pcr/grub2-theme-gnuaxiom/PKGBUILD @@ -2,7 +2,7 @@ pkgname=grub2-theme-gnuaxiom _pkgname=GNUAxiom -pkgver=1.0 +pkgver=1.01 pkgrel=1 pkgdesc="A Parabola GNU/Linux-libre theme for grub2, forked from Axiom." arch=('any') @@ -11,7 +11,7 @@ license=('GPL2') makedepends=('grub') source=("https://github.com/g4jc/$_pkgname/archive/$pkgver.tar.gz") install=("$pkgname.install") -sha512sums=('3ffee3d205d7a85a5272b46d32d608d42844e5e3941262e5b59f88b193a1822fbe720cbaee1d30540a7b4034d267fcf533ca7a3b9f5124b627ba9538a7120d3c') +sha512sums=('fce534c2f39b0fa210eeff9767f58a4aa9ad0a2f7f17edd0cea47ff217daaa6ad14c128d47eb840f03c0a675dfd1e39779cff3d6100808bdf4f62a837f116bf6') prepare() { cd $srcdir -- cgit v1.2.3 From 67f56cf6a63beaa9d44234ec126047fd7d8807c1 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 26 Aug 2015 01:37:51 -0300 Subject: icecat-38.2.0_gnu1-1: move package to [libre] --- libre-testing/icecat/PKGBUILD | 165 ---- libre-testing/icecat/freetype26.patch | 30 - libre-testing/icecat/gnu_headshadow.png | Bin 6785 -> 0 bytes libre-testing/icecat/icecat-fixed-loading-icon.png | Bin 12184 -> 0 bytes libre-testing/icecat/icecat-install-dir.patch | 12 - libre-testing/icecat/icecat.desktop | 352 -------- libre-testing/icecat/icecat.install | 13 - libre-testing/icecat/libre.patch | 890 --------------------- libre-testing/icecat/mozconfig | 38 - libre-testing/icecat/vendor.js | 28 - libre/icecat/PKGBUILD | 60 +- libre/icecat/fixing_nullptr_31.7.0.patch | 174 ---- libre/icecat/libre.patch | 43 +- libre/icecat/mozconfig | 3 +- libre/icecat/mozconfig.pgo | 3 - .../remove-google-play-services-support.patch | 64 ++ libre/icecat/rhbz-966424.patch | 14 - 17 files changed, 101 insertions(+), 1788 deletions(-) delete mode 100644 libre-testing/icecat/PKGBUILD delete mode 100644 libre-testing/icecat/freetype26.patch delete mode 100644 libre-testing/icecat/gnu_headshadow.png delete mode 100644 libre-testing/icecat/icecat-fixed-loading-icon.png delete mode 100644 libre-testing/icecat/icecat-install-dir.patch delete mode 100644 libre-testing/icecat/icecat.desktop delete mode 100644 libre-testing/icecat/icecat.install delete mode 100644 libre-testing/icecat/libre.patch delete mode 100644 libre-testing/icecat/mozconfig delete mode 100644 libre-testing/icecat/vendor.js delete mode 100644 libre/icecat/fixing_nullptr_31.7.0.patch delete mode 100644 libre/icecat/mozconfig.pgo create mode 100644 libre/icecat/remove-google-play-services-support.patch delete mode 100644 libre/icecat/rhbz-966424.patch diff --git a/libre-testing/icecat/PKGBUILD b/libre-testing/icecat/PKGBUILD deleted file mode 100644 index 9b0c72ba6..000000000 --- a/libre-testing/icecat/PKGBUILD +++ /dev/null @@ -1,165 +0,0 @@ -# Maintainer: André Silva -# Contributor: Márcio Silva -# Contributor (ConnochaetOS): Henry Jensen -# Contributor: Luke Shumaker -# Contributor: fauno -# Contributor: vando -# Contributor (Arch): Jakub Schmidtke -# Contributor: Figue -# Thank you very much to the older contributors: -# Contributor: evr -# Contributor: Muhammad 'MJ' Jassim - -_pgo=true - -pkgname=icecat -_pkgver=38.2.0-gnu1 -pkgver=${_pkgver//-/_} -pkgrel=1 - -pkgdesc="GNU IceCat, the standalone web browser based on Mozilla Firefox." -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) -options=(!emptydirs !makeflags debug) -if $_pgo; then - makedepends+=(xorg-server-xvfb) - options+=(!ccache) -fi -optdepends=('networkmanager: Location detection via available WiFi networks' - 'gst-plugins-good: h.264 video' - '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://jenkins.trisquel.info/$pkgname/$pkgname-$_pkgver.tar.bz2 - mozconfig - libre.patch - gnu_headshadow.png - $pkgname.desktop - $pkgname-install-dir.patch - freetype26.patch - vendor.js - $pkgname-fixed-loading-icon.png) -sha256sums=('eef4addf37f6fc885f28eea936cee7258d42f0cb11d79703ec7ec1fe2b80ef8d' - '33a8cf07373c63a0bea70ec2c3983d2cca990752c0f946cb5dbd91f1e2b6410f' - 'e333901df4fc8a881d08c9434e3c302885ed4a989316114e13af828417510410' - '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' - '52df9ffeb52166ed4abd9a132ee4a9017b9c4980f0725ba383610ccfb06d4745' - '5bdab2de5520fb4d3dbc453d9f73d20e0e077bf652bc780fc17184ba6c718a47' - 'b9c440406644fde5097da8717f0b5e5e973d11ec4dd6d4a0570ca7094d96dc85' - '977aa49b940f1da049cefa2878a63ac6669a78e63e9d55bb11db7b8f8fb64c33' - '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213') -#validpgpkeys=('A57369A8BABC2542B5A0368C3C76EED7D7E04784') # Ruben Rodriguez - -prepare() { - export GNU_BUILD="gnuzilla-release" - - mv $pkgname-${pkgver%_*} "$srcdir/$GNU_BUILD" - cd "$srcdir/$GNU_BUILD" - - # Put gnu_headshadow.png on the source code - install -m644 "$srcdir/gnu_headshadow.png" \ - browser/base/content/abouthome - - # Install to /usr/lib/$pkgname - patch -Np1 -i "$srcdir/$pkgname-install-dir.patch" - - # https://bugzilla.mozilla.org/show_bug.cgi?id=1143411 - patch -Np1 -i "$srcdir/freetype26.patch" - - # Patch and remove anything that's left - patch -Np1 -i "$srcdir/libre.patch" - rm -v browser/base/content/abouthome/snippet*.png || true - sed -i '\|abouthome/snippet|d - ' browser/base/jar.mn - - # Replace common URLs - sed -i '\|extensions[.]getAddons[.]get[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g; - \|extensions[.]getAddons[.]search[.]browseURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g; - \|extensions[.]getAddons[.]search[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g; - \|extensions[.]getAddons[.]search[.]url| s|https://directory[.]fsf[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g; - \|extensions[.]webservice[.]discoverURL| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g; - \|extensions[.]webservice[.]discoverURL| s|https://directory[.]fsf[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g; - \|browser[.]search[.]searchEnginesURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g; - \|browser[.]search[.]searchEnginesURL| s|https://mycroft[.]mozdev[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g; - \|plugins[.]update[.]url| s|https://www[.]mozilla[.]org/[%]LOCALE[%]/plugincheck/["][)][;]|https://trisquel.info/en/browser");|g; - \|plugins[.]update[.]url| s|https://www[.]gnu[.]org/software/gnuzilla/["][)][;]|https://trisquel.info/en/browser");|g; - ' browser/app/profile/icecat.js - - # Load our build config, disable SafeSearch - cp "$srcdir/mozconfig" .mozconfig - - mkdir "$srcdir/path" - - # WebRTC build tries to execute "python" and expects Python 2 - ln -s /usr/bin/python2 "$srcdir/path/python" - - # configure script misdetects the preprocessor without an optimization level - # https://bugs.archlinux.org/task/34644 - sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure - - # Fix tab loading icon (doesn't work with libpng 1.6) - # https://bugzilla.mozilla.org/show_bug.cgi?id=841734 - cp "$srcdir/$pkgname-fixed-loading-icon.png" \ - browser/themes/linux/tabbrowser/loading.png -} - -build() { - export GNU_BUILD="gnuzilla-release" - - cd "$srcdir/$GNU_BUILD" - - export PATH="$srcdir/path:$PATH" - export PYTHON="/usr/bin/python2" - - if $_pgo; then - # Do PGO - xvfb-run -a -s "-extension GLX -screen 0 1280x1024x24" \ - make -f client.mk build MOZ_PGO=1 - else - make -f client.mk build - fi -} - -package() { - export GNU_BUILD="gnuzilla-release" - - cd "$srcdir/$GNU_BUILD" - make -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install - - install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js" - - - brandingdir=browser/branding/official - icondir="$pkgdir/usr/share/icons/hicolor" - for i in 16x16 32x32 48x48; do - install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$pkgname.png" - done - install -Dm644 "$brandingdir/content/icon64.png" \ - "$icondir/64x64/apps/$pkgname.png" - install -Dm644 "$brandingdir/mozicon128.png" \ - "$icondir/128x128/apps/$pkgname.png" - install -Dm644 "$brandingdir/content/about-logo.png" \ - "$icondir/192x192/apps/$pkgname.png" - install -Dm644 "$brandingdir/content/about-logo@2x.png" \ - "$icondir/384x384/apps/$pkgname.png" - - install -d "$pkgdir/usr/share/applications" - install -m644 "$srcdir/$pkgname.desktop" \ - "$pkgdir/usr/share/applications" - - # Use system-provided dictionaries - rm -rf "$pkgdir/usr/lib/$pkgname/"{dictionaries,hyphenation} - 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-testing/icecat/freetype26.patch b/libre-testing/icecat/freetype26.patch deleted file mode 100644 index c1eb49497..000000000 --- a/libre-testing/icecat/freetype26.patch +++ /dev/null @@ -1,30 +0,0 @@ - -# HG changeset patch -# User NiLuJe -# Date 1426721573 14400 -# Node ID afd840d66e6a775dc2ed35dd3add01ff07f950fe -# Parent 35515400af363bfc141353acd474814567c43c54 -Bug 1143411 - Fix build against latest freetype code. r=glandium - -diff --git a/config/system-headers b/config/system-headers ---- a/config/system-headers -+++ b/config/system-headers -@@ -465,16 +465,17 @@ freetype/tttables.h - freetype/t1tables.h - freetype/ftlcdfil.h - freetype/ftsizes.h - freetype/ftadvanc.h - freetype/ftbitmap.h - freetype/ftxf86.h - freetype.h - ftcache.h -+ftfntfmt.h - ftglyph.h - ftsynth.h - ftoutln.h - ttnameid.h - tttables.h - t1tables.h - ftlcdfil.h - ftsizes.h - diff --git a/libre-testing/icecat/gnu_headshadow.png b/libre-testing/icecat/gnu_headshadow.png deleted file mode 100644 index e0f73a3bf..000000000 Binary files a/libre-testing/icecat/gnu_headshadow.png and /dev/null differ diff --git a/libre-testing/icecat/icecat-fixed-loading-icon.png b/libre-testing/icecat/icecat-fixed-loading-icon.png deleted file mode 100644 index 55f25e591..000000000 Binary files a/libre-testing/icecat/icecat-fixed-loading-icon.png and /dev/null differ diff --git a/libre-testing/icecat/icecat-install-dir.patch b/libre-testing/icecat/icecat-install-dir.patch deleted file mode 100644 index e15bf0b68..000000000 --- a/libre-testing/icecat/icecat-install-dir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur a/config/baseconfig.mk c/config/baseconfig.mk ---- a/config/baseconfig.mk 2014-10-09 12:52:39.000000000 -0200 -+++ b/config/baseconfig.mk 2014-10-21 18:34:35.803894661 -0200 -@@ -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-testing/icecat/icecat.desktop b/libre-testing/icecat/icecat.desktop deleted file mode 100644 index d2c0ccb03..000000000 --- a/libre-testing/icecat/icecat.desktop +++ /dev/null @@ -1,352 +0,0 @@ -[Desktop Entry] -Name=GNU IceCat -GenericName=Web Browser -GenericName[ar]=متصفح ويب -GenericName[ast]=Restolador Web -GenericName[bn]=ওয়েব ব্রাউজার -GenericName[ca]=Navegador web -GenericName[cs]=Webový prohlížeč -GenericName[da]=Webbrowser -GenericName[el]=Περιηγητής διαδικτύου -GenericName[es]=Navegador web -GenericName[et]=Veebibrauser -GenericName[fa]=مرورگر اینترنتی -GenericName[fi]=WWW-selain -GenericName[fr]=Navigateur Web -GenericName[gl]=Navegador Web -GenericName[he]=דפדפן אינטרנט -GenericName[hr]=Web preglednik -GenericName[hu]=Webböngésző -GenericName[it]=Browser web -GenericName[ja]=ウェブ・ブラウザ -GenericName[ko]=웹 브라우저 -GenericName[ku]=Geroka torê -GenericName[lt]=Interneto naršyklė -GenericName[nb]=Nettleser -GenericName[nl]=Webbrowser -GenericName[nn]=Nettlesar -GenericName[no]=Nettleser -GenericName[pl]=Przeglądarka WWW -GenericName[pt]=Navegador Web -GenericName[pt_BR]=Navegador Web -GenericName[ro]=Navigator Internet -GenericName[ru]=Веб-браузер -GenericName[sk]=Internetový prehliadač -GenericName[sl]=Spletni brskalnik -GenericName[sv]=Webbläsare -GenericName[tr]=Web Tarayıcı -GenericName[ug]=توركۆرگۈ -GenericName[uk]=Веб-браузер -GenericName[vi]=Trình duyệt Web -GenericName[zh_CN]=网络浏览器 -GenericName[zh_TW]=網路瀏覽器 -Comment=Browse the World Wide Web -Comment[ar]=تصفح الشبكة العنكبوتية العالمية -Comment[ast]=Restola pela Rede -Comment[bn]=ইন্টারনেট ব্রাউজ করুন -Comment[ca]=Navegueu per la web -Comment[cs]=Prohlížení stránek World Wide Webu -Comment[da]=Surf på internettet -Comment[de]=Im Internet surfen -Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web) -Comment[es]=Navegue por la web -Comment[et]=Lehitse veebi -Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید -Comment[fi]=Selaa Internetin WWW-sivuja -Comment[fr]=Naviguer sur le Web -Comment[gl]=Navegar pola rede -Comment[he]=גלישה ברחבי האינטרנט -Comment[hr]=Pretražite web -Comment[hu]=A világháló böngészése -Comment[it]=Esplora il web -Comment[ja]=ウェブを閲覧します -Comment[ko]=웹을 돌아 다닙니다 -Comment[ku]=Li torê bigere -Comment[lt]=Naršykite internete -Comment[nb]=Surf på nettet -Comment[nl]=Verken het internet -Comment[nn]=Surf på nettet -Comment[no]=Surf på nettet -Comment[pl]=Przeglądanie stron WWW -Comment[pt]=Navegue na Internet -Comment[pt_BR]=Navegue na Internet -Comment[ro]=Navigați pe Internet -Comment[ru]=Доступ в Интернет -Comment[sk]=Prehliadanie internetu -Comment[sl]=Brskajte po spletu -Comment[sv]=Surfa på webben -Comment[tr]=İnternet'te Gezinin -Comment[ug]=دۇنيادىكى توربەتلەرنى كۆرگىلى بولىدۇ -Comment[uk]=Перегляд сторінок Інтернету -Comment[vi]=Để duyệt các trang web -Comment[zh_CN]=浏览互联网 -Comment[zh_TW]=瀏覽網際網路 -Exec=icecat %u -Terminal=false -Type=Application -Icon=icecat -Categories=Network;WebBrowser; -MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp; -StartupNotify=true -Actions=NewTab;NewWindow;NewPrivateWindow; - -[Desktop Action NewTab] -Name=Open new tab -Name[ach]=Yab dirica matidi manyen -Name[af]=Open nuwe oortjie -Name[an]=Ubrir una pestanya nueva -Name[ar]=افتح لسانًا جديدًا -Name[as]=নতুন টেব খোলক -Name[ast]=Abrir llingüeta nueva -Name[az]=Yeni vərəq aç -Name[be]=Адкрыць новую ўстаўку -Name[bg]=Отваряне на нов подпрозорец -Name[bn_BD]=নতুন ট্যাব খুলুন -Name[bn_IN]=নতুন ট্যাব খুলুন -Name[br]=Digeriñ un ivinell nevez -Name[bs]=Otvori novi tab -Name[ca]=Obre una pestanya nova -Name[cs]=Otevřít nový panel -Name[cy]=Agor tab newydd -Name[da]=Åbn nyt faneblad -Name[de]=Neuen Tab öffnen -Name[dsb]=Nowy rejtark wócyniś -Name[el]=Άνοιγμα νέας καρτέλας -Name[eo]=Malfermi novan langeton -Name[es_AR]=Abrir nueva pestaña -Name[es_CL]=Abrir nueva pestaña -Name[es_ES]=Abrir pestaña nueva -Name[es_MX]=Abrir una pestaña nueva -Name[et]=Ava uus kaart -Name[eu]=Ireki fitxa berria -Name[ff]=Uddit tabbere hesere -Name[fi]=Avaa uusi välilehti -Name[fr]=Ouvrir un nouvel onglet -Name[fy_NL]=Iepenje nij ljepblêd -Name[ga_IE]=Oscail i gcluaisín nua -Name[gd]=Fosgail taba ùr -Name[gl]=Abrir unha nova lapela -Name[gu_IN]=નવી ટૅબને ખોલો -Name[he]=פתיחת לשונית חדשה -Name[hi_IN]=नया टैब खोलें -Name[hr]=Otvori novu karticu -Name[hsb]=Nowy rajtark wočinić -Name[hu]=Új lap megnyitása -Name[hy_AM]=Բացել նոր ներդիր -Name[id]=Buka tab baru -Name[is]=Opna nýjan flipa -Name[it]=Apri nuova scheda -Name[ja]=新しいタブ -Name[kk]=Жаңа бетті ашу -Name[kn]=ಹೊಸ ಹಾಳೆಯನ್ನು ತೆರೆ -Name[ko]=새 탭 열기 -Name[lij]=Àrvi nêuvo féuggio -Name[lt]=Atverti naują kortelę -Name[mai]=नव टैब खोलू -Name[mk]=Отвори ново јазиче -Name[ml]=പുതിയ റ്റാബ് തുറക്കുക -Name[mr]=नवीन टॅब उघडा -Name[ms]=Buka tab baru -Name[nb_NO]=Åpne ny fane -Name[nl]=Nieuw tabblad openen -Name[nn_NO]=Opna ny fane -Name[or]=ନୂତନ ଟ୍ୟାବ ଖୋଲନ୍ତୁ -Name[pa_IN]=ਨਵੀਂ ਟੈਬ ਖੋਲ੍ਹੋ -Name[pl]=Otwórz nową kartę -Name[pt_BR]=Nova aba -Name[pt_PT]=Abrir novo separador -Name[rm]=Avrir in nov tab -Name[ro]=Deschide o filă nouă -Name[ru]=Открыть новую вкладку -Name[si]=නව ටැබය විවෘත කරන්න -Name[sk]=Otvoriť novú kartu -Name[sl]=Odpri nov zavihek -Name[son]=Nor loku taaga feeri -Name[sq]=Hap skedë të re -Name[sr]=Отвори нови језичак -Name[sv_SE]=Öppna ny flik -Name[ta]=புதிய கீற்றைத் திற -Name[te]=కొత్త టాబ్ తెరువుము -Name[th]=เปิดแท็บใหม่ -Name[tr]=Yeni sekme aç -Name[uk]=Відкрити нову вкладку -Name[uz]=Yangi ichki oyna ochish -Name[vi]=Mở thẻ mới -Name[xh]=Vula ithebhu entsha -Name[zh_CN]=打开新标签页 -Name[zh_TW]=開啟新分頁 -Exec=icecat -new-tab about:newtab - -[Desktop Action NewWindow] -Name=Open new window -Name[ach]=Yab dirica manyen -Name[af]=Open nuwe venster -Name[an]=Ubrir una nueva finestra -Name[ar]=افتح نافذة جديدة -Name[as]=নতুন উইন্ডো খোলক -Name[ast]=Abrir ventana nueva -Name[az]=Yeni pəncərə aç -Name[be]=Адкрыць новае акно -Name[bg]=Отваряне на нов прозорец -Name[bn_BD]=নতুন উইন্ডো খুলুন -Name[bn_IN]=নতুন উইন্ডো খুলুন -Name[br]=Digeriñ ur prenestr nevez -Name[bs]=Otvori novi prozor -Name[ca]=Obre una finestra nova -Name[cs]=Otevřít nové okno -Name[cy]=Agor ffenestr newydd -Name[da]=Åbn nyt vindue -Name[de]=Neues Fenster öffnen -Name[dsb]=Nowe wokno wócyniś -Name[el]=Άνοιγμα νέου παραθύρου -Name[eo]=Malfermi novan fenestron -Name[es_AR]=Abrir nueva ventana -Name[es_CL]=Abrir nueva ventana -Name[es_ES]=Abrir nueva ventana -Name[es_MX]=Abrir nueva ventana -Name[et]=Ava uus aken -Name[eu]=Ireki leiho berria -Name[ff]=Uddit henorde hesere -Name[fi]=Avaa uusi ikkuna -Name[fr]=Ouvrir une nouvelle fenêtre -Name[fy_NL]=Iepenje nij finster -Name[ga_IE]=Oscail fuinneog nua -Name[gd]=Fosgail uinneag ùr -Name[gl]=Abrir unha nova xanela -Name[gu_IN]=નવી વિન્ડોને ખોલો -Name[he]=פתח חלון חדש -Name[hi_IN]=नई विंडो खोलें -Name[hr]=Otvori novi prozor -Name[hsb]=Nowe wokno wočinić -Name[hu]=Új ablak megnyitása -Name[hy_AM]=Բացել նոր պատուհան -Name[id]=Buka jendela baru -Name[is]=Opna nýjan glugga -Name[it]=Apri nuova finestra -Name[ja]=新しいウィンドウ -Name[kk]=Жаңа терезені ашу -Name[kn]=ಹೊಸ ವಿಂಡೊವನ್ನು ತೆರೆ -Name[ko]=새 창 열기 -Name[lij]=Àrvi nêuvo barcón -Name[lt]=Atverti naują langą -Name[mai]=नई विंडो खोलू -Name[mk]=Отвори нов прозорец -Name[ml]=പുതിയ ജാലകം തുറക്കുക -Name[mr]=नवीन पटल उघडा -Name[ms]=Buka tetingkap baru -Name[nb_NO]=Åpne nytt vindu -Name[nl]=Een nieuw venster openen -Name[nn_NO]=Opna nytt vindauge -Name[or]=ନୂତନ ୱିଣ୍ଡୋ ଖୋଲନ୍ତୁ -Name[pa_IN]=ਨਵੀਂ ਵਿੰਡੋ ਖੋਲ੍ਹੋ -Name[pl]=Otwórz nowe okno -Name[pt_BR]=Nova janela -Name[pt_PT]=Abrir nova janela -Name[rm]=Avrir ina nova fanestra -Name[ro]=Deschide o nouă fereastră -Name[ru]=Открыть новое окно -Name[si]=නව කවුළුවක් විවෘත කරන්න -Name[sk]=Otvoriť nové okno -Name[sl]=Odpri novo okno -Name[son]=Zanfun taaga feeri -Name[sq]=Hap dritare të re -Name[sr]=Отвори нови прозор -Name[sv_SE]=Öppna nytt fönster -Name[ta]=புதிய சாளரத்தை திற -Name[te]=కొత్త విండో తెరువుము -Name[th]=เปิดหน้าต่างใหม่ -Name[tr]=Yeni pencere aç -Name[uk]=Відкрити нове вікно -Name[uz]=Yangi oyna ochish -Name[vi]=Mở cửa sổ mới -Name[xh]=Vula iwindow entsha -Name[zh_CN]=打开新窗口 -Name[zh_TW]=開啟新視窗 -Exec=icecat -new-window - -[Desktop Action NewPrivateWindow] -Name=New private window -Name[ach]=Dirica manyen me mung -Name[af]=Nuwe privaatvenster -Name[an]=Nueva finestra de navegación privada -Name[ar]=نافذة خاصة جديدة -Name[as]=নতুন ব্যক্তিগত উইন্ডো -Name[ast]=Ventana privada nueva -Name[az]=Yeni məxfi pəncərə -Name[be]=Новае акно адасаблення -Name[bg]=Нов прозорец за поверително сърфиране -Name[bn_BD]=নতুন ব্যক্তিগত উইন্ডো -Name[bn_IN]=নতুন ব্যাক্তিগত উইন্ডো -Name[br]=Prenestr merdeiñ prevez nevez -Name[bs]=Novi privatni prozor -Name[ca]=Finestra privada nova -Name[cs]=Nové anonymní okno -Name[cy]=Ffenestr breifat newydd -Name[da]=Nyt privat vindue -Name[de]=Neues privates Fenster öffnen -Name[dsb]=Nowe priwatne wokno -Name[el]=Νέο παράθυρο ιδιωτικής περιήγησης -Name[eo]=Nova privata fenestro -Name[es_AR]=Nueva ventana privada -Name[es_CL]=Nueva ventana privada -Name[es_ES]=Nueva ventana privada -Name[es_MX]=Nueva ventana privada -Name[et]=Uus privaatne aken -Name[eu]=Leiho pribatu berria -Name[ff]=Henorde suturo hesere -Name[fi]=Uusi yksityinen ikkuna -Name[fr]=Nouvelle fenêtre de navigation privée -Name[fy_NL]=Nij priveefinster -Name[ga_IE]=Fuinneog nua phríobháideach -Name[gd]=Uinneag phrìobhaideach ùr -Name[gl]=Nova xanela privada -Name[gu_IN]=નવી ખાનગી વિન્ડો -Name[he]=חלון פרטי חדש -Name[hi_IN]=नया निजी विंडो -Name[hr]=Novi privatni prozor -Name[hsb]=Nowe priwatne wokno -Name[hu]=Új privát ablak -Name[hy_AM]=Գաղտնի դիտարկում -Name[id]=Jendela mode pribadi baru -Name[is]=Nýr einkagluggi -Name[it]=Nuova finestra anonima -Name[ja]=新しいプライベートウィンドウ -Name[kk]=Жаңа жекелік терезе -Name[kn]=ಹೊಸ ಖಾಸಗಿ ಕಿಟಕಿ -Name[ko]=새 사생활 보호 창 -Name[lij]=Nêuvo barcón privòu -Name[lt]=Atverti privačiojo naršymo langą -Name[mai]=नव निज विंडो -Name[mk]=Нов прозорец за приватно сурфање -Name[ml]=പുതിയ സ്വകാര്യ ജാലകം -Name[mr]=नवीन वैयक्तिक पटल -Name[ms]=Tetingkap peribadi baharu -Name[nb_NO]=Nytt privat vindu -Name[nl]=Nieuw privévenster -Name[nn_NO]=Nytt privat vindauge -Name[or]=ନୂତନ ବ୍ୟକ୍ତିଗତ ୱିଣ୍ଡୋ -Name[pa_IN]=ਨਵੀਂ ਪ੍ਰਾਈਵੇਟ ਵਿੰਡੋ -Name[pl]=Nowe okno w trybie prywatnym -Name[pt_BR]=Nova janela privativa -Name[pt_PT]=Nova janela privada -Name[rm]=Nova fanestra privata -Name[ro]=Fereastră fără urme nouă -Name[ru]=Новое приватное окно -Name[si]=නව පුද්ගලික කවුළුව -Name[sk]=Nové okno v režime Súkromné prehliadanie -Name[sl]=Novo zasebno okno -Name[son]=Sutura zanfun taaga -Name[sq]=Dritare e re private -Name[sr]=Нови приватни прозор -Name[sv_SE]=Nytt privat fönster -Name[ta]=புதிய தனிப்பட்ட சாளரம் -Name[te]=కొత్త ఆంతరంగిక విండో -Name[th]=หน้าต่างท่องเว็บแบบส่วนตัวใหม่ -Name[tr]=Yeni gizli pencere -Name[uk]=Нове приватне вікно -Name[uz]=Yangi shaxsiy oyna -Name[vi]=Cửa sổ riêng tư mới -Name[xh]=Ifestile yangasese entsha -Name[zh_CN]=新建隐私浏览窗口 -Name[zh_TW]=新增隱私視窗 -Exec=icecat -private-window diff --git a/libre-testing/icecat/icecat.install b/libre-testing/icecat/icecat.install deleted file mode 100644 index 1a1f4b16b..000000000 --- a/libre-testing/icecat/icecat.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - diff --git a/libre-testing/icecat/libre.patch b/libre-testing/icecat/libre.patch deleted file mode 100644 index ee88c6d56..000000000 --- a/libre-testing/icecat/libre.patch +++ /dev/null @@ -1,890 +0,0 @@ -diff -Nur a/browser/app/profile/icecat.js b/browser/app/profile/icecat.js ---- 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.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); -@@ -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 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; - } - --#searchForm, --#snippets { -- width: 470px; --} -- - #searchForm { - display: -moz-box; - } -@@ -72,8 +67,7 @@ - #searchEngineLogo { - display: inline-block; - height: 28px; -- width: 70px; -- min-width: 70px; -+ width: 28px; - } - - #searchText { -@@ -145,48 +139,6 @@ - transition-duration: 0ms; - } - --#defaultSnippet1, --#defaultSnippet2, --#rightsSnippet { -- display: block; -- min-height: 38px; -- background: 30px center no-repeat; -- padding: 6px 0; -- -moz-padding-start: 79px; --} -- --#rightsSnippet[hidden] { -- display: none; --} -- --#defaultSnippet1:-moz-dir(rtl), --#defaultSnippet2:-moz-dir(rtl), --#rightsSnippet:-moz-dir(rtl) { -- background-position: right 30px center; --} -- --#defaultSnippet1 { -- background-image: url("chrome://browser/content/abouthome/snippet1.png"); --} -- --#defaultSnippet2 { -- background-image: url("chrome://browser/content/abouthome/snippet2.png"); --} -- --#snippets { -- display: inline-block; -- text-align: start; -- margin: 12px 0; -- color: #3c3c3c; -- font-size: 75%; -- /* 12px is the computed font size, 15px the computed line height of the snippets -- with Segoe UI on a default Windows 7 setup. The 15/12 multiplier approximately -- converts em from units of font-size to units of line-height. The goal is to -- preset the height of a three-line snippet to avoid visual moving/flickering as -- the snippets load. */ -- min-height: calc(15/12 * 3em); --} -- - #launcher { - display: -moz-box; - -moz-box-align: center; -@@ -335,26 +287,25 @@ - width: 32px; - } - --#aboutMozilla { -+#aboutGNU { - display: block; -- position: relative; /* pin wordmark to edge of document, not of viewport */ - -moz-box-ordinal-group: 0; - opacity: .5; - transition: opacity 150ms; - } - --#aboutMozilla:hover { -+#aboutGNU:hover { - opacity: 1; - } - --#aboutMozilla::before { -- content: url("chrome://browser/content/abouthome/mozilla.png"); -+#aboutGNU::before { -+ content: url("chrome://browser/content/abouthome/gnu_headshadow.png"); - display: block; - position: absolute; - top: 12px; - right: 12px; -- width: 69px; -- height: 19px; -+ width: 200px; -+ height: 110px; - } - - /* [HiDPI] -@@ -366,26 +317,6 @@ - background-image: url("chrome://branding/content/about-logo@2x.png"); - } - -- #defaultSnippet1, -- #defaultSnippet2, -- #rightsSnippet { -- background-size: 40px; -- } -- -- #defaultSnippet1 { -- background-image: url("chrome://browser/content/abouthome/snippet1@2x.png"); -- } -- -- #defaultSnippet2 { -- background-image: url("chrome://browser/content/abouthome/snippet2@2x.png"); -- } -- -- .launchButton::before, -- #aboutMozilla::before { -- transform: scale(.5); -- transform-origin: 0 0; -- } -- - #downloads::before { - content: url("chrome://browser/content/abouthome/downloads@2x.png"); - } -@@ -421,9 +352,5 @@ - body[narrow] #restorePreviousSession::before { - content: url("chrome://browser/content/abouthome/restore@2x.png"); - } -- -- #aboutMozilla::before { -- content: url("chrome://browser/content/abouthome/mozilla@2x.png"); -- } - } - -diff -Nur a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js ---- 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 = { -- "Google": { -- // This is the "2x" image designed for OS X retina resolution, Windows at 192dpi, etc.; -- // it will be scaled down as necessary on lower-dpi displays. -- image: "data:image/png;base64," + -- "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" -+ "searx": { -+ image: "data:image/png;base64,\ -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" - } - }; - --// The process of adding a new default snippet involves: --// * add a new entity to aboutHome.dtd --// * add a for it in aboutHome.xhtml --// * add an entry here in the proper ordering (based on spans) --// The part of the snippet will be linked to the corresponding url. --const DEFAULT_SNIPPETS_URLS = [ "" ]; -- --const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day. -- --// IndexedDB storage constants. --const DATABASE_NAME = "abouthome"; --const DATABASE_VERSION = 1; --const SNIPPETS_OBJECTSTORE_NAME = "snippets"; -- - // 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 +58,6 @@ - if (mutation.attributeName == "searchEngineName") { - setupSearchEngine(); - if (!gInitialized) { --// ensureSnippetsMapThen(loadSnippets); - gInitialized = true; - } - return; -@@ -178,118 +82,6 @@ - window.removeEventListener("resize", fitToWidth); - }); - --// This object has the same interface as Map and is used to store and retrieve --// the snippets data. It is lazily initialized by ensureSnippetsMapThen(), so --// be sure its callback returned before trying to use it. --let gSnippetsMap; --let gSnippetsMapCallbacks = []; -- --/** -- * Ensure the snippets map is properly initialized. -- * -- * @param aCallback -- * Invoked once the map has been initialized, gets the map as argument. -- * @note Snippets should never directly manage the underlying storage, since -- * it may change inadvertently. -- */ --function ensureSnippetsMapThen(aCallback) --{ --return; -- if (gSnippetsMap) { -- aCallback(gSnippetsMap); -- return; -- } -- -- // Handle multiple requests during the async initialization. -- gSnippetsMapCallbacks.push(aCallback); -- if (gSnippetsMapCallbacks.length > 1) { -- // We are already updating, the callbacks will be invoked when done. -- return; -- } -- -- let invokeCallbacks = function () { -- if (!gSnippetsMap) { -- gSnippetsMap = Object.freeze(new Map()); -- } -- -- for (let callback of gSnippetsMapCallbacks) { -- callback(gSnippetsMap); -- } -- gSnippetsMapCallbacks.length = 0; -- } -- -- let openRequest = indexedDB.open(DATABASE_NAME, DATABASE_VERSION); -- -- openRequest.onerror = function (event) { -- // Try to delete the old database so that we can start this process over -- // next time. -- indexedDB.deleteDatabase(DATABASE_NAME); -- invokeCallbacks(); -- }; -- -- openRequest.onupgradeneeded = function (event) { -- let db = event.target.result; -- if (!db.objectStoreNames.contains(SNIPPETS_OBJECTSTORE_NAME)) { -- db.createObjectStore(SNIPPETS_OBJECTSTORE_NAME); -- } -- } -- -- openRequest.onsuccess = function (event) { -- let db = event.target.result; -- -- db.onerror = function (event) { -- invokeCallbacks(); -- } -- -- db.onversionchange = function (event) { -- event.target.close(); -- invokeCallbacks(); -- } -- -- let cache = new Map(); -- let cursorRequest = db.transaction(SNIPPETS_OBJECTSTORE_NAME) -- .objectStore(SNIPPETS_OBJECTSTORE_NAME).openCursor(); -- cursorRequest.onerror = function (event) { -- invokeCallbacks(); -- } -- -- cursorRequest.onsuccess = function(event) { -- let cursor = event.target.result; -- -- // Populate the cache from the persistent storage. -- if (cursor) { -- cache.set(cursor.key, cursor.value); -- cursor.continue(); -- return; -- } -- -- // The cache has been filled up, create the snippets map. -- gSnippetsMap = Object.freeze({ -- get: function (aKey) cache.get(aKey), -- set: function (aKey, aValue) { -- db.transaction(SNIPPETS_OBJECTSTORE_NAME, "readwrite") -- .objectStore(SNIPPETS_OBJECTSTORE_NAME).put(aValue, aKey); -- return cache.set(aKey, aValue); -- }, -- has: function (aKey) cache.has(aKey), -- delete: function (aKey) { -- db.transaction(SNIPPETS_OBJECTSTORE_NAME, "readwrite") -- .objectStore(SNIPPETS_OBJECTSTORE_NAME).delete(aKey); -- return cache.delete(aKey); -- }, -- clear: function () { -- db.transaction(SNIPPETS_OBJECTSTORE_NAME, "readwrite") -- .objectStore(SNIPPETS_OBJECTSTORE_NAME).clear(); -- return cache.clear(); -- }, -- get size() cache.size -- }); -- -- setTimeout(invokeCallbacks, 0); -- } -- } --} -- - function onSearchSubmit(aEvent) - { - let searchTerms = document.getElementById("searchText").value; -@@ -339,159 +131,6 @@ - - } - --/** -- * Inform the test harness that we're done loading the page. -- */ --function loadSucceeded() --{ -- var event = new CustomEvent("AboutHomeLoadSnippetsSucceeded", {bubbles:true}); -- document.dispatchEvent(event); --} -- --/** -- * Update the local snippets from the remote storage, then show them through -- * showSnippets. -- */ --function loadSnippets() --{ --return; -- if (!gSnippetsMap) -- throw new Error("Snippets map has not properly been initialized"); -- -- // Allow tests to modify the snippets map before using it. -- var event = new CustomEvent("AboutHomeLoadSnippets", {bubbles:true}); -- document.dispatchEvent(event); -- -- // Check cached snippets version. -- let cachedVersion = gSnippetsMap.get("snippets-cached-version") || 0; -- let currentVersion = document.documentElement.getAttribute("snippetsVersion"); -- if (cachedVersion < currentVersion) { -- // The cached snippets are old and unsupported, restart from scratch. -- gSnippetsMap.clear(); -- } -- -- // Check last snippets update. -- let lastUpdate = gSnippetsMap.get("snippets-last-update"); -- let updateURL = document.documentElement.getAttribute("snippetsURL"); -- let shouldUpdate = !lastUpdate || -- Date.now() - lastUpdate > SNIPPETS_UPDATE_INTERVAL_MS; -- if (updateURL && shouldUpdate) { -- // Try to update from network. -- let xhr = new XMLHttpRequest(); -- try { -- xhr.open("GET", updateURL, true); -- } catch (ex) { -- showSnippets(); -- loadSucceeded(); -- return; -- } -- // Even if fetching should fail we don't want to spam the server, thus -- // set the last update time regardless its results. Will retry tomorrow. -- gSnippetsMap.set("snippets-last-update", Date.now()); -- xhr.onerror = function (event) { -- showSnippets(); -- }; -- xhr.onload = function (event) -- { -- if (xhr.status == 200) { -- gSnippetsMap.set("snippets", xhr.responseText); -- gSnippetsMap.set("snippets-cached-version", currentVersion); -- } -- showSnippets(); -- loadSucceeded(); -- }; -- xhr.send(null); -- } else { -- showSnippets(); -- loadSucceeded(); -- } --} -- --/** -- * Shows locally cached remote snippets, or default ones when not available. -- * -- * @note: snippets should never invoke showSnippets(), or they may cause -- * a "too much recursion" exception. -- */ --let _snippetsShown = false; --function showSnippets() --{ --return; -- let snippetsElt = document.getElementById("snippets"); -- -- // Show about:rights notification, if needed. -- let showRights = document.documentElement.getAttribute("showKnowYourRights"); -- if (showRights) { -- let rightsElt = document.getElementById("rightsSnippet"); -- let anchor = rightsElt.getElementsByTagName("a")[0]; -- anchor.href = "about:rights"; -- snippetsElt.appendChild(rightsElt); -- rightsElt.removeAttribute("hidden"); -- return; -- } -- -- if (!gSnippetsMap) -- throw new Error("Snippets map has not properly been initialized"); -- if (_snippetsShown) { -- // There's something wrong with the remote snippets, just in case fall back -- // to the default snippets. -- showDefaultSnippets(); -- throw new Error("showSnippets should never be invoked multiple times"); -- } -- _snippetsShown = true; -- -- let snippets = gSnippetsMap.get("snippets"); -- // If there are remotely fetched snippets, try to to show them. -- if (snippets) { -- // Injecting snippets can throw if they're invalid XML. -- try { -- snippetsElt.innerHTML = snippets; -- // Scripts injected by innerHTML are inactive, so we have to relocate them -- // through DOM manipulation to activate their contents. -- Array.forEach(snippetsElt.getElementsByTagName("script"), function(elt) { -- let relocatedScript = document.createElement("script"); -- relocatedScript.type = "text/javascript;version=1.8"; -- relocatedScript.text = elt.text; -- elt.parentNode.replaceChild(relocatedScript, elt); -- }); -- return; -- } catch (ex) { -- // Bad content, continue to show default snippets. -- } -- } -- -- showDefaultSnippets(); --} -- --/** -- * Clear snippets element contents and show default snippets. -- */ --function showDefaultSnippets() --{ --return; -- // Clear eventual contents... -- let snippetsElt = document.getElementById("snippets"); -- snippetsElt.innerHTML = ""; -- -- // ...then show default snippets. -- let defaultSnippetsElt = document.getElementById("defaultSnippets"); -- let entries = defaultSnippetsElt.querySelectorAll("span"); -- // Choose a random snippet. Assume there is always at least one. -- let randIndex = Math.floor(Math.random() * entries.length); -- let entry = entries[randIndex]; -- // Inject url in the eventual link. -- if (DEFAULT_SNIPPETS_URLS[randIndex]) { -- let links = entry.getElementsByTagName("a"); -- // Default snippets can have only one link, otherwise something is messed -- // up in the translation. -- if (links.length == 1) { -- links[0].href = DEFAULT_SNIPPETS_URLS[randIndex]; -- } -- } -- // Move the default snippet to the snippets element. -- snippetsElt.appendChild(entry); --} -- - function fitToWidth() { - 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 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 @@ - - -
--
-+ - -- -+ -
-
- -@@ -101,6 +101,7 @@ - -
- -+ - - - -diff -Nur a/browser/base/jar.mn b/browser/base/jar.mn ---- a/browser/base/jar.mn 2014-10-09 12:53:30.000000000 -0200 -+++ b/browser/base/jar.mn 2014-10-21 14:24:18.198691296 -0200 -@@ -32,6 +32,7 @@ - content/browser/abouthome/settings.png (content/abouthome/settings.png) - content/browser/abouthome/restore.png (content/abouthome/restore.png) - content/browser/abouthome/restore-large.png (content/abouthome/restore-large.png) -+ content/browser/abouthome/gnu_headshadow.png (content/abouthome/gnu_headshadow.png) - content/browser/abouthome/snippet1@2x.png (content/abouthome/snippet1@2x.png) - 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-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 @@ - - - -- --latest features."> -- --Choose from thousands of add-ons."> -- --Know your rights…"> -- - - - never show, false --> always show) -- try { -- return !Services.prefs.getBoolPref("browser.rights.override"); -- } catch (e) { } -- // Ditto, for the legacy EULA pref. -- try { -- return !Services.prefs.getBoolPref("browser.EULA.override"); -- } catch (e) { } -- --#ifndef MOZILLA_OFFICIAL -- // Non-official builds shouldn't show the notification. -- return false; --#endif -- -- // Look to see if the user has seen the current version or not. -- var currentVersion = Services.prefs.getIntPref("browser.rights.version"); -- try { -- return !Services.prefs.getBoolPref("browser.rights." + currentVersion + ".shown"); -- } catch (e) { } -- -- // Legacy: If the user accepted a EULA, we won't annoy them with the -- // equivalent about:rights page until the version changes. -- try { -- return !Services.prefs.getBoolPref("browser.EULA." + currentVersion + ".accepted"); -- } catch (e) { } -- -- // We haven't shown the notification before, so do so now. -- return true; -- } --}; -- --/** -- * Returns the URL to fetch snippets from, in the urlFormatter service format. -- */ --XPCOMUtils.defineLazyGetter(AboutHomeUtils, "snippetsURL", function() { -- let updateURL = Services.prefs -- .getCharPref(SNIPPETS_URL_PREF) -- .replace("%STARTPAGE_VERSION%", STARTPAGE_VERSION); -- return Services.urlFormatter.formatURL(updateURL); --}); -- - /** - * This code provides services to the about:home page. Whenever - * about:home needs to do something chrome-privileged, it sends a -@@ -246,18 +184,9 @@ - }).then(function(engineName) { - let data = { - showRestoreLastSession: ss.canRestoreLastSession, -- snippetsURL: AboutHomeUtils.snippetsURL, -- showKnowYourRights: AboutHomeUtils.showKnowYourRights, -- snippetsVersion: AboutHomeUtils.snippetsVersion, - defaultEngineName: engineName - }; - -- if (AboutHomeUtils.showKnowYourRights) { -- // Set pref to indicate we've shown the notification. -- let currentVersion = Services.prefs.getIntPref("browser.rights.version"); -- Services.prefs.setBoolPref("browser.rights." + currentVersion + ".shown", true); -- } -- - if (target && target.messageManager) { - target.messageManager.sendAsyncMessage("AboutHome:Update", data); - } else { diff --git a/libre-testing/icecat/mozconfig b/libre-testing/icecat/mozconfig deleted file mode 100644 index d85989194..000000000 --- a/libre-testing/icecat/mozconfig +++ /dev/null @@ -1,38 +0,0 @@ -. $topsrcdir/browser/config/mozconfig - -ac_add_options --prefix=/usr -ac_add_options --libdir=/usr/lib -ac_add_options --enable-pie - -ac_add_options --enable-official-branding - -# System libraries -ac_add_options --with-system-nspr -ac_add_options --with-system-nss -ac_add_options --with-system-jpeg -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-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 - -# Features -ac_add_options --enable-startup-notification -ac_add_options --enable-pulseaudio -ac_add_options --enable-gstreamer=1.0 - -ac_add_options --disable-crashreporter -ac_add_options --disable-updater -ac_add_options --disable-installer -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-testing/icecat/vendor.js b/libre-testing/icecat/vendor.js deleted file mode 100644 index 32fddb8db..000000000 --- a/libre-testing/icecat/vendor.js +++ /dev/null @@ -1,28 +0,0 @@ -// Use LANG environment variable to choose locale -pref("intl.locale.matchOS", true); - -// Disable default browser checking. -pref("browser.shell.checkDefaultBrowser", false); - -// Don't disable our bundled extensions in the application directory -pref("extensions.autoDisableScopes", 11); -pref("extensions.shownSelectionUI", true); - -// Disable "alt" as a shortcut key to open full menu bar. Conflicts with "alt" as a modifier -pref("ui.key.menuAccessKeyFocuses", false); - -// Make sure that Firefox Social stuff are empty -pref("social.whitelist", ""); -pref("social.directories", ""); - -// Disable the GeoLocation API for content -pref("geo.enabled", false); - -// Make sure that the request URL of the GeoLocation backend is empty -pref("geo.wifi.uri", ""); - -// Disable the least secure encryption protocols -pref("security.ssl3.ecdhe_ecdsa_rc4_128_sha", false); -pref("security.ssl3.ecdhe_rsa_rc4_128_sha", false); -pref("security.ssl3.rsa_rc4_128_md5", false); -pref("security.ssl3.rsa_rc4_128_sha", false); diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index db70b8c2c..462ccb6b7 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -13,9 +13,9 @@ _pgo=true pkgname=icecat -_pkgver=31.8.0-gnu1 +_pkgver=38.2.0-gnu1 pkgver=${_pkgver//-/_} -pkgrel=5 +pkgrel=1 pkgdesc="GNU IceCat, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64) @@ -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' - '541532698e04563ac60cb4d6c75891a8eec828df8dc19e2c20c6f84e560efb56' - '92d7ea9feb8d2814d1abaf5cf4012983a2fb9cc56b26a5d7c7c3898aedf06fb4' - 'df92188c828c104bd52e4eb090fbf3ffd745d890f9252edbf6be6edc6d5ba790' + 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,19 +94,6 @@ prepare() { # Load our build config, disable SafeSearch cp "$srcdir/mozconfig" .mozconfig - if $_pgo; then - cat "$srcdir/mozconfig.pgo" >> .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 @@ -133,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() { @@ -150,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 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().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 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 proto(cx); - proto = NewObjectWithProto(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(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(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( - 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( - 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 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(aActor); - return p->Init(aConnectArgs); - #else -- return nullptr; -+ return false; - #endif - } - diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch index 8138985ad..ee88c6d56 100644 --- a/libre/icecat/libre.patch +++ b/libre/icecat/libre.patch @@ -1,19 +1,19 @@ diff -Nur a/browser/app/profile/icecat.js b/browser/app/profile/icecat.js ---- a/browser/app/profile/icecat.js 2015-07-13 19:14:27.000000000 -0300 -+++ b/browser/app/profile/icecat.js 2015-08-18 02:36:42.167590967 -0300 -@@ -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); -@@ -1746,11 +1741,6 @@ +@@ -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%"); @@ -21,6 +21,7 @@ diff -Nur a/browser/app/profile/icecat.js b/browser/app/profile/icecat.js -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); @@ -690,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 @@ @@ -709,7 +710,7 @@ diff -Nur a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales - - + + + + + + + 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 -- cgit v1.2.3 From 0a349eaa5727ed9e68355e93a35a0695a6bf8da2 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 26 Aug 2015 03:48:49 -0300 Subject: icecat-theme-adwaita-38.1-1: updating version --- libre/icecat-theme-adwaita/PKGBUILD | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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 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_\(\)35.1\(\)_\1${pkgver}\2_" "install.rdf" } package() { -- cgit v1.2.3 From 5a0a198dcd09bc7724e6782bd1cfca2336402cf3 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 26 Aug 2015 16:04:41 -0300 Subject: lesspipe-1.83-1.parabola1: updating version --- libre/lesspipe/PKGBUILD | 24 +++------- libre/lesspipe/libarchive.patch | 100 ---------------------------------------- 2 files changed, 7 insertions(+), 117 deletions(-) delete mode 100644 libre/lesspipe/libarchive.patch 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 # Contributor (Arch): solsTiCe d'Hiver # Maintainer: André Silva 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 -- cgit v1.2.3 From a50bd2792948a4706cc493f987c18d3f9265f7ef Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 27 Aug 2015 11:36:37 -0300 Subject: iceweasel-1:40.0.deb1-5: update useragent --- libre/iceweasel/PKGBUILD | 4 ++-- libre/iceweasel/vendor.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index cb7705845..fc47756cb 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -24,7 +24,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } pkgname=iceweasel epoch=1 pkgver=$_debver.$_debrel -pkgrel=4 +pkgrel=5 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64) @@ -61,7 +61,7 @@ sha256sums=('ddebb9f43f653b096367fb6851299edae31973d88e8c91c1ec9c9926022ee4d3' '56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6' '2257dc69886bd0b72c48675a27c3a88b9cf6b598252c9e9f1c99763180684fc3' '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d' - '153057101644dc764f9cc502ce1c47c66bd89e3eff09db7e9c86d591d0d6f39d' + '6293b071d2a6ea7d818035a5b649eda0d0ecf7e9f572d0f8d4f472b456714b2c' '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213') prepare() { diff --git a/libre/iceweasel/vendor.js b/libre/iceweasel/vendor.js index 4f45d6ebb..5ed6cd6c6 100644 --- a/libre/iceweasel/vendor.js +++ b/libre/iceweasel/vendor.js @@ -97,7 +97,7 @@ 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.buildID.override", "Gecko/20100101"); -- cgit v1.2.3 From a046e8c69bf576cd4a285dfeb0b3989f5b6e808b Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Thu, 27 Aug 2015 15:35:33 -0300 Subject: add python-evdev to [pcr] repo --- pcr/python-evdev/PKGBUILD | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 pcr/python-evdev/PKGBUILD 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 + +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 +} -- cgit v1.2.3 From 56dfc5e7e245e16c2e968cdd7aafc21b5ff09b39 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Thu, 27 Aug 2015 15:38:54 -0300 Subject: pcr/reicast-git: update pkg --- pcr/reicast-git/PKGBUILD | 14 +- pcr/reicast-git/enable_joystick_support_old.patch | 346 --------------------- .../wait_if_two_frames_already_in_flight.patch | 12 +- .../wait_if_two_frames_already_in_flight_old.patch | 70 ----- 4 files changed, 15 insertions(+), 427 deletions(-) delete mode 100644 pcr/reicast-git/enable_joystick_support_old.patch delete mode 100644 pcr/reicast-git/wait_if_two_frames_already_in_flight_old.patch diff --git a/pcr/reicast-git/PKGBUILD b/pcr/reicast-git/PKGBUILD index ddd9099e1..7b49b2a69 100644 --- a/pcr/reicast-git/PKGBUILD +++ b/pcr/reicast-git/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: Márcio Silva pkgname=reicast-git -pkgver=r1546.5fd66a1 +pkgver=r1622.826853a pkgrel=1 pkgdesc="A multiplatform Sega Dreamcast emulator" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL2') conflicts=('reicast') provides=('reicast') makedepends=('git') -depends=('libgl' 'alsa-plugins' 'libpulse') +depends=('libgl' 'alsa-plugins' 'libpulse' 'python-evdev' ) 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" @@ -20,7 +20,7 @@ source=(reicast::"git+https://github.com/reicast/reicast-emulator.git" 'wait_if_two_frames_already_in_flight.patch') sha256sums=('SKIP' '095961538c13208b39ebb0b9d6b6e30c1225f218dcc67239a9d938a23aec601e' - '8f7b392ac6fac2d62e078a397f6b7c29ac3a23877d5c1a4566a58710b3383aef') + '4e087844ed22f5a65348e6826444481e14d0409faf8dafb0c6e5284f3f2bd9f7') pkgver() { cd reicast @@ -29,6 +29,10 @@ pkgver() { prepare () { cd reicast + + # remove nonfree fp.h header + rm -v core/deps/libpng/fp.h + patch -Np1 -i "$srcdir"/enable_x11_keyboard_support.patch patch -Np1 -i "$srcdir"/wait_if_two_frames_already_in_flight.patch @@ -49,7 +53,7 @@ build () { 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 + 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_old.patch b/pcr/reicast-git/enable_joystick_support_old.patch deleted file mode 100644 index 0fbb59ac7..000000000 --- a/pcr/reicast-git/enable_joystick_support_old.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 - #include - #include -+ #include - - #if !defined(GLES) - #include -@@ -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/wait_if_two_frames_already_in_flight.patch b/pcr/reicast-git/wait_if_two_frames_already_in_flight.patch index 56e774138..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,6 +1,6 @@ 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-23 00:16:33.916598479 -0300 -+++ b/core/hw/pvr/Renderer_if.cpp 2015-08-23 02:25:28.932602664 -0300 +--- 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) { @@ -38,14 +38,14 @@ diff -Nur a/core/hw/pvr/Renderer_if.cpp b/core/hw/pvr/Renderer_if.cpp bool is_rtt=(FB_W_SOF1& 0x1000000)!=0; TA_context* ctx = tactx_Pop(CORE_CURRENT_CTX); 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-23 00:16:33.917598487 -0300 -+++ b/core/hw/pvr/ta_ctx.cpp 2015-08-23 02:26:47.189293717 -0300 -@@ -127,8 +127,6 @@ +--- 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-git/wait_if_two_frames_already_in_flight_old.patch b/pcr/reicast-git/wait_if_two_frames_already_in_flight_old.patch deleted file mode 100644 index ff297365c..000000000 --- a/pcr/reicast-git/wait_if_two_frames_already_in_flight_old.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; -- cgit v1.2.3 From da937e6b370b143ced17f8b99a281a0c5ee91348 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 27 Aug 2015 16:51:42 -0300 Subject: iceweasel: update appversion --- libre/iceweasel/PKGBUILD | 2 +- libre/iceweasel/vendor.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index fc47756cb..bacb66435 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -61,7 +61,7 @@ sha256sums=('ddebb9f43f653b096367fb6851299edae31973d88e8c91c1ec9c9926022ee4d3' '56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6' '2257dc69886bd0b72c48675a27c3a88b9cf6b598252c9e9f1c99763180684fc3' '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d' - '6293b071d2a6ea7d818035a5b649eda0d0ecf7e9f572d0f8d4f472b456714b2c' + '0171656480113c6fabfdf5b14effe4ac67fda667682eb692badac81562afa696' '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213') prepare() { diff --git a/libre/iceweasel/vendor.js b/libre/iceweasel/vendor.js index 5ed6cd6c6..3b04e96b4 100644 --- a/libre/iceweasel/vendor.js +++ b/libre/iceweasel/vendor.js @@ -99,7 +99,7 @@ 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: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"); -- cgit v1.2.3 From 05817deec964010ce867b2943954f66ef424cd17 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Thu, 27 Aug 2015 16:25:27 -0300 Subject: pcr/reicast-git: add multiplayer support --- pcr/reicast-git/PKGBUILD | 13 +- pcr/reicast-git/enable_multiplayer_support.patch | 37 ++++ pcr/reicast-git/enable_x11_keyboard_support.patch | 233 ---------------------- 3 files changed, 44 insertions(+), 239 deletions(-) create mode 100644 pcr/reicast-git/enable_multiplayer_support.patch delete mode 100644 pcr/reicast-git/enable_x11_keyboard_support.patch diff --git a/pcr/reicast-git/PKGBUILD b/pcr/reicast-git/PKGBUILD index 7b49b2a69..9cff6bd35 100644 --- a/pcr/reicast-git/PKGBUILD +++ b/pcr/reicast-git/PKGBUILD @@ -13,13 +13,12 @@ conflicts=('reicast') provides=('reicast') makedepends=('git') depends=('libgl' 'alsa-plugins' 'libpulse' 'python-evdev' ) -optdepends=('xboxdrv: Userspace gamepad driver for Xbox and Xbox360 gamepads' - 'antimicro: Graphical program used to map keyboard keys and mouse controls to gamepad buttons') +optdepends=('xboxdrv: Userspace gamepad driver for Xbox and Xbox360 gamepads') source=(reicast::"git+https://github.com/reicast/reicast-emulator.git" - 'enable_x11_keyboard_support.patch' + 'enable_multiplayer_support.patch' 'wait_if_two_frames_already_in_flight.patch') sha256sums=('SKIP' - '095961538c13208b39ebb0b9d6b6e30c1225f218dcc67239a9d938a23aec601e' + '12bfc58e12b3ee79b0c82159cdc70c76a4b6804f5c6986853156602bb0e6beb0' '4e087844ed22f5a65348e6826444481e14d0409faf8dafb0c6e5284f3f2bd9f7') pkgver() { @@ -30,10 +29,12 @@ pkgver() { prepare () { cd reicast - # remove nonfree fp.h header + # Remove nonfree fp.h header rm -v core/deps/libpng/fp.h - patch -Np1 -i "$srcdir"/enable_x11_keyboard_support.patch + # Add Multiplayer support + patch -Np1 -i "$srcdir"/enable_multiplayer_support.patch + patch -Np1 -i "$srcdir"/wait_if_two_frames_already_in_flight.patch # Add experimental shadow support: http://github.com/reicast-emulator/issues/94 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/enable_x11_keyboard_support.patch b/pcr/reicast-git/enable_x11_keyboard_support.patch deleted file mode 100644 index 1dfd41c72..000000000 --- a/pcr/reicast-git/enable_x11_keyboard_support.patch +++ /dev/null @@ -1,233 +0,0 @@ -diff -Nur a/core/linux-dist/main.cpp b/core/linux-dist/main.cpp ---- a/core/linux-dist/main.cpp 2015-08-23 00:16:33.930598582 -0300 -+++ b/core/linux-dist/main.cpp 2015-08-23 18:54:25.349048701 -0300 -@@ -157,6 +157,10 @@ - - void UpdateInputState(u32 port) - { -+ #if defined(SUPPORT_X11) -+ update_x11_input_state(); -+ #endif -+ - #if defined(TARGET_EMSCRIPTEN) - return; - #endif -diff -Nur a/core/linux-dist/x11.cpp b/core/linux-dist/x11.cpp ---- a/core/linux-dist/x11.cpp 2015-08-23 00:16:33.930598582 -0300 -+++ b/core/linux-dist/x11.cpp 2015-08-23 18:50:06.875072583 -0300 -@@ -3,6 +3,7 @@ - #include - #include - #include -+#include - - #if !defined(GLES) - #include -@@ -23,6 +24,18 @@ - #endif - #define DEFAULT_WINDOW_HEIGHT 480 - -+#define DC_KEY_AXIS_UP (25) -+#define DC_KEY_AXIS_DOWN (39) -+#define DC_KEY_AXIS_LEFT (38) -+#define DC_KEY_AXIS_RIGHT (40) -+#define DC_KEY_AXIS_LT (79) -+#define DC_KEY_AXIS_RT (81) -+ -+u8 axis_joyx = 0; -+u8 axis_joyy = 0; -+u8 axis_lt = 0; -+u8 axis_rt = 0; -+ - map x11_keymap; - int x11_dc_buttons = 0xFFFF; - int x11_keyboard_input = 0; -@@ -55,8 +68,27 @@ - XSendEvent((Display*)x11_disp, DefaultRootWindow((Display*)x11_disp), False, SubstructureNotifyMask, &xev); - } - -+void update_x11_input_state() -+{ -+ //static char key = 0; -+ -+ //kcode[port]=0xFFFF; -+ joyx[0] = axis_joyx; -+ joyy[0] = axis_joyy; -+ lt[0] = axis_lt; -+ rt[0] = axis_rt; -+ return; -+ -+ //HandleEvents(port); -+} -+ - void input_x11_handle() - { -+ static bool dc_axis_up = false; -+ static bool dc_axis_down = false; -+ static bool dc_axis_left = false; -+ static bool dc_axis_right = false; -+ - if (x11_win && x11_keyboard_input) - { - //Handle X11 -@@ -68,6 +100,90 @@ - { - case KeyPress: - case KeyRelease: -+ if (e.xkey.keycode == DC_KEY_AXIS_UP) -+ { -+ if (e.type == KeyPress) -+ { -+ dc_axis_up = true; -+ } -+ else if (e.type == KeyRelease) -+ { -+ dc_axis_up = false; -+ } -+ else -+ { -+ } -+ } -+ if (e.xkey.keycode == DC_KEY_AXIS_DOWN) -+ { -+ if (e.type == KeyPress) -+ { -+ dc_axis_down = true; -+ } -+ else if (e.type == KeyRelease) -+ { -+ dc_axis_down = false; -+ } -+ else -+ { -+ } -+ } -+ if (e.xkey.keycode == DC_KEY_AXIS_LEFT) -+ { -+ if (e.type == KeyPress) -+ { -+ dc_axis_left = true; -+ } -+ else if (e.type == KeyRelease) -+ { -+ dc_axis_left = false; -+ } -+ else -+ { -+ } -+ } -+ if (e.xkey.keycode == DC_KEY_AXIS_RIGHT) -+ { -+ if (e.type == KeyPress) -+ { -+ dc_axis_right = true; -+ } -+ else if (e.type == KeyRelease) -+ { -+ dc_axis_right = false; -+ } -+ else -+ { -+ } -+ } -+ if (e.xkey.keycode == DC_KEY_AXIS_LT) -+ { -+ if (e.type == KeyPress) -+ { -+ axis_lt = 255; -+ } -+ else if (e.type == KeyRelease) -+ { -+ axis_lt = 0; -+ } -+ else -+ { -+ } -+ } -+ if (e.xkey.keycode == DC_KEY_AXIS_RT) -+ { -+ if (e.type == KeyPress) -+ { -+ axis_rt = 255; -+ } -+ else if (e.type == KeyRelease) -+ { -+ axis_rt = 0; -+ } -+ else -+ { -+ } -+ } - if (e.type == KeyRelease && e.xkey.keycode == 95) // F11 button - { - x11_fullscreen = !x11_fullscreen; -@@ -89,26 +205,45 @@ - break; - } - } -+ if ((dc_axis_up == true) && (dc_axis_down == false)) -+ { -+ axis_joyy = -127; -+ } -+ else if ((dc_axis_up == false) && (dc_axis_down == true)) -+ { -+ axis_joyy = 127; -+ } -+ else -+ { -+ axis_joyy = 0; -+ } -+ if ((dc_axis_left == true) && (dc_axis_right == false)) -+ { -+ axis_joyx = -127; -+ } -+ else if ((dc_axis_left == false) && (dc_axis_right == true)) -+ { -+ axis_joyx = 127; -+ } -+ else -+ { -+ axis_joyx = 0; -+ } - } - } - - void input_x11_init() - { -- x11_keymap[113] = DC_DPAD_LEFT; -- x11_keymap[114] = DC_DPAD_RIGHT; -+ x11_keymap[44] = DC_DPAD_LEFT; -+ x11_keymap[46] = DC_DPAD_RIGHT; - -- x11_keymap[111] = DC_DPAD_UP; -- x11_keymap[116] = DC_DPAD_DOWN; -+ x11_keymap[31] = DC_DPAD_UP; -+ x11_keymap[45] = DC_DPAD_DOWN; - -- x11_keymap[53] = DC_BTN_X; -- x11_keymap[54] = DC_BTN_B; -- x11_keymap[55] = DC_BTN_A; -- -- /* -- //TODO: Fix sliders -- x11_keymap[38] = DPad_Down; -- x11_keymap[39] = DPad_Down; -- */ -+ x11_keymap[80] = DC_BTN_Y; -+ x11_keymap[83] = DC_BTN_X; -+ x11_keymap[85] = DC_BTN_B; -+ x11_keymap[84] = DC_BTN_A; - - x11_keymap[36] = DC_BTN_START; - -diff -Nur a/core/linux-dist/x11.h b/core/linux-dist/x11.h ---- a/core/linux-dist/x11.h 2015-08-23 00:16:33.930598582 -0300 -+++ b/core/linux-dist/x11.h 2015-08-23 18:58:04.534722602 -0300 -@@ -1,6 +1,7 @@ - #pragma once - - extern void* x11_glc; -+extern void update_x11_input_state(); - extern void input_x11_init(); - extern void input_x11_handle(); - extern void x11_window_create(); -- cgit v1.2.3 From 3e1f8f8b6be53bf014d77975760dce34df0b99a8 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Thu, 27 Aug 2015 16:59:07 -0300 Subject: pcr/reicast-git: conflicts and replaces multilib --- pcr/reicast-git/PKGBUILD | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pcr/reicast-git/PKGBUILD b/pcr/reicast-git/PKGBUILD index 9cff6bd35..a249b3aa1 100644 --- a/pcr/reicast-git/PKGBUILD +++ b/pcr/reicast-git/PKGBUILD @@ -9,8 +9,10 @@ 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' 'libpulse' 'python-evdev' ) optdepends=('xboxdrv: Userspace gamepad driver for Xbox and Xbox360 gamepads') -- cgit v1.2.3 From ae26530809173eddd5c70fb89bcf2fa411e89b20 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Thu, 27 Aug 2015 17:00:59 -0300 Subject: remove reicast-multilib-git --- pcr/reicast-multilib-git/PKGBUILD | 56 ---- .../enable_joystick_support_old.patch | 346 --------------------- .../enable_x11_keyboard_support.patch | 233 -------------- .../wait_if_two_frames_already_in_flight.patch | 51 --- .../wait_if_two_frames_already_in_flight_old.patch | 70 ----- 5 files changed, 756 deletions(-) delete mode 100644 pcr/reicast-multilib-git/PKGBUILD delete mode 100644 pcr/reicast-multilib-git/enable_joystick_support_old.patch delete mode 100644 pcr/reicast-multilib-git/enable_x11_keyboard_support.patch delete mode 100644 pcr/reicast-multilib-git/wait_if_two_frames_already_in_flight.patch delete mode 100644 pcr/reicast-multilib-git/wait_if_two_frames_already_in_flight_old.patch diff --git a/pcr/reicast-multilib-git/PKGBUILD b/pcr/reicast-multilib-git/PKGBUILD deleted file mode 100644 index 647a42e21..000000000 --- a/pcr/reicast-multilib-git/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# Maintainer (Arch): carstene1ns - http://git.io/ctPKG -# Maintainer: André Silva -# Maintainer: Márcio Silva - -pkgname=reicast-multilib-git -pkgver=r1546.5fd66a1 -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' 'lib32-libpulse') -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_x11_keyboard_support.patch' - 'wait_if_two_frames_already_in_flight.patch') -sha256sums=('SKIP' - '095961538c13208b39ebb0b9d6b6e30c1225f218dcc67239a9d938a23aec601e' - '8f7b392ac6fac2d62e078a397f6b7c29ac3a23877d5c1a4566a58710b3383aef') - -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_x11_keyboard_support.patch - patch -Np1 -i "$srcdir"/wait_if_two_frames_already_in_flight.patch - - # 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 () { - 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_old.patch b/pcr/reicast-multilib-git/enable_joystick_support_old.patch deleted file mode 100644 index 0fbb59ac7..000000000 --- a/pcr/reicast-multilib-git/enable_joystick_support_old.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 - #include - #include -+ #include - - #if !defined(GLES) - #include -@@ -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/enable_x11_keyboard_support.patch b/pcr/reicast-multilib-git/enable_x11_keyboard_support.patch deleted file mode 100644 index 1dfd41c72..000000000 --- a/pcr/reicast-multilib-git/enable_x11_keyboard_support.patch +++ /dev/null @@ -1,233 +0,0 @@ -diff -Nur a/core/linux-dist/main.cpp b/core/linux-dist/main.cpp ---- a/core/linux-dist/main.cpp 2015-08-23 00:16:33.930598582 -0300 -+++ b/core/linux-dist/main.cpp 2015-08-23 18:54:25.349048701 -0300 -@@ -157,6 +157,10 @@ - - void UpdateInputState(u32 port) - { -+ #if defined(SUPPORT_X11) -+ update_x11_input_state(); -+ #endif -+ - #if defined(TARGET_EMSCRIPTEN) - return; - #endif -diff -Nur a/core/linux-dist/x11.cpp b/core/linux-dist/x11.cpp ---- a/core/linux-dist/x11.cpp 2015-08-23 00:16:33.930598582 -0300 -+++ b/core/linux-dist/x11.cpp 2015-08-23 18:50:06.875072583 -0300 -@@ -3,6 +3,7 @@ - #include - #include - #include -+#include - - #if !defined(GLES) - #include -@@ -23,6 +24,18 @@ - #endif - #define DEFAULT_WINDOW_HEIGHT 480 - -+#define DC_KEY_AXIS_UP (25) -+#define DC_KEY_AXIS_DOWN (39) -+#define DC_KEY_AXIS_LEFT (38) -+#define DC_KEY_AXIS_RIGHT (40) -+#define DC_KEY_AXIS_LT (79) -+#define DC_KEY_AXIS_RT (81) -+ -+u8 axis_joyx = 0; -+u8 axis_joyy = 0; -+u8 axis_lt = 0; -+u8 axis_rt = 0; -+ - map x11_keymap; - int x11_dc_buttons = 0xFFFF; - int x11_keyboard_input = 0; -@@ -55,8 +68,27 @@ - XSendEvent((Display*)x11_disp, DefaultRootWindow((Display*)x11_disp), False, SubstructureNotifyMask, &xev); - } - -+void update_x11_input_state() -+{ -+ //static char key = 0; -+ -+ //kcode[port]=0xFFFF; -+ joyx[0] = axis_joyx; -+ joyy[0] = axis_joyy; -+ lt[0] = axis_lt; -+ rt[0] = axis_rt; -+ return; -+ -+ //HandleEvents(port); -+} -+ - void input_x11_handle() - { -+ static bool dc_axis_up = false; -+ static bool dc_axis_down = false; -+ static bool dc_axis_left = false; -+ static bool dc_axis_right = false; -+ - if (x11_win && x11_keyboard_input) - { - //Handle X11 -@@ -68,6 +100,90 @@ - { - case KeyPress: - case KeyRelease: -+ if (e.xkey.keycode == DC_KEY_AXIS_UP) -+ { -+ if (e.type == KeyPress) -+ { -+ dc_axis_up = true; -+ } -+ else if (e.type == KeyRelease) -+ { -+ dc_axis_up = false; -+ } -+ else -+ { -+ } -+ } -+ if (e.xkey.keycode == DC_KEY_AXIS_DOWN) -+ { -+ if (e.type == KeyPress) -+ { -+ dc_axis_down = true; -+ } -+ else if (e.type == KeyRelease) -+ { -+ dc_axis_down = false; -+ } -+ else -+ { -+ } -+ } -+ if (e.xkey.keycode == DC_KEY_AXIS_LEFT) -+ { -+ if (e.type == KeyPress) -+ { -+ dc_axis_left = true; -+ } -+ else if (e.type == KeyRelease) -+ { -+ dc_axis_left = false; -+ } -+ else -+ { -+ } -+ } -+ if (e.xkey.keycode == DC_KEY_AXIS_RIGHT) -+ { -+ if (e.type == KeyPress) -+ { -+ dc_axis_right = true; -+ } -+ else if (e.type == KeyRelease) -+ { -+ dc_axis_right = false; -+ } -+ else -+ { -+ } -+ } -+ if (e.xkey.keycode == DC_KEY_AXIS_LT) -+ { -+ if (e.type == KeyPress) -+ { -+ axis_lt = 255; -+ } -+ else if (e.type == KeyRelease) -+ { -+ axis_lt = 0; -+ } -+ else -+ { -+ } -+ } -+ if (e.xkey.keycode == DC_KEY_AXIS_RT) -+ { -+ if (e.type == KeyPress) -+ { -+ axis_rt = 255; -+ } -+ else if (e.type == KeyRelease) -+ { -+ axis_rt = 0; -+ } -+ else -+ { -+ } -+ } - if (e.type == KeyRelease && e.xkey.keycode == 95) // F11 button - { - x11_fullscreen = !x11_fullscreen; -@@ -89,26 +205,45 @@ - break; - } - } -+ if ((dc_axis_up == true) && (dc_axis_down == false)) -+ { -+ axis_joyy = -127; -+ } -+ else if ((dc_axis_up == false) && (dc_axis_down == true)) -+ { -+ axis_joyy = 127; -+ } -+ else -+ { -+ axis_joyy = 0; -+ } -+ if ((dc_axis_left == true) && (dc_axis_right == false)) -+ { -+ axis_joyx = -127; -+ } -+ else if ((dc_axis_left == false) && (dc_axis_right == true)) -+ { -+ axis_joyx = 127; -+ } -+ else -+ { -+ axis_joyx = 0; -+ } - } - } - - void input_x11_init() - { -- x11_keymap[113] = DC_DPAD_LEFT; -- x11_keymap[114] = DC_DPAD_RIGHT; -+ x11_keymap[44] = DC_DPAD_LEFT; -+ x11_keymap[46] = DC_DPAD_RIGHT; - -- x11_keymap[111] = DC_DPAD_UP; -- x11_keymap[116] = DC_DPAD_DOWN; -+ x11_keymap[31] = DC_DPAD_UP; -+ x11_keymap[45] = DC_DPAD_DOWN; - -- x11_keymap[53] = DC_BTN_X; -- x11_keymap[54] = DC_BTN_B; -- x11_keymap[55] = DC_BTN_A; -- -- /* -- //TODO: Fix sliders -- x11_keymap[38] = DPad_Down; -- x11_keymap[39] = DPad_Down; -- */ -+ x11_keymap[80] = DC_BTN_Y; -+ x11_keymap[83] = DC_BTN_X; -+ x11_keymap[85] = DC_BTN_B; -+ x11_keymap[84] = DC_BTN_A; - - x11_keymap[36] = DC_BTN_START; - -diff -Nur a/core/linux-dist/x11.h b/core/linux-dist/x11.h ---- a/core/linux-dist/x11.h 2015-08-23 00:16:33.930598582 -0300 -+++ b/core/linux-dist/x11.h 2015-08-23 18:58:04.534722602 -0300 -@@ -1,6 +1,7 @@ - #pragma once - - extern void* x11_glc; -+extern void update_x11_input_state(); - extern void input_x11_init(); - extern void input_x11_handle(); - extern void x11_window_create(); 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 56e774138..000000000 --- a/pcr/reicast-multilib-git/wait_if_two_frames_already_in_flight.patch +++ /dev/null @@ -1,51 +0,0 @@ -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-23 00:16:33.916598479 -0300 -+++ b/core/hw/pvr/Renderer_if.cpp 2015-08-23 02:25:28.932602664 -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(); - #endif -@@ -213,7 +214,7 @@ - bool do_swp = rend_frame(_pvrrc, true); - - //clear up & free data .. -- FinishRender(_pvrrc); -+ tactx_Recycle(_pvrrc); - _pvrrc=0; - - return do_swp; -@@ -267,6 +268,7 @@ - #endif - - bool pend_rend = false; -+extern TA_context* rqueue; - - void rend_resize(int width, int height) { - renderer->Resize(width, height); -@@ -275,6 +277,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); -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-23 00:16:33.917598487 -0300 -+++ b/core/hw/pvr/ta_ctx.cpp 2015-08-23 02:26:47.189293717 -0300 -@@ -127,8 +127,6 @@ - mtx_rqueue.Lock(); - rqueue = 0; - mtx_rqueue.Unlock(); -- -- tactx_Recycle(ctx); - } - - cMutex mtx_pool; diff --git a/pcr/reicast-multilib-git/wait_if_two_frames_already_in_flight_old.patch b/pcr/reicast-multilib-git/wait_if_two_frames_already_in_flight_old.patch deleted file mode 100644 index ff297365c..000000000 --- a/pcr/reicast-multilib-git/wait_if_two_frames_already_in_flight_old.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; -- cgit v1.2.3 From df473844715162e6f11625f42c5c5eeaeec01e0d Mon Sep 17 00:00:00 2001 From: Gaming4JC Date: Thu, 27 Aug 2015 17:08:35 -0400 Subject: firejail improvements --- pcr/firejail/001-addmoresecurity-firefox.patch | 1 + pcr/firejail/PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pcr/firejail/001-addmoresecurity-firefox.patch b/pcr/firejail/001-addmoresecurity-firefox.patch index 0b8d764be..4a7641e9a 100644 --- a/pcr/firejail/001-addmoresecurity-firefox.patch +++ b/pcr/firejail/001-addmoresecurity-firefox.patch @@ -26,6 +26,7 @@ + blacklist ${HOME}/*.key + blacklist ${HOME}/.electrum* + blacklist ${HOME}/.config/ ++ blacklist ${HOME}/.thumnails/ + blacklist ${HOME}/.zsh_history caps.drop all seccomp diff --git a/pcr/firejail/PKGBUILD b/pcr/firejail/PKGBUILD index 6475537ff..c1c52f769 100644 --- a/pcr/firejail/PKGBUILD +++ b/pcr/firejail/PKGBUILD @@ -8,7 +8,7 @@ pkgdesc="Linux namespaces sandbox program" arch=('i686' 'x86_64') license=(GPL2) url=https://l3net.wordpress.com/projects/firejail/ -backup=(etc/firejail/login.users) +backup=('etc/firejail/login.users' 'etc/firejail/*.profile') source=("https://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgname-$pkgver.tar.bz2" 'PKGBUILD' 'PKGBUILD.sig' -- cgit v1.2.3 From 835ad72fe109a70d9957be7723e630916b3eae8a Mon Sep 17 00:00:00 2001 From: Gaming4JC Date: Thu, 27 Aug 2015 17:09:55 -0400 Subject: firejail improvements --- pcr/firejail/PKGBUILD.sig | Bin 543 -> 543 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/pcr/firejail/PKGBUILD.sig b/pcr/firejail/PKGBUILD.sig index 701949cb7..c0abe53f9 100644 Binary files a/pcr/firejail/PKGBUILD.sig and b/pcr/firejail/PKGBUILD.sig differ -- cgit v1.2.3 From b86bd3ed6666495dace54e2e7372f100951d86d0 Mon Sep 17 00:00:00 2001 From: Gaming4JC Date: Thu, 27 Aug 2015 17:13:12 -0400 Subject: firejail improvements --- pcr/firejail/PKGBUILD | 6 +++--- pcr/firejail/PKGBUILD.sig | Bin 543 -> 543 bytes 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pcr/firejail/PKGBUILD b/pcr/firejail/PKGBUILD index c1c52f769..1b566fc56 100644 --- a/pcr/firejail/PKGBUILD +++ b/pcr/firejail/PKGBUILD @@ -17,11 +17,11 @@ validpgpkeys=('CB6E213A349B8DF9E96B622AC3F4FFCF3EAE8697') # PKGBUILD Maintainer' sha512sums=('a0c6715cbaf1043f2ea92b33da5884b6ed0993b3e5d03a3edd181b6663a696a2a60a44e0ad39fc9fcfd50d79eb5acb2f0f33452467bf50912f558ec23ebfc125' 'SKIP' 'SKIP' - '09b42aa186b02fe59682e6c98c41a486a616b2e36f3a9daad2d778e7e30d0f89f2e29724d52981aa9b203c80412312b6dbe6748c1edd36accf95752d90cc4231') + 'b1ce36df78882e9e3a9b9a6b043ce0c11b4de71cf400abf19ee808d45081f9bfc6a56911bc5befae9ac374e88fb1a57326770781b3aedb2fdd54a95e8443a441') whirlpoolsums=('84792b384d4e578347a859354d5639be24c3b370c3c6c07d245bbd35b7d6adcac8f5f382e92dec55a3a53cc68ea00fb7071be01aa390b37df5e0768f00efd90e' 'SKIP' 'SKIP' -'a79506048c95d5dc6a3e3676075cf931c6c83c5a028e303e211efa9c5926aa186eab21770cdbbfde3419b401c88ab4816f6e7d9d42feb09c5d2d0c29a4c07c94') +'66ba5f7ca349c63170bd7ac83b7bc0c9472ad5bb18c243842f969f40475ebbb84c37bd3b837f21058294dc5da14674d07b74026dbcc324324fb94b6a8abfee4f') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -40,4 +40,4 @@ build() { package() { 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 index c0abe53f9..dffe257a1 100644 Binary files a/pcr/firejail/PKGBUILD.sig and b/pcr/firejail/PKGBUILD.sig differ -- cgit v1.2.3 From 2b15afdf2dd4d38c186b74d94ebc211544749282 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Fri, 28 Aug 2015 00:48:48 -0300 Subject: update pcr/dolphin-emu-git --- pcr/dolphin-emu-git/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pcr/dolphin-emu-git/PKGBUILD b/pcr/dolphin-emu-git/PKGBUILD index 94880d368..6357cbc2c 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.r7463.d373dd3 pkgrel=1 pkgdesc='A GameCube / Wii / Triforce emulator' arch=('x86_64') -- cgit v1.2.3 From 0af9b39ecef1fe4d974047fa36fab66b900d8fa5 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Fri, 28 Aug 2015 10:43:53 -0500 Subject: xf86-video-qxl-0.1.4-3.1: rebuild --- pcr/xf86-video-qxl/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pcr/xf86-video-qxl/PKGBUILD b/pcr/xf86-video-qxl/PKGBUILD index 8c827e6fc..2f2d6c6ba 100644 --- a/pcr/xf86-video-qxl/PKGBUILD +++ b/pcr/xf86-video-qxl/PKGBUILD @@ -5,7 +5,7 @@ pkgname=xf86-video-qxl pkgver=0.1.4 -pkgrel=3 +pkgrel=3.1 pkgdesc='Xorg X11 qxl video driver' arch=('x86_64' 'i686') url='http://www.x.org' @@ -17,11 +17,11 @@ 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') -#validpgpkeys=('94A9F75661F77A6168649B23A9D8C21429AC6C82') -source=("http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2" #{,.sig} +validpgpkeys=('94A9F75661F77A6168649B23A9D8C21429AC6C82') +source=("http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2"{,.sig} 'fix-cast.patch') sha256sums=('e57ad22f0b1daf8979e722be0cc38d351bfcc2e41568edc566d2bade5a621105' - #'SKIP' + 'SKIP' '30b09971562d82b5bc9dc26e43514ff38e5eaa680c15471194f07c9129e1e0ed') prepare() { @@ -38,8 +38,8 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}/" ./configure \ + --enable-xspice \ --prefix=/usr - #--enable-xspice \ make } -- cgit v1.2.3 From 373a55284f640e32f9b42f348dc0986a294926d2 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Fri, 28 Aug 2015 10:52:12 -0500 Subject: laptop-mode-tools-1.68-1: updating version --- pcr/laptop-mode-tools/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 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' -- cgit v1.2.3 From 6ce15dccd86a8e707752fdd22f0ee20378fddf73 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 28 Aug 2015 15:29:24 -0300 Subject: cups-filters-1.0.74-1.parabola1: updating version --- libre/cups-filters/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 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 -- cgit v1.2.3 From 0afd5e65f3c647c24fb572eade9204ff9e65fa6c Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 28 Aug 2015 15:32:20 -0300 Subject: smplayer-14.9.0.6994-1.parabola1: updating version --- libre/smplayer/PKGBUILD | 13 ++++++++----- libre/smplayer/add-missing-QDataStream-include.patch | 11 +++++++++++ 2 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 libre/smplayer/add-missing-QDataStream-include.patch 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 # Contributor (Arch): Allan McRae # Contributor (Arch): Alessio 'mOLOk' Bolognino @@ -7,8 +7,8 @@ # Maintainer: André Silva 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 ++#include + #include + + #if defined(Q_OS_WIN) -- cgit v1.2.3 From 3245c155a7bdce8d06850dacec6fd1b09b4bb6a4 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 28 Aug 2015 15:34:54 -0300 Subject: spacefm-1.0.3-1.parabola1: updating version --- libre/spacefm/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 # Contributor (Arch): IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ # Contributor (Arch): ridikulus_rat @@ -6,10 +6,10 @@ # Contributor: Edison Ibañez 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() { -- cgit v1.2.3 From 47e71cd82ddf3f28a7c20d613feec39a642a5893 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Fri, 28 Aug 2015 13:47:50 -0500 Subject: spl-utils-git: add new package to [pcr] --- pcr/spl-utils-git/PKGBUILD | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pcr/spl-utils-git/PKGBUILD 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 +# Contributor (Arch): Kyle Fuller +# Maintainer: Omar Vega Ramos +# +# 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 +} -- cgit v1.2.3 From aaca16fbbad2fbac706ffc7ccaabe92224b13ff7 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Fri, 28 Aug 2015 15:51:37 -0500 Subject: spl-git: add new package to [pcr] --- pcr/spl-git/PKGBUILD | 68 +++++++++++++++++++++++++++++++++++++++++++++++++ pcr/spl-git/spl.install | 37 +++++++++++++++++++++++++++ 2 files changed, 105 insertions(+) create mode 100644 pcr/spl-git/PKGBUILD create mode 100644 pcr/spl-git/spl.install 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 +# Contributor (Arch): Kyle Fuller +# Maintainer: Omar Vega Ramos +# +# 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} +} -- cgit v1.2.3 From 4d0404c981a0f2201b602a433246a6875969412e Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Fri, 28 Aug 2015 16:05:24 -0500 Subject: zfs-utils-git: add new package to [pcr] --- pcr/zfs-utils-git/PKGBUILD | 64 ++++ pcr/zfs-utils-git/zfs-utils.bash-completion-r1 | 391 +++++++++++++++++++++++++ pcr/zfs-utils-git/zfs-utils.initcpio.hook | 100 +++++++ pcr/zfs-utils-git/zfs-utils.initcpio.install | 104 +++++++ 4 files changed, 659 insertions(+) create mode 100644 pcr/zfs-utils-git/PKGBUILD create mode 100644 pcr/zfs-utils-git/zfs-utils.bash-completion-r1 create mode 100644 pcr/zfs-utils-git/zfs-utils.initcpio.hook create mode 100644 pcr/zfs-utils-git/zfs-utils.initcpio.install 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 +# Contributor (Arch): Kyle Fuller +# Maintainer: Omar Vega Ramos +# +# 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 + +# 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 ' + [[ $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< + + 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: -- cgit v1.2.3 From 32382d7c7e3d698e157c625dd89f15b187c2a134 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Fri, 28 Aug 2015 16:25:00 -0500 Subject: polkit-consolekit-0.113-2: updating version --- pcr/polkit-consolekit/PKGBUILD | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) 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 -# Maintainer (Manjaro): artoo -# Contributor (Manjaro): kozec -# Contributor (Manjaro): Lukas Jirkovsky -# Contributor (Manjaro): Jan de Groot +# Maintainer (Arch): kozec +# Contributor (Arch): Lukas Jirkovsky +# Contributor (Arch): Jan de Groot +# Maintainer: Omar Vega Ramos 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') -- cgit v1.2.3 From 712a77bc615a9b28f999d0f75a320c1ce99426a5 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Fri, 28 Aug 2015 17:47:32 -0500 Subject: consolekit-0.9.4-1: updating version --- .../01-org.freedesktop.ModemManager1.rules | 6 --- ...top.NetworkManager.settings.modify.system.rules | 6 --- pcr/consolekit/25-consolekit.rules | 8 ++++ pcr/consolekit/75-consolekit.rules | 8 ---- pcr/consolekit/PKGBUILD | 55 ++++++++++------------ pcr/consolekit/consolekit.logrotate | 5 -- pcr/consolekit/consolekit.pamd | 11 +++++ 7 files changed, 44 insertions(+), 55 deletions(-) delete mode 100644 pcr/consolekit/01-org.freedesktop.ModemManager1.rules delete mode 100644 pcr/consolekit/01-org.freedesktop.NetworkManager.settings.modify.system.rules create mode 100644 pcr/consolekit/25-consolekit.rules delete mode 100644 pcr/consolekit/75-consolekit.rules delete mode 100644 pcr/consolekit/consolekit.logrotate create mode 100644 pcr/consolekit/consolekit.pamd 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/25-consolekit.rules b/pcr/consolekit/25-consolekit.rules new file mode 100644 index 000000000..adddfb1bd --- /dev/null +++ b/pcr/consolekit/25-consolekit.rules @@ -0,0 +1,8 @@ +polkit.addRule(function(action, subject) { + if (action.id == "org.freedesktop.consolekit.system.stop" || + action.id == "org.freedesktop.consolekit.system.restart" || + action.id == "org.freedesktop.consolekit.system.hibernate" || + action.id == "org.freedesktop.consolekit.system.suspend") { + return polkit.Result.YES; + } +}); diff --git a/pcr/consolekit/75-consolekit.rules b/pcr/consolekit/75-consolekit.rules deleted file mode 100644 index adddfb1bd..000000000 --- a/pcr/consolekit/75-consolekit.rules +++ /dev/null @@ -1,8 +0,0 @@ -polkit.addRule(function(action, subject) { - if (action.id == "org.freedesktop.consolekit.system.stop" || - action.id == "org.freedesktop.consolekit.system.restart" || - action.id == "org.freedesktop.consolekit.system.hibernate" || - action.id == "org.freedesktop.consolekit.system.suspend") { - return polkit.Result.YES; - } -}); 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 -# Maintainer (Manjaro): artoo +# Maintainer (Arch): artoo +# Maintainer: Omar Vega Ramos _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 -- cgit v1.2.3 From f7594c2fadf4075bd00f13fc6622f14381dc5216 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Fri, 28 Aug 2015 18:02:24 -0500 Subject: openrc-desktop-20150828-1: updating version --- pcr/openrc-desktop/PKGBUILD | 297 +++++++++++++++---------------- pcr/openrc-desktop/acpid-2.0.16-conf.d | 6 - pcr/openrc-desktop/acpid-2.0.16-init.d | 21 --- pcr/openrc-desktop/alsasound.confd-r4 | 15 -- pcr/openrc-desktop/alsasound.initd-r6 | 88 --------- pcr/openrc-desktop/avahi-daemon | 29 --- pcr/openrc-desktop/avahi-daemon.initd | 29 +++ pcr/openrc-desktop/avahi-dnsconfd | 28 --- pcr/openrc-desktop/avahi-dnsconfd.initd | 28 +++ pcr/openrc-desktop/bluetooth-init.d-r3 | 21 --- pcr/openrc-desktop/consolekit-0.2.rc | 26 --- pcr/openrc-desktop/gpm.conf.d | 23 --- pcr/openrc-desktop/gpm.rc6-2 | 29 --- pcr/openrc-desktop/rfcomm-conf.d | 5 - pcr/openrc-desktop/rfcomm-init.d-r2 | 35 ---- pcr/openrc-desktop/startDM.sh | 31 ---- pcr/openrc-desktop/wpa_cli.sh | 47 ----- pcr/openrc-desktop/wpa_supplicant-conf.d | 6 - pcr/openrc-desktop/wpa_supplicant-init.d | 70 -------- pcr/openrc-desktop/xdm-setup.initd-1 | 14 -- pcr/openrc-desktop/xdm.confd-4 | 10 -- pcr/openrc-desktop/xdm.initd-11 | 231 ------------------------ 22 files changed, 196 insertions(+), 893 deletions(-) delete mode 100644 pcr/openrc-desktop/acpid-2.0.16-conf.d delete mode 100644 pcr/openrc-desktop/acpid-2.0.16-init.d delete mode 100644 pcr/openrc-desktop/alsasound.confd-r4 delete mode 100644 pcr/openrc-desktop/alsasound.initd-r6 delete mode 100644 pcr/openrc-desktop/avahi-daemon create mode 100644 pcr/openrc-desktop/avahi-daemon.initd delete mode 100644 pcr/openrc-desktop/avahi-dnsconfd create mode 100644 pcr/openrc-desktop/avahi-dnsconfd.initd delete mode 100644 pcr/openrc-desktop/bluetooth-init.d-r3 delete mode 100644 pcr/openrc-desktop/consolekit-0.2.rc delete mode 100644 pcr/openrc-desktop/gpm.conf.d delete mode 100644 pcr/openrc-desktop/gpm.rc6-2 delete mode 100644 pcr/openrc-desktop/rfcomm-conf.d delete mode 100644 pcr/openrc-desktop/rfcomm-init.d-r2 delete mode 100644 pcr/openrc-desktop/startDM.sh delete mode 100644 pcr/openrc-desktop/wpa_cli.sh delete mode 100644 pcr/openrc-desktop/wpa_supplicant-conf.d delete mode 100644 pcr/openrc-desktop/wpa_supplicant-init.d delete mode 100644 pcr/openrc-desktop/xdm-setup.initd-1 delete mode 100644 pcr/openrc-desktop/xdm.confd-4 delete mode 100644 pcr/openrc-desktop/xdm.initd-11 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 -# Maintainer (Manjaro): artoo - -# 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 +# Maintainer: Omar Vega Ramos _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 deleted file mode 100644 index 3db552903..000000000 --- a/pcr/openrc-desktop/avahi-daemon +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/openrc-run -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_started_commands="reload" - -depend() { - before netmount nfsmount - use net - need dbus -} - -start() { - ebegin "Starting avahi-daemon" - /usr/bin/avahi-daemon -D - eend $? -} - -stop() { - ebegin "Stopping avahi-daemon" - /usr/bin/avahi-daemon -k - eend $? -} - -reload() { - ebegin "Reloading avahi-daemon" - /usr/bin/avahi-daemon -r - eend $? -} diff --git a/pcr/openrc-desktop/avahi-daemon.initd b/pcr/openrc-desktop/avahi-daemon.initd new file mode 100644 index 000000000..3db552903 --- /dev/null +++ b/pcr/openrc-desktop/avahi-daemon.initd @@ -0,0 +1,29 @@ +#!/usr/bin/openrc-run +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +extra_started_commands="reload" + +depend() { + before netmount nfsmount + use net + need dbus +} + +start() { + ebegin "Starting avahi-daemon" + /usr/bin/avahi-daemon -D + eend $? +} + +stop() { + ebegin "Stopping avahi-daemon" + /usr/bin/avahi-daemon -k + eend $? +} + +reload() { + ebegin "Reloading avahi-daemon" + /usr/bin/avahi-daemon -r + eend $? +} diff --git a/pcr/openrc-desktop/avahi-dnsconfd b/pcr/openrc-desktop/avahi-dnsconfd deleted file mode 100644 index 1389a2889..000000000 --- a/pcr/openrc-desktop/avahi-dnsconfd +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/openrc-run -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_started_commands="reload" - -depend() { - need avahi-daemon - use net -} - -start() { - ebegin "Starting avahi-dnsconfd" - /usr/bin/avahi-dnsconfd -D - eend $? -} - -stop() { - ebegin "Stopping avahi-dnsconfd" - /usr/bin/avahi-dnsconfd -k - eend $? -} - -reload() { - ebegin "Reloading avahi-dnsconfd" - /usr/bin/avahi-dnsconfd -r - eend $? -} diff --git a/pcr/openrc-desktop/avahi-dnsconfd.initd b/pcr/openrc-desktop/avahi-dnsconfd.initd new file mode 100644 index 000000000..1389a2889 --- /dev/null +++ b/pcr/openrc-desktop/avahi-dnsconfd.initd @@ -0,0 +1,28 @@ +#!/usr/bin/openrc-run +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +extra_started_commands="reload" + +depend() { + need avahi-daemon + use net +} + +start() { + ebegin "Starting avahi-dnsconfd" + /usr/bin/avahi-dnsconfd -D + eend $? +} + +stop() { + ebegin "Stopping avahi-dnsconfd" + /usr/bin/avahi-dnsconfd -k + eend $? +} + +reload() { + ebegin "Reloading avahi-dnsconfd" + /usr/bin/avahi-dnsconfd -r + eend $? +} 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 -# 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 -# 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 "^[^#]+.*\" /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 : -- cgit v1.2.3 From 0f3c51639d5d4fb2f7bb509f2c6fefcc2b4004c7 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Fri, 28 Aug 2015 18:46:37 -0500 Subject: networkmanager-consolekit-1.0.6-1: updating version --- pcr/networkmanager-consolekit/NetworkManager.conf | 3 + pcr/networkmanager-consolekit/PKGBUILD | 62 ++--- pcr/networkmanager-consolekit/dnsmasq-path.patch | 30 +++ pcr/networkmanager-consolekit/git-fixes.patch | 265 +++++++++++++++++++++ .../networkmanager.install | 2 +- pcr/networkmanager-consolekit/networkmanager.rc | 60 +++++ 6 files changed, 391 insertions(+), 31 deletions(-) create mode 100644 pcr/networkmanager-consolekit/dnsmasq-path.patch create mode 100644 pcr/networkmanager-consolekit/git-fixes.patch create mode 100644 pcr/networkmanager-consolekit/networkmanager.rc 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 -# Maintainer (Manjaro): artoo -# Contributor (Manjaro): Alexey D. -# Contributor (Manjaro): DaZ -# Contributor (Manjaro): Lukas Jirkovsky -# Contributor (Manjaro): Jan Alexander Steffens (heftig) -# Contributor (Manjaro): Jan de Groot -# Contributor (Manjaro): Wael Nasreddine -# Contributor (Manjaro): Tor Krill -# Contributor (Manjaro): Will Rea -# Contributor (Manjaro): Valentine Sinitsyn +# Maintainer (Arch): Alexey D. +# Contributor (Arch): DaZ +# Contributor (Arch): Lukas Jirkovsky +# Contributor (Arch): Jan Alexander Steffens (heftig) +# Contributor (Arch): Jan de Groot +# Contributor (Arch): Wael Nasreddine +# Contributor (Arch): Tor Krill +# Contributor (Arch): Will Rea +# Contributor (Arch): Valentine Sinitsyn +# Maintainer: Omar Vega Ramos 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 < /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 + -- cgit v1.2.3 From 517e46d8041b18497f54c1766fc26c2f371958de Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Fri, 28 Aug 2015 18:55:25 -0500 Subject: thermald: add new package to [pcr] --- pcr/thermald/PKGBUILD | 38 +++++++++++++++++++++++++++++++++ pcr/thermald/modules-load-thermald.conf | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pcr/thermald/PKGBUILD create mode 100644 pcr/thermald/modules-load-thermald.conf 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 +# Contributor (Arch): WonderWoofy ,wallnuss +# Maintainer: Omar Vega Ramos + +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 -- cgit v1.2.3 From 60446868d097bddd30a600d6f02c18e1eac1fc18 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 28 Aug 2015 17:13:57 -0300 Subject: kdepim-15.08.0-4.nonprism1: add libktnef dependency to libkdepim (FS#46116 -> https://bugs.archlinux.org/task/46116), move sieveeditor to kmail --- nonprism/kdepim/PKGBUILD | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nonprism/kdepim/PKGBUILD b/nonprism/kdepim/PKGBUILD index 5aed465a3..948ae3f6e 100644 --- a/nonprism/kdepim/PKGBUILD +++ b/nonprism/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 244749 2015-08-23 19:34:12Z arojas $ +# $Id: PKGBUILD 244953 2015-08-28 08:31:00Z arojas $ # Maintainer (Arch): Felix Yan # Contributor (Arch): Andrea Scarpino # Contributor (Arch): Pierre Schmitz @@ -7,7 +7,7 @@ pkgbase=kdepim pkgname=(akonadiconsole kaddressbook kmail knotes korganizer libkdepim) pkgver=15.08.0 -pkgrel=3.nonprism1 +pkgrel=4.nonprism1 arch=('i686' 'x86_64') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -64,11 +64,11 @@ package_kmail() { url="http://kde.org/applications/internet/kmail/" install='kmail.install' for _i in kmail agents/archivemailagent agents/mailfilteragent \ - storageservicemanager importwizard libksieve messagelist grantleeeditor mboximporter; do + 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; do + for _i in akonadi_archivemail_agent kmail importwizard sieveeditor; do cd "$srcdir"/build/doc/$_i make DESTDIR="$pkgdir" install done @@ -107,18 +107,18 @@ package_korganizer() { package_libkdepim() { pkgdesc='Common libraries and resources for KDE PIM applications, without Google Drive support' groups=() - depends=('kdepim-runtime' 'gpgmepp' 'grantlee-qt5' 'akonadi-search' 'knewstuff' 'kldap' 'kdnssd') + 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' 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 sieveeditor kaddressbookgrantlee; do + plugins/messageviewer pimcommon pimsettingexporter kaddressbookgrantlee; do cd "$srcdir"/build/$_i make DESTDIR="$pkgdir" install done - for _i in akonadi_sendlater_agent akonadi_followupreminder_agent contactthemeeditor headerthemeeditor pimsettingexporter sieveeditor; do + for _i in akonadi_sendlater_agent akonadi_followupreminder_agent contactthemeeditor headerthemeeditor pimsettingexporter; do cd "$srcdir"/build/doc/$_i make DESTDIR="$pkgdir" install done -- cgit v1.2.3 From af1251a8beb4a660477ee41ab9341fb6330ce8a8 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Fri, 28 Aug 2015 19:50:17 -0500 Subject: openrc-misc-20150828-1: updating version --- pcr/openrc-misc/10-openrc-status-r4 | 35 -- pcr/openrc-misc/PKGBUILD | 762 ++++++++++++++++----------------- pcr/openrc-misc/at.install | 16 + pcr/openrc-misc/bitlbee.confd | 2 - pcr/openrc-misc/bitlbee.initd | 28 -- pcr/openrc-misc/clamd.conf-r1 | 7 - pcr/openrc-misc/clamd.initd-r6 | 129 ------ pcr/openrc-misc/conf.d-r2 | 36 -- pcr/openrc-misc/conf.d.NetworkManager | 4 - pcr/openrc-misc/connman.confd | 15 - pcr/openrc-misc/connman.initd2 | 23 - pcr/openrc-misc/cupsd.init.d-r1 | 26 -- pcr/openrc-misc/fancontrol-init.d-2 | 23 - pcr/openrc-misc/fcron.init.3 | 58 --- pcr/openrc-misc/fuse.init | 35 -- pcr/openrc-misc/haveged-conf.d | 10 - pcr/openrc-misc/haveged-init.d.3 | 17 - pcr/openrc-misc/hdparm-conf.d.3 | 26 -- pcr/openrc-misc/hdparm-init-8 | 61 --- pcr/openrc-misc/init.d-r4 | 42 -- pcr/openrc-misc/init.d.NetworkManager | 57 --- pcr/openrc-misc/irexec-confd | 9 - pcr/openrc-misc/irexec-initd-0.8.6-r2 | 28 -- pcr/openrc-misc/libvirt.install | 16 + pcr/openrc-misc/lircd-0.8.6-r2 | 52 --- pcr/openrc-misc/lircd.conf.4 | 22 - pcr/openrc-misc/lircmd | 20 - pcr/openrc-misc/lm_sensors-3-init.d | 105 ----- pcr/openrc-misc/master-confd-1 | 5 - pcr/openrc-misc/master-initd-3 | 14 - pcr/openrc-misc/metalog.confd | 19 - pcr/openrc-misc/metalog.initd | 42 -- pcr/openrc-misc/minion-confd-1 | 5 - pcr/openrc-misc/minion-initd-3 | 15 - pcr/openrc-misc/mpd2.init | 37 -- pcr/openrc-misc/networkmanager.install | 3 +- pcr/openrc-misc/ntp-client.confd | 21 - pcr/openrc-misc/ntp-client.rc | 32 -- pcr/openrc-misc/ntpd.confd | 6 - pcr/openrc-misc/ntpd.rc-r1 | 23 - pcr/openrc-misc/rsyslog.confd | 30 -- pcr/openrc-misc/rsyslog.initd | 69 --- pcr/openrc-misc/saned.confd | 2 - pcr/openrc-misc/saned.initd | 12 - pcr/openrc-misc/sensord-4-init.d | 22 - pcr/openrc-misc/sntp.confd | 4 - pcr/openrc-misc/sntp.rc | 27 -- pcr/openrc-misc/syndic-confd-1 | 5 - pcr/openrc-misc/syndic-initd-3 | 14 - pcr/openrc-misc/syslog-ng.confd | 42 -- pcr/openrc-misc/syslog-ng.rc6 | 59 --- pcr/openrc-misc/xe-daemon.initd | 28 -- 52 files changed, 395 insertions(+), 1805 deletions(-) delete mode 100644 pcr/openrc-misc/10-openrc-status-r4 create mode 100644 pcr/openrc-misc/at.install delete mode 100644 pcr/openrc-misc/bitlbee.confd delete mode 100644 pcr/openrc-misc/bitlbee.initd delete mode 100644 pcr/openrc-misc/clamd.conf-r1 delete mode 100644 pcr/openrc-misc/clamd.initd-r6 delete mode 100644 pcr/openrc-misc/conf.d-r2 delete mode 100644 pcr/openrc-misc/conf.d.NetworkManager delete mode 100644 pcr/openrc-misc/connman.confd delete mode 100644 pcr/openrc-misc/connman.initd2 delete mode 100644 pcr/openrc-misc/cupsd.init.d-r1 delete mode 100644 pcr/openrc-misc/fancontrol-init.d-2 delete mode 100644 pcr/openrc-misc/fcron.init.3 delete mode 100644 pcr/openrc-misc/fuse.init delete mode 100644 pcr/openrc-misc/haveged-conf.d delete mode 100644 pcr/openrc-misc/haveged-init.d.3 delete mode 100644 pcr/openrc-misc/hdparm-conf.d.3 delete mode 100644 pcr/openrc-misc/hdparm-init-8 delete mode 100644 pcr/openrc-misc/init.d-r4 delete mode 100644 pcr/openrc-misc/init.d.NetworkManager delete mode 100644 pcr/openrc-misc/irexec-confd delete mode 100644 pcr/openrc-misc/irexec-initd-0.8.6-r2 create mode 100644 pcr/openrc-misc/libvirt.install delete mode 100644 pcr/openrc-misc/lircd-0.8.6-r2 delete mode 100644 pcr/openrc-misc/lircd.conf.4 delete mode 100644 pcr/openrc-misc/lircmd delete mode 100644 pcr/openrc-misc/lm_sensors-3-init.d delete mode 100644 pcr/openrc-misc/master-confd-1 delete mode 100644 pcr/openrc-misc/master-initd-3 delete mode 100644 pcr/openrc-misc/metalog.confd delete mode 100644 pcr/openrc-misc/metalog.initd delete mode 100644 pcr/openrc-misc/minion-confd-1 delete mode 100644 pcr/openrc-misc/minion-initd-3 delete mode 100644 pcr/openrc-misc/mpd2.init delete mode 100644 pcr/openrc-misc/ntp-client.confd delete mode 100644 pcr/openrc-misc/ntp-client.rc delete mode 100644 pcr/openrc-misc/ntpd.confd delete mode 100644 pcr/openrc-misc/ntpd.rc-r1 delete mode 100644 pcr/openrc-misc/rsyslog.confd delete mode 100644 pcr/openrc-misc/rsyslog.initd delete mode 100644 pcr/openrc-misc/saned.confd delete mode 100644 pcr/openrc-misc/saned.initd delete mode 100644 pcr/openrc-misc/sensord-4-init.d delete mode 100644 pcr/openrc-misc/sntp.confd delete mode 100644 pcr/openrc-misc/sntp.rc delete mode 100644 pcr/openrc-misc/syndic-confd-1 delete mode 100644 pcr/openrc-misc/syndic-initd-3 delete mode 100644 pcr/openrc-misc/syslog-ng.confd delete mode 100644 pcr/openrc-misc/syslog-ng.rc6 delete mode 100644 pcr/openrc-misc/xe-daemon.initd 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 -# Maintainer (Manjaro): artoo - -# 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 +# Maintainer: Omar Vega Ramos _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 (ie: ondemand, performance, or powersave) -# -d --min (ie: 1000MHz) -# -u --max (ie: 2000MHz) -# -f --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 -# 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 -# 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 $? -} -- cgit v1.2.3 From f16131c923c5202c157ef53721a8617ae84119c0 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 28 Aug 2015 22:00:29 -0300 Subject: iceweasel-1:40.0.3.deb1-1: updating version --- libre/iceweasel/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index bacb66435..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=40.0 +_debver=40.0.3 _debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -24,7 +24,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } pkgname=iceweasel epoch=1 pkgver=$_debver.$_debrel -pkgrel=5 +pkgrel=1 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64) @@ -53,8 +53,8 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" $pkgname-install-dir.patch vendor.js $pkgname-fixed-loading-icon.png) -sha256sums=('ddebb9f43f653b096367fb6851299edae31973d88e8c91c1ec9c9926022ee4d3' - '2b0c360fef190df4a41d7f2a7976d8b9e711266df97dc84683ce9948ae8848d7' +sha256sums=('2a2ded339bf491c4072fdcdc79cdc906733deffb8bcfa1d4fd9243e7f4ff9ee9' + 'ffab34628fdf8cdf5bf9167d2be2e244aaf3fa2802b7cf5165e18ced498cffab' '8e0b2aa899f9c71dfabf61e8e3427bda9a6ef76330bda4428d1badddcfc331a5' '1811eec7a02411295affc6ee66e3e4b9fd636b0bfbd313ce2a132beb124612d8' '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' -- cgit v1.2.3 From eb4e57cc227ab64d26950a0817ecd8f6c192058a Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 28 Aug 2015 22:07:50 -0300 Subject: iceweasel-l10n-1:40.0.3.deb1-1: updating version --- libre/iceweasel-l10n/PKGBUILD | 180 +++++++++++++++++++++--------------------- 1 file changed, 90 insertions(+), 90 deletions(-) diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index f3eca2389..97ddcad1b 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -4,13 +4,13 @@ # Contributor: fauno # Contributor: Figue -_debver=40.0 +_debver=40.0.3 _debrel=deb1 epoch=1 _pkgbase=iceweasel pkgbase=$_pkgbase-l10n pkgver=$_debver.$_debrel -pkgrel=2 +pkgrel=1 pkgdesc="Language pack for Debian ${_pkgbase^}." arch=('any') url="http://packages.debian.org/experimental/$_pkgbase" @@ -163,91 +163,91 @@ _package() { } sha256sums=('81d1f98843f29a81c10a9a96655505c72ee34acee45225dcd307ae9a123e63d9' - 'f8381fced418f1755c8f8c049dcb4a129d8b33f14b0210de251e678cc4f044c3' - '39aa190dd7c0c97b48b87c63371b6eae1dc79c1e07540340cdb678d205f7361f' - '577de0298525e340ca2d63ac1e7e642fb3dfc5961cae88dafcf601a2f5c6375c' - 'b0f7331b86458067f901a259938cf98ca25362b7d7848b15c5a6c00f907a371d' - '56d966303c025d9223c2e610de980b240a875b68434a38cfa753cabeadf54ff2' - '8e276e411448966ac756993472e8218edeb22b03615d2e461b88362080bc6259' - 'fded49ec20d531c090e95789f923a5aa0a2debd053033c38f2ed8a9fc20f949a' - 'd870869e20005b1f04d12f1f2aa6d797219d64809a1c0bf3bd6053799972b56b' - '636b34dd6f20ac508838376b41b5768d90d2975c6fb7fde0e1a09a7c86161982' - '20728794c36144d86073b61cd4c35a556907167aa512d4be99c2913de1b0c879' - '5fee9cd2e2af7275df68f3591df50259bccf3e1b8181daaf518ef86090bd453d' - '8a98570e8b6e6c694db42ad757a4571850f4c7202ae7883ff616b3edf3da8165' - '0a7d2cb6dae6bd183059c3004253f8ef09045c8cb65b68c7a2c1a1ddddc33164' - '633bdc61886fc3f5e95e50cef91404dbbe16ad94a216f231cd5912b2fe90b914' - 'b80dccf414c27a4d8ca625bd90e827ed345ea8eed69f4cfb851c4097733bb163' - '59dd8d06fe06ce8b638bf5f4533010b2294244730da5022853b139f4a9032fbb' - 'd2e844c0bd9bd9621dc306ff89582c27b24f0c09bbaea9e04c833c7a58ab74ca' - '9dd98304aff221ffc4045c01803f94d554789e769cc52d52af00d222c19613db' - 'c07c31b307785ea517244561c02f6d99d80e493e9b7bbab2667e115d797b48f6' - '7e31501d0f4a5b7099c784f021306ace989409cbaa62fff08b82c7f5b196ca11' - '917688a06459c07e5e3ff41393f036e57834254a7a480e2a51d11e1d3cda54ff' - 'aeb92d075df453855d7483642f29da5ca6e8e01a94498780fe6a548ca9271095' - 'ee8dc905a3d6f1f57e98b510b01f5ae28876b7a047976676f62b5c1e935ddf46' - '144eaab557cbf28f98413b63ec592d4c958459c0167aee4d4e88449e8f41e291' - '7b8a811ebc2276d13604aa54db539f1efc4074804574570b4ff721c0b0f19f77' - 'ca630874ff59dcc93dc1e74a3512384a6b92fe3fd0eff4d40ebf7fa04fd3021f' - 'c40ede290caabdd0e0956305e4b0daf6810311a65399c80a87fd51d35136dc2c' - 'ce4f693b6dd775a7982b526365c5d852757bb0e104ab081a417972033a4a7bc4' - 'd8eebfe57c2990a538e458bd174a22e3b44499e5d961c51cfa780cfafa15af7b' - 'cd7f4f34bc9ea30c92fe663f71f223b5fa3dede00308fb26cbe4079c95a0c1ee' - '5efc92b8ca4232c853095dcb3c29b996a976fbd6328954f80177e75f7d98a4e5' - '83df66a3a2f8369a4c188daf3f73895777c89902cdcaaa5883f8a30da76f2d22' - 'ea0e2b0870ecf6cdfe9485c0cd4d493e2a894c03cb1e2bf31f8405a8e44e756b' - 'cba52593c321ba8a91afd9f49bb7c8399ca69dab25e10886f3a1a701954b3c74' - 'e951cbc3b90a4a8a7b8643cc100f73986cae2f3ab8eaf184d2624cdee9de3aa2' - '4c1a877827b7f50675897553687cfb88e21d78ac28f3632f3836e1ce55d9970a' - '1bc782f56cd3c7dc3b7b85b79a15f5bc61188b1fd778b62f6ae91fe407c8bdcf' - 'e6590c1c08f13a2993485e19b772dca0bc86ae61a03c2fb326c272cf67ee6cb6' - '0ed202dccd6a49e839302f6174fe2403c909ed2aaee9de8e76787a2d9a84b413' - 'ee4432ab70461aff6db7c18f02156de3b80eea840c6c839ba8fb7a8f3de74c90' - '5496461c60f7c7bb64a55a7e9b794dd58232beec3c3e475cfad27e38ebdb6836' - '97c3ad35e151fc0005245876ea06e30ea714a621d9f87c9b64929fe6f5bee6e8' - '9c3f2efb642bf3609703a6d168516dfc26ff5a197a1b86f61910e15a6d55fd29' - '4970c93c92cc2031443e74d199994ad9ce27731656e346926f3b5becf31daf6f' - '2bd32edfeff77790744377f5da93afddfca01c47eb4ff2c55418bbe2b8648aae' - 'e9a08699872c94119d0d70c6693d0bdc9e24936f1d0558d669921a8a033e3af1' - '930fe92859bf9649172d26889a1c36a0dbdcfaa7a7f769a421a0a817a261a19b' - 'd732a985f2985403f097ffffd2e2f660abe72d851c0d050f06d5db0b19ffe7e3' - '4e8a9faeb6a4adf3a31ef79f4e3d9b051bf88ad65c046a3cd853d07362cb2e2a' - '0bfbdc9a329f89f6568e7867ea6b46a4c3f9bf552ed8bef93142709cd18b012e' - 'd8c62a32a65a7a69048e4c2141797c480dce3f3c895420ca3ac063b633a5949f' - 'a604b30a9829578e4c51adbab3bd4a2145ff7581491c06b15400051fc934b2de' - 'da9a81ac15ac060ca6c171230fb842f202e15f400111b53635df1b39d102df2a' - '6323f25414ed131fc7ea1be76b2bb0702ab56becc0cd60bfb800d5cc02be4e44' - '46c3df328d691ff90c27f5705512fdf425813029a06dcfee75812ca526ad4413' - '2674d38e87ce335309143b19617e22660d872900cd6359165e52d4829a46a1da' - 'ccf4e442dd7637697b5d3517ae33c93a4614138763ea6a157f64b06feb829f8d' - 'd98e0fd32214148cc7840640ca9f6b4881b9ba213ebf06f1ffea45edc4dc4200' - '0f8b0dfff4223ab8e60709fef891247bc1f96550cf35c108f02e74b5b4f2ecb1' - '59f7e33f9480575a6fce209a6278088c8e1e0ca52f7642415d54c07764f33a10' - 'c91498dfcc1a213a570211f0d7feda5ca16f8b223205dcb745743d6e9167d6aa' - '0b1909b54f07a729dc12261c9ea711efd4386cea41ce8bc4ed7ea3f4b5dc70ba' - '944369ad2da6424dc7eceec6f585d1daeff59ae700e0bbfe0106f3c1ae07b783' - 'b442054ecd9685efe9cb2824021d989cca8790b2b6049fabcd61636fcf673ecf' - '051ca0012d994c38cec1a16bd4055663ad891f78d140604ee00f6f34db8ec3fb' - 'c13dcd505baebd615d4f50c5d4dae24d7dd6a96702eb3c8bd2d42486d9630213' - '5ad7cffdefc967dc5dbe21152b3d3f66205968c9f2f412e96f782827ec0ac0db' - '0fe74b79fb104d6e4d8f82e9fa1660ac0cc2a2a9de40096eafc86f28fbfe3826' - '21f42362d1c91ac809f9a7b51170e69f803e93b55b415dbd092a748edeb2c503' - 'd12be8c849b10e9f809744ea7cdaeffd4a3862872edb0b375cae875a59aa3291' - '87da8d519a477f95067eb62e6ba2bb22479e5971bba3cfbdfffdb6bff4d8290e' - '9e4fc0295200cb59b271036f71ada0c6af77ae077e7b1563dc999acc41bb9b01' - 'fe666b83f218dc7481736eeef480f53e5cd426edd07341b9f67797eafb38f480' - '2bc77f76ab00f9fcd41107217fd831ae18e8f3660cc5de6d83f09c1748e271ea' - 'c788db7f1ddf91b33e17a7537877351e3becf4ff1ed0e45514d87dada39e13ee' - 'c8e8ed847900a0c988a4d44f7c07a03e72317a8b7fa98a641d1f2343d98c5eda' - '5d35c326f54330811eb6b952da1c92792c6cb4050b64c3d75de5d39e28cd54ef' - '1be17a4d0d59e1b235178ee5a79598eb0081d861391a8e20ac104395455ba54e' - '4662e78e23e657eba8f2f61ffec4fc67b58d0f3dadf0b562c0b70089bbba58b2' - '4dbdac371ec585d1bebf22a2378ace9ff686d85064230a179e6f0d28e278f7e9' - '3567baac551365dec8d622bc6687291c560713a783cf30a71beee984215f1e3c' - '9cb527750e461629ca89e3091c998a097f45abcdecf2fd4bd88158bfa7430aca' - 'bdf9a49acb6a9f673601d8d1138bc271dc1e26e612030d3ce22b2eb2e7e40d48' - '9f3a7717d5eab14ebf869376536c3935392cd42ec941688c2df389dbb4375298' - '707ac6eb97a6474f8b733f43880b5a0bfd86471886d761e1518956e96b6813ce' - 'bf723a9ecdcf13ed416b6c34185ef92c16a1d3b0e680e56844f220a82a18e5ea' - 'edcf58bdc34e1359e12aa7aa62b33ef0fa143ceca590e0f65ccce09b26c500e0' - '25593666fdbdeae13e66496486cb48fda04e73b3f2c5fb1fc6f5a5db22756635') + '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') -- cgit v1.2.3 From da0dc67b72e2c1a374260ea6ef5aa3f0f805d90d Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Fri, 28 Aug 2015 20:17:06 -0500 Subject: openrc-net-20150828-1: updating version --- pcr/openrc-net/PKGBUILD | 1118 ++++++++++++++-------------- pcr/openrc-net/autofs5.initd | 70 -- pcr/openrc-net/dhcpd.conf2 | 28 - pcr/openrc-net/dhcpd.init5 | 115 --- pcr/openrc-net/dhcrelay.conf | 16 - pcr/openrc-net/dhcrelay.init3 | 34 - pcr/openrc-net/dhcrelay6.conf | 8 - pcr/openrc-net/hostapd-conf.d | 9 - pcr/openrc-net/hostapd-init.d | 39 - pcr/openrc-net/ip6tables-1.4.13.confd | 19 - pcr/openrc-net/iptables-1.4.13-r1.init | 130 ---- pcr/openrc-net/iptables-1.4.13.confd | 19 - pcr/openrc-net/lighttpd.confd | 12 - pcr/openrc-net/lighttpd.initd | 73 -- pcr/openrc-net/mit-krb5kadmind.initd-r1 | 25 - pcr/openrc-net/mit-krb5kdc.initd-r1 | 24 - pcr/openrc-net/mit-krb5kpropd.initd-r1 | 24 - pcr/openrc-net/named.confd-r7 | 48 -- pcr/openrc-net/named.init-r13 | 248 ------ pcr/openrc-net/nfs.confd | 38 - pcr/openrc-net/nfs.initd | 163 ---- pcr/openrc-net/nfsclient.confd | 18 - pcr/openrc-net/nfsclient.initd | 34 - pcr/openrc-net/nginx.initd-r2 | 89 --- pcr/openrc-net/openntpd.conf.d-20080406-r6 | 7 - pcr/openrc-net/openntpd.init.d-20080406-r6 | 15 - pcr/openrc-net/openvpn-2.1.conf | 18 - pcr/openrc-net/openvpn-2.1.init | 133 ---- pcr/openrc-net/polipo.initd | 54 -- pcr/openrc-net/postfix.rc6.2.7 | 86 --- pcr/openrc-net/privoxy.initd | 29 - pcr/openrc-net/quota.confd | 20 - pcr/openrc-net/quota.rc7 | 38 - pcr/openrc-net/rpc.gssd.initd | 24 - pcr/openrc-net/rpc.idmapd.initd | 26 - pcr/openrc-net/rpc.pipefs.initd | 33 - pcr/openrc-net/rpc.rquotad.initd | 26 - pcr/openrc-net/rpc.statd.initd | 33 - pcr/openrc-net/rpc.svcgssd.initd | 24 - pcr/openrc-net/rpc.yppasswdd-r1 | 22 - pcr/openrc-net/rpc.yppasswdd.confd | 7 - pcr/openrc-net/rpc.ypxfrd-2.23 | 22 - pcr/openrc-net/rpc.ypxfrd.confd | 3 - pcr/openrc-net/rpcbind.initd | 22 - pcr/openrc-net/rsyncd.conf.d | 5 - pcr/openrc-net/rsyncd.init.d-r1 | 12 - pcr/openrc-net/samba4.confd | 38 - pcr/openrc-net/samba4.initd-r1 | 56 -- pcr/openrc-net/saslauthd2.rc7 | 21 - pcr/openrc-net/slapd-confd-2.4.28-r1 | 26 - pcr/openrc-net/slapd-initd-2.4.28-r1 | 36 - pcr/openrc-net/slpd-init | 89 --- pcr/openrc-net/squid.confd-r1 | 13 - pcr/openrc-net/squid.initd-r4 | 118 --- pcr/openrc-net/sshd.confd | 21 - pcr/openrc-net/sshd.rc6.4 | 87 --- pcr/openrc-net/tor.confd | 3 - pcr/openrc-net/tor.initd-r6 | 60 -- pcr/openrc-net/transmission-daemon.confd.4 | 14 - pcr/openrc-net/transmission-daemon.initd.9 | 73 -- pcr/openrc-net/ufw-2.initd | 137 ---- pcr/openrc-net/ufw.confd | 5 - pcr/openrc-net/vsftpd-checkconfig.sh | 29 - pcr/openrc-net/vsftpd.init | 51 -- pcr/openrc-net/xinetd.confd | 3 - pcr/openrc-net/xinetd.rc6 | 33 - pcr/openrc-net/ypbind.confd-r1 | 4 - pcr/openrc-net/ypbind.initd | 41 - pcr/openrc-net/ypserv | 23 - pcr/openrc-net/ypserv.confd | 4 - 70 files changed, 545 insertions(+), 3500 deletions(-) delete mode 100644 pcr/openrc-net/autofs5.initd delete mode 100644 pcr/openrc-net/dhcpd.conf2 delete mode 100644 pcr/openrc-net/dhcpd.init5 delete mode 100644 pcr/openrc-net/dhcrelay.conf delete mode 100644 pcr/openrc-net/dhcrelay.init3 delete mode 100644 pcr/openrc-net/dhcrelay6.conf delete mode 100644 pcr/openrc-net/hostapd-conf.d delete mode 100644 pcr/openrc-net/hostapd-init.d delete mode 100644 pcr/openrc-net/ip6tables-1.4.13.confd delete mode 100644 pcr/openrc-net/iptables-1.4.13-r1.init delete mode 100644 pcr/openrc-net/iptables-1.4.13.confd delete mode 100644 pcr/openrc-net/lighttpd.confd delete mode 100644 pcr/openrc-net/lighttpd.initd delete mode 100644 pcr/openrc-net/mit-krb5kadmind.initd-r1 delete mode 100644 pcr/openrc-net/mit-krb5kdc.initd-r1 delete mode 100644 pcr/openrc-net/mit-krb5kpropd.initd-r1 delete mode 100644 pcr/openrc-net/named.confd-r7 delete mode 100644 pcr/openrc-net/named.init-r13 delete mode 100644 pcr/openrc-net/nfs.confd delete mode 100644 pcr/openrc-net/nfs.initd delete mode 100644 pcr/openrc-net/nfsclient.confd delete mode 100644 pcr/openrc-net/nfsclient.initd delete mode 100644 pcr/openrc-net/nginx.initd-r2 delete mode 100644 pcr/openrc-net/openntpd.conf.d-20080406-r6 delete mode 100644 pcr/openrc-net/openntpd.init.d-20080406-r6 delete mode 100644 pcr/openrc-net/openvpn-2.1.conf delete mode 100644 pcr/openrc-net/openvpn-2.1.init delete mode 100644 pcr/openrc-net/polipo.initd delete mode 100644 pcr/openrc-net/postfix.rc6.2.7 delete mode 100644 pcr/openrc-net/privoxy.initd delete mode 100644 pcr/openrc-net/quota.confd delete mode 100644 pcr/openrc-net/quota.rc7 delete mode 100644 pcr/openrc-net/rpc.gssd.initd delete mode 100644 pcr/openrc-net/rpc.idmapd.initd delete mode 100644 pcr/openrc-net/rpc.pipefs.initd delete mode 100644 pcr/openrc-net/rpc.rquotad.initd delete mode 100644 pcr/openrc-net/rpc.statd.initd delete mode 100644 pcr/openrc-net/rpc.svcgssd.initd delete mode 100644 pcr/openrc-net/rpc.yppasswdd-r1 delete mode 100644 pcr/openrc-net/rpc.yppasswdd.confd delete mode 100644 pcr/openrc-net/rpc.ypxfrd-2.23 delete mode 100644 pcr/openrc-net/rpc.ypxfrd.confd delete mode 100644 pcr/openrc-net/rpcbind.initd delete mode 100644 pcr/openrc-net/rsyncd.conf.d delete mode 100644 pcr/openrc-net/rsyncd.init.d-r1 delete mode 100644 pcr/openrc-net/samba4.confd delete mode 100644 pcr/openrc-net/samba4.initd-r1 delete mode 100644 pcr/openrc-net/saslauthd2.rc7 delete mode 100644 pcr/openrc-net/slapd-confd-2.4.28-r1 delete mode 100644 pcr/openrc-net/slapd-initd-2.4.28-r1 delete mode 100644 pcr/openrc-net/slpd-init delete mode 100644 pcr/openrc-net/squid.confd-r1 delete mode 100644 pcr/openrc-net/squid.initd-r4 delete mode 100644 pcr/openrc-net/sshd.confd delete mode 100644 pcr/openrc-net/sshd.rc6.4 delete mode 100644 pcr/openrc-net/tor.confd delete mode 100644 pcr/openrc-net/tor.initd-r6 delete mode 100644 pcr/openrc-net/transmission-daemon.confd.4 delete mode 100644 pcr/openrc-net/transmission-daemon.initd.9 delete mode 100644 pcr/openrc-net/ufw-2.initd delete mode 100644 pcr/openrc-net/ufw.confd delete mode 100644 pcr/openrc-net/vsftpd-checkconfig.sh delete mode 100644 pcr/openrc-net/vsftpd.init delete mode 100644 pcr/openrc-net/xinetd.confd delete mode 100644 pcr/openrc-net/xinetd.rc6 delete mode 100644 pcr/openrc-net/ypbind.confd-r1 delete mode 100644 pcr/openrc-net/ypbind.initd delete mode 100644 pcr/openrc-net/ypserv delete mode 100644 pcr/openrc-net/ypserv.confd 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 -# Maintainer (Manjaro): artoo - -# 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 +# Maintainer: Omar Vega Ramos _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 = -# -#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