From 5f74139e49aec90fef556447373608db10d9f1e6 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Sat, 2 Jun 2012 22:53:38 -0300 Subject: don't build jit on mips64el --- libre/iceweasel-libre/PKGBUILD | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 66e441d75..fdca2f627 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -109,6 +109,17 @@ fi cat "$srcdir/mozconfig.pgo" >> .mozconfig fi +# From js on abslibre-mips64el.git + if [ "$CARCH" = "mips64el" ]; then + msg "Force disabling JIT." + sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \ + js/src/assembler/wtf/Platform.h + sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.{in,ref} + + echo "ac_add_options --disable-methodjit" >> .mozconfig + echo "ac_add_options --disable-tracejit" >> .mozconfig + fi + # Fix PRE_RELEASE_SUFFIX sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ browser/base/Makefile.in -- cgit v1.2.3-54-g00ecf From abe8590bae5a1ba3f4b1835a76335071b521369e Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 10 Nov 2012 22:04:39 +1100 Subject: abuse-libre: added provides/replaces/conflicts --- libre/abuse-libre/PKGBUILD | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libre/abuse-libre/PKGBUILD b/libre/abuse-libre/PKGBUILD index 829871791..196fb2c85 100755 --- a/libre/abuse-libre/PKGBUILD +++ b/libre/abuse-libre/PKGBUILD @@ -7,12 +7,15 @@ _pkgname=abuse pkgname=abuse-libre pkgver=0.8 -pkgrel=2 +pkgrel=3 pkgdesc='A side-scroller action game that pits you against ruthless alien killers. Without unfree "Claudio"' arch=('i686' 'x86_64') url='http://abuse.zoy.org/' license=('GPL' 'custom') depends=('gcc-libs' 'libgl' 'sdl' 'sdl_mixer') +provides=('$_pkgname=$pkgver') +replaces=('$_pkgname') +conflicts=('$_pkgname') install='abuse.install' source=("http://abuse.zoy.org/raw-attachment/wiki/download/${_pkgname}-${pkgver}.tar.gz" non-claudio.patch) -- cgit v1.2.3-54-g00ecf From 7d749da6d40997117dcd137cf5084192ad76572b Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Sat, 10 Nov 2012 23:23:56 -0300 Subject: Deprecating systemd --- ...for-proper-return-from-dirent_ensure_type.patch | 27 ---- ...close-FIFO-before-ending-sessions-cleanly.patch | 155 --------------------- ...l-never-follow-symlinks-in-rm_rf_children.patch | 31 ----- libre/systemd/PKGBUILD | 123 ---------------- libre/systemd/os-release | 7 - libre/systemd/rePKGBUILD | 52 ------- libre/systemd/systemd.install | 50 ------- 7 files changed, 445 deletions(-) delete mode 100755 libre/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch delete mode 100755 libre/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch delete mode 100755 libre/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch delete mode 100755 libre/systemd/PKGBUILD delete mode 100755 libre/systemd/os-release delete mode 100755 libre/systemd/rePKGBUILD delete mode 100755 libre/systemd/systemd.install diff --git a/libre/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch b/libre/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch deleted file mode 100755 index 06fc30944..000000000 --- a/libre/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7e5d190ccce8dc064d5756225e306e65fa534ae9 Mon Sep 17 00:00:00 2001 -From: Dave Reisner -Date: Mon, 2 Apr 2012 08:20:34 -0400 -Subject: [PATCH] check for proper return from dirent_ensure_type - -Fixes 'systemctl list-unit-files', which previously returned only: - - Failed to issue method call: No such file or directory ---- - src/install.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/install.c b/src/install.c -index 174d79b..9256116 100644 ---- a/src/install.c -+++ b/src/install.c -@@ -1853,7 +1853,7 @@ int unit_file_get_list( - - r = dirent_ensure_type(d, de); - if (r < 0) { -- if (errno == ENOENT) -+ if (r == -ENOENT) - continue; - - goto finish; --- -1.7.9.5 diff --git a/libre/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch b/libre/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch deleted file mode 100755 index 692d93356..000000000 --- a/libre/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 75c8e3cffd7da8eede614cf61384957af2c82a29 Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Thu, 22 Mar 2012 02:06:40 +0100 -Subject: [PATCH] logind: close FIFO before ending sessions cleanly - -For clean session endings ask logind explicitly to get rid of the FIFO -before closing it so that the FIFO logic doesn't result in su/sudo to be -terminated immediately. ---- - src/login/logind-dbus.c | 30 ++++++++++++++++++++ - src/login/pam-module.c | 71 +++++++++++++++++++++++++++++++++++++++++++++-- - 2 files changed, 98 insertions(+), 3 deletions(-) - -diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c -index d8f4d89..ea6b89f 100644 ---- a/src/login/logind-dbus.c -+++ b/src/login/logind-dbus.c -@@ -80,6 +80,9 @@ - " \n" \ - " \n" \ - " \n" \ -+ " \n" \ -+ " \n" \ -+ " \n" \ - " \n" \ - " \n" \ - " \n" \ -@@ -1075,6 +1078,33 @@ static DBusHandlerResult manager_message_handler( - if (r < 0) - return bus_send_error_reply(connection, message, &error, r); - -+ } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "ReleaseSession")) { -+ const char *name; -+ Session *session; -+ -+ if (!dbus_message_get_args( -+ message, -+ &error, -+ DBUS_TYPE_STRING, &name, -+ DBUS_TYPE_INVALID)) -+ return bus_send_error_reply(connection, message, &error, -EINVAL); -+ -+ session = hashmap_get(m->sessions, name); -+ if (!session) -+ return bus_send_error_reply(connection, message, &error, -ENOENT); -+ -+ /* We use the FIFO to detect stray sessions where the -+ process invoking PAM dies abnormally. We need to make -+ sure that that process is not killed if at the clean -+ end of the session it closes the FIFO. Hence, with -+ this call explicitly turn off the FIFO logic, so that -+ the PAM code can finish clean up on its own */ -+ session_remove_fifo(session); -+ -+ reply = dbus_message_new_method_return(message); -+ if (!reply) -+ goto oom; -+ - } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "ActivateSession")) { - const char *name; - Session *session; -diff --git a/src/login/pam-module.c b/src/login/pam-module.c -index 8544413..4106d2b 100644 ---- a/src/login/pam-module.c -+++ b/src/login/pam-module.c -@@ -414,7 +414,6 @@ _public_ PAM_EXTERN int pam_sm_open_session( - "/org/freedesktop/login1", - "org.freedesktop.login1.Manager", - "CreateSession"); -- - if (!m) { - pam_syslog(handle, LOG_ERR, "Could not allocate create session message."); - r = PAM_BUF_ERR; -@@ -620,11 +619,77 @@ _public_ PAM_EXTERN int pam_sm_close_session( - int argc, const char **argv) { - - const void *p = NULL; -+ const char *id; -+ DBusConnection *bus = NULL; -+ DBusMessage *m = NULL, *reply = NULL; -+ DBusError error; -+ int r; - -- pam_get_data(handle, "systemd.session-fd", &p); -+ assert(handle); -+ -+ dbus_error_init(&error); -+ -+ id = pam_getenv(handle, "XDG_SESSION_ID"); -+ if (id) { -+ -+ /* Before we go and close the FIFO we need to tell -+ * logind that this is a clean session shutdown, so -+ * that it doesn't just go and slaughter us -+ * immediately after closing the fd */ -+ -+ bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error); -+ if (!bus) { -+ pam_syslog(handle, LOG_ERR, "Failed to connect to system bus: %s", bus_error_message(&error)); -+ r = PAM_SESSION_ERR; -+ goto finish; -+ } -+ -+ m = dbus_message_new_method_call( -+ "org.freedesktop.login1", -+ "/org/freedesktop/login1", -+ "org.freedesktop.login1.Manager", -+ "ReleaseSession"); -+ if (!m) { -+ pam_syslog(handle, LOG_ERR, "Could not allocate release session message."); -+ r = PAM_BUF_ERR; -+ goto finish; -+ } -+ -+ if (!dbus_message_append_args(m, -+ DBUS_TYPE_STRING, &id, -+ DBUS_TYPE_INVALID)) { -+ pam_syslog(handle, LOG_ERR, "Could not attach parameters to message."); -+ r = PAM_BUF_ERR; -+ goto finish; -+ } - -+ reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error); -+ if (!reply) { -+ pam_syslog(handle, LOG_ERR, "Failed to release session: %s", bus_error_message(&error)); -+ r = PAM_SESSION_ERR; -+ goto finish; -+ } -+ } -+ -+ r = PAM_SUCCESS; -+ -+finish: -+ pam_get_data(handle, "systemd.session-fd", &p); - if (p) - close_nointr(PTR_TO_INT(p) - 1); - -- return PAM_SUCCESS; -+ dbus_error_free(&error); -+ -+ if (bus) { -+ dbus_connection_close(bus); -+ dbus_connection_unref(bus); -+ } -+ -+ if (m) -+ dbus_message_unref(m); -+ -+ if (reply) -+ dbus_message_unref(reply); -+ -+ return r; - } --- -1.7.9.5 diff --git a/libre/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch b/libre/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch deleted file mode 100755 index 9bf84dda6..000000000 --- a/libre/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5ebff5337594d690b322078c512eb222d34aaa82 Mon Sep 17 00:00:00 2001 -From: Michal Schmidt -Date: Fri, 2 Mar 2012 10:39:10 +0100 -Subject: [PATCH] util: never follow symlinks in rm_rf_children() - -The function checks if the entry is a directory before recursing, but -there is a window between the check and the open, during which the -directory could be replaced with a symlink. - -CVE-2012-1174 -https://bugzilla.redhat.com/show_bug.cgi?id=803358 ---- - src/util.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/util.c b/src/util.c -index 20cbc2b..dfc1dc6 100644 ---- a/src/util.c -+++ b/src/util.c -@@ -3593,7 +3593,8 @@ static int rm_rf_children(int fd, bool only_dirs, bool honour_sticky) { - if (is_dir) { - int subdir_fd; - -- if ((subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC)) < 0) { -+ subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW); -+ if (subdir_fd < 0) { - if (ret == 0 && errno != ENOENT) - ret = -errno; - continue; --- -1.7.9.4 diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD deleted file mode 100755 index d4f08f7d5..000000000 --- a/libre/systemd/PKGBUILD +++ /dev/null @@ -1,123 +0,0 @@ -# $Id$ -# Maintainer: Dave Reisner -# Maintainer (Parabola): Nicolas Reynolds -# Maintainer (Parabola): André Silva - -pkgbase=systemd -pkgname=('systemd') -pkgver=44 -pkgrel=7 -arch=('i686' 'x86_64' 'mips64el') -url="http://www.freedesktop.org/wiki/Software/systemd" -license=('GPL2' 'LGPL2.1' 'MIT') -makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool' - 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz') -options=('!libtool') -source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" - "os-release" - 0001-util-never-follow-symlinks-in-rm_rf_children.patch - 0001-logind-close-FIFO-before-ending-sessions-cleanly.patch - 0001-check-for-proper-return-from-dirent_ensure_type.patch) -md5sums=('11f44ff74c87850064e4351518bcff17' - 'd0210754762d923d36c9452a1648d550' - 'b5863d6d4b47e2b5bda8eb57bde0d327' - 'd37833358ef6c23fad622ea4a0941d1f' - '11f930fd0a3966abc794bf9127a7dde0') - -build() { - cd "$pkgname-$pkgver" - - # https://bugzilla.redhat.com/show_bug.cgi?id=803358 (upstream 5ebff53375) - patch -Np1 <"$srcdir/0001-util-never-follow-symlinks-in-rm_rf_children.patch" - - # https://bugs.archlinux.org/task/28386 (upstream 75c8e3cffd) - patch -Np1 <"$srcdir/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch" - - # Fix broken 'systemctl list-unit-files' (upstream fb5ef067c49) - patch -Np1 <"$srcdir/0001-check-for-proper-return-from-dirent_ensure_type.patch" - - ./configure --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --with-pamlibdir=/usr/lib/security \ - --localstatedir=/var \ - --with-distro=arch \ - --enable-split-usr \ - --disable-ima - - make -} - -package_systemd() { - pkgdesc="system and service manager" - depends=('acl' 'dbus-core' 'libsystemd' 'kbd' 'kmod' 'libcap' 'pam' 'util-linux' 'udev' 'xz') - optdepends=('cryptsetup: required for encrypted block devices' - 'dbus-python: systemd-analyze' - 'initscripts: legacy support for hostname and vconsole setup' - 'initscripts-systemd: native boot and initialization scripts' - 'python2-cairo: systemd-analyze' - 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts' - 'systemd-sysvcompat: symlink package to provide sysvinit binaries') - backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf - etc/dbus-1/system.d/org.freedesktop.hostname1.conf - etc/dbus-1/system.d/org.freedesktop.login1.conf - etc/dbus-1/system.d/org.freedesktop.locale1.conf - etc/dbus-1/system.d/org.freedesktop.timedate1.conf - etc/systemd/system.conf - etc/systemd/user.conf - etc/systemd/systemd-logind.conf - etc/systemd/systemd-journald.conf) - install="$pkgname.install" - - cd "$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release" - - printf "d /run/console 755 root root\n" >"$pkgdir/usr/lib/tmpfiles.d/console.conf" - chmod 644 "$pkgdir/usr/lib/tmpfiles.d/console.conf" - - # symlink to /bin/systemd for compat and sanity - install -dm755 "$pkgdir/bin" - ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd" - - # use python2 for systemd-analyze - sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" - - # didn't build this... - rm -f "$pkgdir/usr/share/man/man1/systemadm.1" - - # fix .so links in manpage stubs - find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \ - -exec sed -i '1s|^\.so \(.*\)\.\([[:digit:]]\+\)|.so man\2/\1.\2|' {} + - - # rename man pages to avoid conflicts with sysvinit and initscripts - manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 - man5/{hostname,{vconsole,locale}.conf}.5) - cd "$pkgdir/usr/share/man" - for manpage in "${manpages[@]}"; do - IFS='/' read section page <<< "$manpage" - mv "$manpage" "$section/systemd.$page" - done - sed -i '1s|/\([^/]\+\)|/systemd.\1|' "$pkgdir"/usr/share/man/man8/systemd.{poweroff,reboot}.8 - - # move bash-completion and symlink for loginctl - install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \ - "$pkgdir/usr/share/bash-completion/completions/systemctl" - ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/loginctl" - rm -rf "$pkgdir/etc/bash_completion.d" - - # fix systemctl where - find "$pkgdir" -type f -name '*.service' -exec \ - sed -i 's@\([=-]\)/bin/systemctl@\1/usr/bin/systemctl@g' {} + - - ### split off libsystemd (libs, includes, pkgconfig, man3) - install -dm755 "$srcdir"/libsystemd/usr/{include,lib/pkgconfig} - - cd "$srcdir"/libsystemd - mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib - mv "$pkgdir/usr/include/systemd" usr/include - mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig -} - -# vim: ft=sh syn=sh et diff --git a/libre/systemd/os-release b/libre/systemd/os-release deleted file mode 100755 index 65253e9c3..000000000 --- a/libre/systemd/os-release +++ /dev/null @@ -1,7 +0,0 @@ -NAME=Parabola -ID=parabola -ID_LIKE=arch -PRETTY_NAME="Parabola GNU/Linux-libre" -ANSI_COLOR="1;35" -HOME_URL="https://parabolagnulinux.org/" -BUG_REPORT_URL="https://labs.parabola.nu/" diff --git a/libre/systemd/rePKGBUILD b/libre/systemd/rePKGBUILD deleted file mode 100755 index f825ee579..000000000 --- a/libre/systemd/rePKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# This is an example rePKGBUILD file. Use this as a start to creating your own, -# and remove these comments. For more information, see 'man PKGBUILD'. -# NOTE: Please fill out the license field for your package! If it is unknown, -# then please put 'unknown'. - -# Maintainer: Nicolas Reynolds -# Maintainer: André Silva -source PKGBUILD -unset build package md5sums source check -_repo=extra -pkgname='systemd' -options=(!strip) -source=(PKGBUILD - http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${pkgbase}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} - # files for pkg modifications - os-release) - -build() { - cd "${srcdir}/" - rm -v .{INSTALL,PKGINFO} $pkgname-$pkgver-$pkgrel-$CARCH$PKGEXT || true - # put actions for package modifications below this line - - rm -v etc/os-release -} - -package_systemd() { - pkgdesc="system and service manager (Parabola rebranded)" - depends=('acl' 'dbus-core' 'libsystemd' 'kbd' 'kmod' 'libcap' 'pam' 'util-linux' 'udev' 'xz') - optdepends=('cryptsetup: required for encrypted block devices' - 'dbus-python: systemd-analyze' - 'initscripts: legacy support for hostname and vconsole setup' - 'initscripts-systemd: native boot and initialization scripts' - 'python2-cairo: systemd-analyze' - 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts' - 'systemd-sysvcompat: symlink package to provide sysvinit binaries') - backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf - etc/dbus-1/system.d/org.freedesktop.hostname1.conf - etc/dbus-1/system.d/org.freedesktop.login1.conf - etc/dbus-1/system.d/org.freedesktop.locale1.conf - etc/dbus-1/system.d/org.freedesktop.timedate1.conf - etc/systemd/system.conf - etc/systemd/user.conf - etc/systemd/systemd-logind.conf - etc/systemd/systemd-journald.conf) - install="$pkgname.install" - - # Install Parabola os-release - install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release" - - find ${srcdir} -maxdepth 1 -type l -delete - cp -a ${srcdir}/* ${pkgdir} -} diff --git a/libre/systemd/systemd.install b/libre/systemd/systemd.install deleted file mode 100755 index 0c3e9abee..000000000 --- a/libre/systemd/systemd.install +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh - -checkgroups() { - if ! getent group lock >/dev/null; then - groupadd -g 54 lock - fi -} - -sd_booted() { - [ -e sys/fs/cgroup/systemd ] -} - -post_install() { - checkgroups - - if [ ! -f etc/machine-id ]; then - systemd-machine-id-setup - fi - - echo "systemd has been installed to /bin/systemd. Please ensure you append" - echo "init=/bin/systemd to your kernel command line in your bootloader." -} - -post_upgrade() { - checkgroups - - if [ ! -f etc/machine-id ]; then - systemd-machine-id-setup - fi - - if sd_booted; then - # we moved the binary in 44-2 to /usr, so a reexec leads to a - # coredump. refuse this reexec and warn the user that they should - # reboot instead. - if [ "$(vercmp 44-2 "$2")" -eq 1 ]; then - echo "warning: refusing to reexec systemd. the system should be rebooted." - else - systemctl daemon-reload - systemctl daemon-reexec - fi - fi -} - -post_remove() { - if getent group lock >/dev/null; then - groupdel lock - fi -} - -# vim:set ts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf From 57c4a12d7c00bb82275af154cbcdbb7ec871c57c Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Sun, 11 Nov 2012 13:55:47 -0300 Subject: Upgraded netatalk --- pcr/minidjvu/PKGBUILD | 2 +- social/netatalk/PKGBUILD | 58 +++++++++++++++++--------------------- social/netatalk/netatalk.changelog | 18 ++++++++++++ social/netatalk/netatalk.install | 7 ++--- social/netatalk/netatalk.rc | 44 ----------------------------- 5 files changed, 47 insertions(+), 82 deletions(-) delete mode 100644 social/netatalk/netatalk.rc diff --git a/pcr/minidjvu/PKGBUILD b/pcr/minidjvu/PKGBUILD index 168f035cc..700f3c1f6 100644 --- a/pcr/minidjvu/PKGBUILD +++ b/pcr/minidjvu/PKGBUILD @@ -4,7 +4,7 @@ pkgname=minidjvu pkgver=0.8 pkgrel=3 pkgdesc="Highly efficient DjVu encoder for black-and-white images" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://minidjvu.sourceforge.net/" license=('GPL') depends=("libtiff") diff --git a/social/netatalk/PKGBUILD b/social/netatalk/PKGBUILD index 7e2fe14aa..816174590 100644 --- a/social/netatalk/PKGBUILD +++ b/social/netatalk/PKGBUILD @@ -7,7 +7,7 @@ pkgname=netatalk pkgver=3.0.1 -pkgrel=1 +pkgrel=3 pkgdesc='Open Source AFP fileserver' arch=('i686' 'x86_64') url='http://netatalk.sourceforge.net' @@ -17,42 +17,36 @@ backup=('etc/afp.conf') options=('!libtool') install=$pkgname.install changelog=$pkgname.changelog -source=(netatalk.rc http://iweb.dl.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) -md5sums=('5e92015b0d9ac77af4b598cca6cb435c' - '62eb034011bb60b0bfd95072af3693dc') +source=(http://iweb.dl.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) +md5sums=('b4f5c932b2ca99f5292bd6b6d69b3ebc') build() { - cd $pkgname-$pkgver + cd $pkgname-$pkgver # TODO what does this fix? - msg2 'Fixing...' - sed -i 's/x"linux/x"generic/' macros/netatalk.m4 - - autoreconf - -# disable bundled libevent - echo -e "all:\ninstall:" >libevent/Makefile - - CFLAGS="-Wno-unused-result" \ - LIBS=-levent \ - ./configure --prefix=/usr \ - --disable-static \ - --localstatedir=/etc \ - --sysconfdir=/etc \ - --disable-bundled-libevent \ - --with-cracklib \ - --with-cnid-cdb-backend \ - --enable-pgp-uam \ - --with-init-style=systemd - - make + msg2 'Fixing...' + sed -i 's/x"linux/x"generic/' macros/netatalk.m4 + sed -i 's:/lib:/usr/lib:' distrib/initscripts/Makefile.{am,in} + + autoreconf + + CFLAGS="-Wno-unused-result" \ + ./configure --prefix=/usr \ + --disable-static \ + --localstatedir=/var/state \ + --sysconfdir=/etc \ + --with-init-style=systemd \ + --with-cracklib \ + --with-cnid-cdb-backend \ + --enable-pgp-uam \ + --without-libevent-header \ + --without-libevent-lib + + sed -i -e s/-Ino// -e s/-Lno// etc/netatalk/Makefile + make } package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install + cd $pkgname-$pkgver - msg2 'Copying initscripts...' - install -D -m755 "$srcdir"/netatalk.rc "$pkgdir"/etc/rc.d/netatalk + make DESTDIR="$pkgdir" install } -md5sums=('5e92015b0d9ac77af4b598cca6cb435c' - 'b4f5c932b2ca99f5292bd6b6d69b3ebc') diff --git a/social/netatalk/netatalk.changelog b/social/netatalk/netatalk.changelog index b577562d4..b1ada018b 100644 --- a/social/netatalk/netatalk.changelog +++ b/social/netatalk/netatalk.changelog @@ -1,3 +1,21 @@ +2012-10-08 SJ_UnderWater + + * 3.0.1-3 : + moved systemd from /etc + better rc.d install test + +2012-10-05 SJ_UnderWater + + * 3.0.1-2 : + removed rc.d references + +2012-10-04 SJ_UnderWater + + * 3.0.1-1 : + new version + moved to systemd + moved state to /var/db + 2012-07-14 SJ_UnderWater * 3.0-3 : diff --git a/social/netatalk/netatalk.install b/social/netatalk/netatalk.install index a385add10..629586531 100644 --- a/social/netatalk/netatalk.install +++ b/social/netatalk/netatalk.install @@ -2,11 +2,11 @@ post_install() { post_upgrade } post_upgrade() { - if [ "`grep -E '(cnid|atalkd|afpd)' /etc/rc.conf`" ];then + if [ -f /etc/rc.conf ] && [ "`grep -E '(cnid|atalkd|afpd)' /etc/rc.conf`" ];then echo '>>> Detected old netatalk daemon entries in'; echo '>>> /etc/rc.conf, please replace these with'; echo '>>> "netatalk" before restarting!'; - else echo '>>> Add "netatalk" to your DAEMONS list in /etc/rc.conf';fi + else echo '>>> Add "netatalk" to your DAEMONS list';fi echo '>>>'; if [ -f /etc/avahi/services/adisk.service ] || [ -f /etc/avahi/services/afpd.service ];then @@ -18,6 +18,3 @@ post_upgrade() { echo '>>> Found *.conf in /opt/netatalk, please'; echo '>>> migrate these to /etc/netatalk before restarting';fi } -pre_remove() { - rc.d stop netatalk -} diff --git a/social/netatalk/netatalk.rc b/social/netatalk/netatalk.rc deleted file mode 100644 index f14d67ee3..000000000 --- a/social/netatalk/netatalk.rc +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -NAME="Appletalk Services Daemon" -ARGS= -DAEMON=netatalk - -[ -r /etc/conf.d/$DAEMON ] && . /etc/conf.d/$DAEMON - -PID=`get_pid $DAEMON` - -case "$1" in - start) - stat_busy "Starting $NAME" - [ -z "$PID" ] && $DAEMON $ARGS &>/dev/null - if [ $? = 0 ]; then - add_daemon $DAEMON - stat_done - else - stat_fail - exit 1 - fi - ;; - stop) - stat_busy "Stopping $NAME" - [ -n "$PID" ] && kill $PID &>/dev/null - if [ $? = 0 ]; then - rm_daemon $DAEMON - stat_done - else - stat_fail - exit 1 - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -- cgit v1.2.3-54-g00ecf From 7ad962cb59151982416803f4c42bf114dbc9c4ee Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Sun, 11 Nov 2012 19:56:22 -0200 Subject: mednafen-wip: fixing dependencies --- pcr/mednafen-wip/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pcr/mednafen-wip/PKGBUILD b/pcr/mednafen-wip/PKGBUILD index 2abee7f46..c3e5d6137 100755 --- a/pcr/mednafen-wip/PKGBUILD +++ b/pcr/mednafen-wip/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=mednafen pkgname=mednafen-wip pkgver=0.9.26 _pkgver=422 -pkgrel=1 +pkgrel=2 pkgdesc='A command-line multi-system gaming emulator, WIP version' url="http://$pkgbase.sourceforge.net/" license=( @@ -20,7 +20,7 @@ arch=( mips64el ) depends=( - jack2 + jack 'libcdio>=0.83' sdl-libre ) -- cgit v1.2.3-54-g00ecf