summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-07-23 01:23:27 -0700
committerroot <root@rshg054.dnsready.net>2013-07-23 01:23:27 -0700
commit113b1085958460c3c47be9d93c1b851f60d5d662 (patch)
tree27457555c3f1cf51a08dd7f25ee63d4303623b1b /libre
parent5072cee45a3dc5638ba936dfb4e717bf918b6d06 (diff)
Tue Jul 23 01:22:55 PDT 2013
Diffstat (limited to 'libre')
-rw-r--r--libre/linux-libre/PKGBUILD10
-rw-r--r--libre/xscreensaver-libre/PKGBUILD33
-rw-r--r--libre/xscreensaver-libre/add-electricsheep.diff12
-rw-r--r--libre/xscreensaver-libre/xscreensaver-add-electricsheep.diff10
-rw-r--r--libre/xscreensaver-libre/xscreensaver.pam1
5 files changed, 32 insertions, 34 deletions
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 9c0090083..37ec6585b 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 190068 2013-07-14 09:54:17Z tpowa $
+# $Id: PKGBUILD 191254 2013-07-22 12:16:46Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -10,10 +10,10 @@
pkgbase=linux-libre # Build stock -LIBRE kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.10
-_sublevel=1
+_sublevel=2
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -31,7 +31,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'change-default-console-loglevel.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
- '5561eca43f9b46ad5a341b0cf59f3226'
+ '3d06da86aca3af3babcb23b98eeb5442'
'542fc77350e62009bca7af080359b286'
'bd77b7112db61fb184139daaa1e390ac'
'e49ac236dfeef709f91a3d993ea7b62c'
@@ -39,7 +39,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
'8267264d9a8966e57fdacd1fa1fc65c4'
'04b21c79df0a952c22d681dd4f4562df'
'f3def2cefdcbb954c21d8505d23cc83c'
- '536d322b78a2bde29c0b49b577d8a43a')
+ '223606d6db3504732aab7711833a30fb')
if [ "$CARCH" != "mips64el" ]; then
# don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD
index 96c0f3537..1dc040d92 100644
--- a/libre/xscreensaver-libre/PKGBUILD
+++ b/libre/xscreensaver-libre/PKGBUILD
@@ -1,37 +1,38 @@
-# $Id: PKGBUILD 177534 2013-02-07 02:39:51Z eric $
+# $Id: PKGBUILD 190799 2013-07-16 22:56:09Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
_pkgname=xscreensaver
pkgname=xscreensaver-libre
-pkgver=5.21
+pkgver=5.22
pkgrel=1
pkgdesc="Screen saver and locker for the X Window System, without nonfree asm files"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.jwz.org/xscreensaver/"
license=('BSD')
-depends=('libxxf86vm' 'libglade' 'glu' 'xorg-appres' 'libxmu' \
- 'perl-libwww' 'perl-http-message')
-makedepends=('bc' 'libxpm' 'gdm' 'mesa')
+depends=('libglade' 'xorg-appres' 'perl-libwww')
+makedepends=('bc' 'libxpm' 'gdm')
optdepends=('gdm: for login manager support')
replaces=("${_pkgname}")
conflicts=("${_pkgname}")
provides=("${_pkgname}=${pkgver}")
backup=('etc/pam.d/xscreensaver')
source=(http://www.jwz.org/xscreensaver/${_pkgname}-${pkgver}.tar.gz \
- add-electricsheep.diff xscreensaver.pam LICENSE)
-sha1sums=('cc44ddc538ad5b59ff851f70e8a48633763ff077'
- '677496218b81a42d90bee400026e94dd87fb8ffb'
- '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
+ xscreensaver-add-electricsheep.diff LICENSE)
+sha1sums=('b1d7f97d9b60d9c68c0f3e019cad885f5c7bd6ec'
+ 'e8dc57b6471fb3867ee099304ac6bf628351cb98'
'4209ea586b204fd1d81c382a0522c654f9fd9134')
-build() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- patch -p0 -i "${srcdir}/add-electricsheep.diff"
-
- # Deleting dmsc.asm file due that don't have source code supplied
+prepare() {
+ cd ${_pkgname}-${pkgver}
+ patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff"
+
+ # Deleting dmsc.asm file due which don't have source code supplied
rm -v hacks/images/m6502/dmsc.asm
+}
+build() {
+ cd ${_pkgname}-${pkgver}
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \
--with-pam --with-login-manager --with-gtk --with-gl \
@@ -40,10 +41,10 @@ build() {
}
package() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
+ cd ${_pkgname}-${pkgver}
+ install -d "${pkgdir}/etc/pam.d"
make install_prefix="${pkgdir}" install
install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
- install -D -m644 ../xscreensaver.pam "${pkgdir}/etc/pam.d/xscreensaver"
chmod 755 "${pkgdir}/usr/bin/xscreensaver"
echo "NotShowIn=KDE;GNOME;" >> "${pkgdir}/usr/share/applications/xscreensaver-properties.desktop"
}
diff --git a/libre/xscreensaver-libre/add-electricsheep.diff b/libre/xscreensaver-libre/add-electricsheep.diff
deleted file mode 100644
index 18b4dea97..000000000
--- a/libre/xscreensaver-libre/add-electricsheep.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- driver/XScreenSaver.ad.in-orig 2009-10-17 02:19:06.000000000 -0400
-+++ driver/XScreenSaver.ad.in 2009-10-17 02:21:16.000000000 -0400
-@@ -347,7 +347,8 @@
- @GL_KLUDGE@ GL: rubikblocks -root \n\
- @GL_KLUDGE@ GL: companioncube -root \n\
- @GL_KLUDGE@ GL: hilbert -root \n\
--@GL_KLUDGE@ GL: tronbit -root \n
-+@GL_KLUDGE@ GL: tronbit -root \n\
-+ electricsheep --root 1 \n
-
-
-
diff --git a/libre/xscreensaver-libre/xscreensaver-add-electricsheep.diff b/libre/xscreensaver-libre/xscreensaver-add-electricsheep.diff
new file mode 100644
index 000000000..0c5c3ff40
--- /dev/null
+++ b/libre/xscreensaver-libre/xscreensaver-add-electricsheep.diff
@@ -0,0 +1,10 @@
+--- driver/XScreenSaver.ad.in-orig 2013-07-16 16:47:10.183068023 -0400
++++ driver/XScreenSaver.ad.in 2013-07-16 16:48:23.293473297 -0400
+@@ -157,6 +157,7 @@
+ !
+ *programs: \
+ maze -root \n\
++ electricsheep --root 1 \n\
+ @GL_KLUDGE@ GL: superquadrics -root \n\
+ attraction -root \n\
+ blitspin -root \n\
diff --git a/libre/xscreensaver-libre/xscreensaver.pam b/libre/xscreensaver-libre/xscreensaver.pam
deleted file mode 100644
index b4d80c21f..000000000
--- a/libre/xscreensaver-libre/xscreensaver.pam
+++ /dev/null
@@ -1 +0,0 @@
-auth required pam_unix_auth.so