diff options
-rw-r--r-- | libre/grub2/PKGBUILD | 71 | ||||
-rw-r--r-- | libre/grub2/archlinux_grub2_mkconfig_fixes.patch | 119 | ||||
-rw-r--r-- | libre/grub2/grub.default | 16 | ||||
-rw-r--r-- | libre/grub2/grub2.install | 47 | ||||
-rw-r--r-- | libre/grub2/grub2_bzr_export.sh | 103 | ||||
-rw-r--r-- | libre/grub2/parabola-mkconfig.patch | 81 | ||||
-rw-r--r-- | social/statusnet/PKGBUILD | 1259 | ||||
-rw-r--r-- | social/statusnet/statusnet.install | 2 | ||||
-rw-r--r-- | social/tinc/PKGBUILD | 11 |
9 files changed, 311 insertions, 1398 deletions
diff --git a/libre/grub2/PKGBUILD b/libre/grub2/PKGBUILD index 7c1c0177a..9f445eb1d 100644 --- a/libre/grub2/PKGBUILD +++ b/libre/grub2/PKGBUILD @@ -1,24 +1,28 @@ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Keshav P R <skodabenz at rocketmail dot com> -# _grub2_rev=3072 +# The src pkg includes grub2_bzr_export.sh to create newer grub-extras snapshots. Modify the paths in it accordingly. -_grub2_lua_ver=19 +# _grub2_rev=3238 + +_grub2_lua_ver=20 _grub2_gpxe_ver=12 -_grub2_ntldr_ver=13 -_grub2_915_ver=6 +_grub2_ntldr_ver=17 +_grub2_915_ver=7 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386') pkgbase="grub2" -pkgver='1.99~rc1' -pkgrel=4.1 +pkgver='1.99' +pkgrel=4 url="http://www.gnu.org/software/grub/" arch=('i686' 'x86_64') license=('GPL3') -makedepends=('bdf-unifont' 'python2' 'xz' 'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper' 'flex') +epoch=1 +makedepends=('bdf-unifont' 'python2' 'xz' 'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper') options=(strip purge docs zipman !emptydirs) -source=("ftp://alpha.gnu.org/gnu/grub/grub-${pkgver}.tar.gz" +# "http://alpha.gnu.org/gnu/grub/grub-${pkgver}.tar.xz" +source=("ftp://ftp.gnu.org/gnu/grub/grub-1.99.tar.xz" "ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub2_lua_ver}.tar.xz" "ftp://ftp.archlinux.org/other/grub2/grub2_extras_gpxe_r${_grub2_gpxe_ver}.tar.xz" "ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub2_ntldr_ver}.tar.xz" @@ -27,7 +31,7 @@ source=("ftp://alpha.gnu.org/gnu/grub/grub-${pkgver}.tar.gz" 'grub.default' 'grub.cfg' '20_memtest86+' - '05_archtheme' + 'grub2_bzr_export.sh' 'parabola-mkconfig.patch') noextract=("grub2_extras_lua_r${_grub2_lua_ver}.tar.xz" @@ -35,6 +39,17 @@ noextract=("grub2_extras_lua_r${_grub2_lua_ver}.tar.xz" "grub2_extras_ntldr-img_r${_grub2_ntldr_ver}.tar.xz" "grub2_extras_915resolution_r${_grub2_915_ver}.tar.xz") +sha1sums=('a5ae9558f30ce7757a76aa130088b053a87e2fb6' + '9f2dbf7a3faab24ca92266400aa513fecd3895c8' + 'b04994c005910b4bf123f034b30109d5c8d6fd86' + 'e0c1a97770cc23226cf4535c029ef50b17f67974' + '8bcaed545956bb33581e1b97ac96a2c3717ec793' + 'b7e5510c7b171e9c4dbddb42bbf54ce5ee86e2de' + 'd1252b837b13ebf817dbc45cfd4d772c7d1b621f' + '7df0516c6c45816aa330b775f1ed6f652e4f0380' + '82a27eca5277218cf57c6c5767e0b17a72f62229' + 'beb31419045db70fee7401aa6448c220a491e2a3' + '27930016362d6647282405183b9977f0a7b15c1a') build() { # set architecture dependent variables @@ -56,7 +71,7 @@ build_grub2-common_and_bios() { ## Apply Archlinux specific fixes to enable grub2-mkconfig detect Arch kernels and initramfs cd ${srcdir}/grub2_bios-${pkgver} patch -Np1 -i ${srcdir}/archlinux_grub2_mkconfig_fixes.patch - patch -Np1 -i ${srcdir}/parabola-mkconfig.patch + patch -Np1 -i ${srcdir}/parabola-mkconfig.patch # add the grub-extra sources export GRUB_CONTRIB=${srcdir}/grub2_bios-${pkgver}/grub2-extras/ @@ -90,8 +105,7 @@ build_grub2-common_and_bios() { --bindir=/bin --sbindir=/sbin \ --mandir=/usr/share/man --infodir=/usr/share/info \ --sysconfdir=/etc --enable-nls \ - --program-transform-name=s,grub,grub, \ - --disable-werror + --program-transform-name=s,grub,grub, CFLAGS="" make } @@ -121,22 +135,18 @@ build_grub2-efi() { --prefix=/usr --bindir=/bin \ --sbindir=/sbin --mandir=/usr/share/man \ --infodir=/usr/share/info --sysconfdir=/etc \ - --enable-nls --program-transform-name=s,grub,grub, \ - --disable-werror + --enable-nls --program-transform-name=s,grub,grub, CFLAGS="" make } package_grub2-common() { pkgdesc="The GNU GRand Unified Bootloader version 2 - Files common for all platforms" install="grub2.install" - depends=('xz' 'freetype2' 'device-mapper') + depends=('xz' 'freetype2' 'device-mapper' 'gettext' 'texinfo') conflicts=('grub') backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom') cd ${srcdir}/grub2_bios-${pkgver} - make DESTDIR=${pkgdir} install - - ## install grub2-extras ntldr-img's grubinst as /sbin/grubinst - install -Dm755 ${srcdir}/grub2_bios-${pkgver}/grub-core/grubinst ${pkgdir}/sbin/grubinst + make DESTDIR=${pkgdir} install install -Dm755 ${pkgdir}/sbin/grub-install ${pkgdir}/sbin/grub_bios-install install -Dm755 ${pkgdir}/sbin/grub-install ${pkgdir}/sbin/grub_efi_x86_64-install @@ -155,7 +165,6 @@ package_grub2-common() { ${pkgdir}/sbin/grub_efi_i386-install ## install extra /etc/grub.d/ files - install -Dm755 ${srcdir}/05_archtheme ${pkgdir}/etc/grub.d/05_archtheme install -Dm755 ${srcdir}/20_memtest86+ ${pkgdir}/etc/grub.d/20_memtest86+ ## install /etc/default/grub (used by grub-mkconfig) @@ -170,9 +179,9 @@ package_grub2-common() { package_grub2-bios() { pkgdesc="The GNU GRand Unified Bootloader version 2 - Built for PC BIOS" - depends=(grub2-common=${pkgver}) - replaces=('grub2') - provides=('grub2') + depends=(grub2-common=${epoch}:${pkgver}) + replaces=('grub2' 'grub2-libre') + provides=('grub2' 'grub2-libre') cd ${srcdir}/grub2_bios-${pkgver} make DESTDIR=${pkgdir} install @@ -185,8 +194,8 @@ package_grub2-bios() { package_grub2-efi-i386() { pkgdesc="The GNU GRand Unified Bootloader version 2 - i386 UEFI version" - depends=("grub2-common=${pkgver}" 'dosfstools') - optdepends=('efibootmgr') + depends=("grub2-common=${epoch}:${pkgver}" 'dosfstools' 'efibootmgr') + optdepends=('mtools') cd ${srcdir}/grub2_efi-${pkgver} make DESTDIR=${pkgdir} install @@ -195,15 +204,3 @@ package_grub2-efi-i386() { rm -rf ${pkgdir}/{boot,bin,sbin,etc,usr/share} rm ${pkgdir}/usr/lib/grub/{grub-mkconfig_lib,update-grub_lib} } - -md5sums=('fd602ffaada5ba7939d0ea47091841a5' - '21b709f119e0bef1c51978d757e885dc' - '9e0944f3e63586dc4242fd8b7977e3c4' - '0a124ffc9835100ba0e7de7a0ac1c389' - '0016761d429e6a77b90d09ed6ee8a47d' - '93f0f96911451e86014e04f96e13462f' - '50123c37cf145a98aba4ffb0fc4efba1' - '7cb90ebb04b856ded6ae171c3658fba2' - '5a07e04c4ecb8ed145d54fec3043e0d5' - 'e143ae2e453b7c3ced309667df30da55' - 'bc369fcd7576beba804cad91f2b79f8f') diff --git a/libre/grub2/archlinux_grub2_mkconfig_fixes.patch b/libre/grub2/archlinux_grub2_mkconfig_fixes.patch index 62acd2ee8..11805e309 100644 --- a/libre/grub2/archlinux_grub2_mkconfig_fixes.patch +++ b/libre/grub2/archlinux_grub2_mkconfig_fixes.patch @@ -1,21 +1,7 @@ -diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index b041a38..6f31dce 100644 ---- a/util/grub-mkconfig.in -+++ b/util/grub-mkconfig.in -@@ -252,6 +252,8 @@ export GRUB_DEFAULT \ - GRUB_THEME \ - GRUB_GFXPAYLOAD_LINUX \ - GRUB_DISABLE_OS_PROBER \ -+ GRUB_COLOR_NORMAL \ -+ GRUB_COLOR_HIGHLIGHT \ - GRUB_INIT_TUNE \ - GRUB_SAVEDEFAULT \ - GRUB_BADRAM -diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in -index 420b3f3..79fd4fb 100644 ---- a/util/grub.d/00_header.in -+++ b/util/grub.d/00_header.in -@@ -100,6 +100,14 @@ cat <<EOF +diff -Nur a/util/grub.d/00_header.in b/util/grub.d/00_header.in +--- a/util/grub.d/00_header.in 2011-04-06 13:14:27.000000000 +0200 ++++ b/util/grub.d/00_header.in 2011-08-01 15:19:57.919100452 +0200 +@@ -100,6 +100,14 @@ EOF @@ -30,64 +16,75 @@ index 420b3f3..79fd4fb 100644 serial=0; gfxterm=0; for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do -diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index a09c3e6..cf12ea9 100644 ---- a/util/grub.d/10_linux.in -+++ b/util/grub.d/10_linux.in -@@ -31,8 +31,8 @@ CLASS="--class gnu-linux --class gnu --class os" +diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in +--- a/util/grub.d/10_linux.in 2011-05-14 22:36:49.000000000 +0200 ++++ b/util/grub.d/10_linux.in 2011-08-01 15:56:53.324779083 +0200 +@@ -31,8 +31,8 @@ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then OS=GNU/Linux else - OS="${GRUB_DISTRIBUTOR} GNU/Linux" -- CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) ${CLASS}" +- CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}" + OS="${GRUB_DISTRIBUTOR}" -+ CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | tr -d ' ') ${CLASS}" ++ CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | tr -d ' ') ${CLASS}" fi # loop-AES arranges things so that /dev/loop/X can be our root device, but -@@ -48,7 +48,7 @@ if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" - || uses_abstraction "${GRUB_DEVICE}" lvm; then - LINUX_ROOT_DEVICE=${GRUB_DEVICE} - else -- LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID} -+ LINUX_ROOT_DEVICE="/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" - fi +@@ -65,7 +65,9 @@ + version="$2" + recovery="$3" + args="$4" +- if ${recovery} ; then ++ if [ -n "$5" ] ; then ++ title="$(gettext_quoted "%s, with Linux %s") $5" ++ elif ${recovery} ; then + title="$(gettext_quoted "%s, with Linux %s (recovery mode)")" + else + title="$(gettext_quoted "%s, with Linux %s")" +@@ -132,7 +134,7 @@ - linux_entry () -@@ -111,7 +111,7 @@ EOF - EOF - } - --list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* ; do -+list=`for i in /boot/vmlinuz* /boot/vmlinux* /vmlinuz* /vmlinux* ; do - if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi - done` - prepare_boot_cache= -@@ -123,14 +123,12 @@ while [ "x$list" != "x" ] ; do - dirname=`dirname $linux` - rel_dirname=`make_system_path_relative_to_its_root $dirname` - version=`echo $basename | sed -e "s,^[^0-9]*-,,g"` -- alt_version=`echo $version | sed -e "s,\.old$,,g"` -+ base_init=`echo $basename | sed -e "s,vmlinuz,kernel,g"` -+ alt_version="${base_init}-fallback" - linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" - - initrd= -- for i in "initrd.img-${version}" "initrd-${version}.img" \ -- "initrd-${version}" "initramfs-${version}.img" \ -- "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ -- "initrd-${alt_version}" "initramfs-${alt_version}.img"; do -+ for i in "${base_init}.img"; do + case x`uname -m` in + xi?86 | xx86_64) +- list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do ++ list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* /boot/vmlinuz26-* ; do + if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi + done` ;; + *) +@@ -160,7 +162,8 @@ + "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ + "initrd-${alt_version}" "initramfs-${alt_version}.img" \ + "initramfs-genkernel-${version}" \ +- "initramfs-genkernel-${alt_version}"; do ++ "initramfs-genkernel-${alt_version}" \ ++ "${basename/vmlinuz/kernel}.img"; do if test -e "${dirname}/${i}" ; then initrd="$i" break -@@ -155,6 +153,9 @@ while [ "x$list" != "x" ] ; do +@@ -190,6 +193,15 @@ linux_entry "${OS}" "${version}" false \ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -+ initrd="${alt_version}.img" -+ linux_entry "${OS}" "${version} Fallback" false \ -+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" ++ for i in "initramfs-${version}-fallback.img" \ ++ "${basename/vmlinuz/kernel}-fallback.img"; do ++ if test -e "${dirname}/${i}"; then ++ initrd="$i" ++ linux_entry "${OS}" "${version}" true \ ++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" Fallback ++ break ++ fi ++ done if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then linux_entry "${OS}" "${version}" true \ "single ${GRUB_CMDLINE_LINUX}" +diff -Nur a/util/grub-mkconfig.in b/util/grub-mkconfig.in +--- a/util/grub-mkconfig.in 2011-04-06 17:45:53.000000000 +0200 ++++ b/util/grub-mkconfig.in 2011-08-01 15:20:49.256867648 +0200 +@@ -252,6 +252,8 @@ + GRUB_THEME \ + GRUB_GFXPAYLOAD_LINUX \ + GRUB_DISABLE_OS_PROBER \ ++ GRUB_COLOR_NORMAL \ ++ GRUB_COLOR_HIGHLIGHT \ + GRUB_INIT_TUNE \ + GRUB_SAVEDEFAULT \ + GRUB_BADRAM diff --git a/libre/grub2/grub.default b/libre/grub2/grub.default index 8302bdb3f..fecc09af6 100644 --- a/libre/grub2/grub.default +++ b/libre/grub2/grub.default @@ -3,31 +3,37 @@ GRUB_DEFAULT=0 GRUB_TIMEOUT=5 -GRUB_DISTRIBUTOR="Arch Linux" +GRUB_DISTRIBUTOR="Parabola GNU/Linux-libre" GRUB_CMDLINE_LINUX_DEFAULT="quiet" GRUB_CMDLINE_LINUX="" +# Preload both GPT and MBR modules so that they are not missed +GRUB_PRELOAD_MODULES="part_gpt part_msdos" + # Uncomment to enable Hidden Menu, and optionally hide the timeout count #GRUB_HIDDEN_TIMEOUT=5 #GRUB_HIDDEN_TIMEOUT_QUIET=true +# Uncomment to use basic console +GRUB_TERMINAL_INPUT=console + # Uncomment to disable graphical terminal -#GRUB_TERMINAL=console +#GRUB_TERMINAL_OUTPUT=console # The resolution used on graphical terminal # note that you can use only modes which your graphic card supports via VBE # you can see them in real GRUB with the command `vbeinfo' -#GRUB_GFXMODE=1024x768x24 +GRUB_GFXMODE=auto # Uncomment to allow the kernel use the same resolution used by grub -#GRUB_GFXPAYLOAD_LINUX=keep +GRUB_GFXPAYLOAD_LINUX=keep # Uncomment if you want GRUB to pass to the Linux kernel the old parameter # format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx" #GRUB_DISABLE_LINUX_UUID=true # Uncomment to disable generation of recovery mode menu entries -#GRUB_DISABLE_RECOVERY="true" +GRUB_DISABLE_RECOVERY=true # Uncomment and set to the desired menu colors. Used by normal and wallpaper # modes only. Entries specified as foreground/background. diff --git a/libre/grub2/grub2.install b/libre/grub2/grub2.install index 898dc9246..9baf14776 100644 --- a/libre/grub2/grub2.install +++ b/libre/grub2/grub2.install @@ -1,30 +1,29 @@ -post_install() { - - if [ -f /boot/grub/grub.cfg.pacsave ]; then - echo "Copying /boot/grub/grub.cfg.pacsave to /boot/grub/grub.cfg" - install -Dm644 /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg - fi - - echo -n "Generating grub.cfg.example config file... " - grub-mkconfig -o /boot/grub/grub.cfg.example 2> /dev/null - echo "done." - -cat << EOF - An example config file is created at /boot/grub/grub.cfg.example - - For more information and additional config settings please see http://wiki.archlinux.org/index.php/GRUB2 - -EOF +infodir=usr/share/info +filelist=(grub.info grub-dev.info) +post_install() { + if [ -f /boot/grub/grub.cfg.pacsave ]; then + echo "Copying /boot/grub/grub.cfg.pacsave to /boot/grub/grub.cfg" + install -Dm644 /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg + fi + + echo -n "Generating grub.cfg.example config file... " + grub-mkconfig -o /boot/grub/grub.cfg.example 2> /dev/null + echo "done." + + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done } - post_upgrade() { -cat << EOF - An example config file is created at /boot/grub/grub.cfg.example - - For more information and additional config settings please see http://wiki.archlinux.org/index.php/GRUB2 - -EOF + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done } +pre_remove() { + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} diff --git a/libre/grub2/grub2_bzr_export.sh b/libre/grub2/grub2_bzr_export.sh new file mode 100644 index 000000000..7c42d0c28 --- /dev/null +++ b/libre/grub2/grub2_bzr_export.sh @@ -0,0 +1,103 @@ +#!/bin/sh + +## For actual repos + +# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/lua lua +# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/gpxe gpxe +# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/ntldr-img ntldr-img +# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/915resolution 915resolution + +## For launchpad mirror + +# bzr branch lp:~skodabenz/grub/grub2-extras-lua lua +# bzr branch lp:~skodabenz/grub/grub2-extras-gpxe gpxe +# bzr branch lp:~skodabenz/grub/grub2-extras-ntldr-img ntldr-img +# bzr branch lp:~skodabenz/grub/grub2-extras-915resolution 915resolution + +## grub-extras zfs is integrated into grub2 bzr main repo and is no longer needed separately. + +wd=${PWD}/ +output_dir=${wd}/ + +grub2_bzr_dir=${wd}/grub2_BZR/ +grub2_bzr_exp_dir=${wd}/grub2_experimental_BZR/ +grub2_extras_dir=${wd}/grub2_extras_BZR/ + +main_snapshot() { + + cd ${grub2_bzr_dir}/ + echo + + revnum=$(bzr revno ${grub2_bzr_dir}) + bzr export --root=grub2 --format=tar ${output_dir}/grub2_r${revnum}.tar + echo + + cd ${output_dir}/ + + xz -9 ${output_dir}/grub2_r${revnum}.tar + echo + +} + +exp_snapshot() { + + cd ${grub2_bzr_exp_dir}/ + echo + + revnum=$(bzr revno ${grub2_bzr_exp_dir}) + bzr export --root=grub2_exp --format=tar ${output_dir}/grub2_exp_r${revnum}.tar + echo + + cd ${output_dir}/ + + xz -9 ${output_dir}/grub2_exp_r${revnum}.tar + echo + +} + +extras_snapshot() { + + cd ${grub2_extras_dir}/${grub2_extras_name}/ + echo + + revnum=$(bzr revno ${grub2_extras_dir}/${grub2_extras_name}) + bzr export --root=${grub2_extras_name} --format=tar ${output_dir}/grub2_extras_${grub2_extras_name}_r${revnum}.tar + echo + + cd ${output_dir}/ + echo + + xz -9 ${output_dir}/grub2_extras_${grub2_extras_name}_r${revnum}.tar + echo + +} + +echo + +set -x -e + +# main_snapshot + +# exp_snapshot + +grub2_extras_name="lua" +extras_snapshot + +grub2_extras_name="gpxe" +extras_snapshot + +grub2_extras_name="ntldr-img" +extras_snapshot + +grub2_extras_name="915resolution" +extras_snapshot + +set +x +e + +echo + +unset wd +unset output_dir +unset grub2_bzr_dir +unset grub2_extras_dir +unset grub2_extras_name diff --git a/libre/grub2/parabola-mkconfig.patch b/libre/grub2/parabola-mkconfig.patch index d9aae8501..7c18a4cc2 100644 --- a/libre/grub2/parabola-mkconfig.patch +++ b/libre/grub2/parabola-mkconfig.patch @@ -1,51 +1,32 @@ -diff -ru grub-1.99~rc1-orig/util/grub.d/10_linux.in grub-1.99~rc1/util/grub.d/10_linux.in ---- grub-1.99~rc1-orig/util/grub.d/10_linux.in 2011-08-08 17:03:17.177418423 +0200 -+++ grub-1.99~rc1/util/grub.d/10_linux.in 2011-08-08 19:36:17.307138530 +0200 -@@ -57,12 +57,22 @@ - version="$2" - recovery="$3" - args="$4" -- if ${recovery} ; then -- title="$(gettext_quoted "%s, with Linux %s (recovery mode)")" -+ if echo "$version" | fgrep . ; then -+ if ${recovery} ; then -+ title="$(gettext_quoted "%s, with Linux %s (recovery mode)")" -+ else -+ title="$(gettext_quoted "%s, with Linux %s")" -+ fi -+ printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}" - else -- title="$(gettext_quoted "%s, with Linux %s")" -+ # Parabola GNU/Linux-libre doesn't put kernel version in its file name. -+ if ${recovery} ; then -+ title="$(gettext_quoted "%s (recovery mode)")" -+ else -+ title="%s" -+ fi -+ printf "menuentry '${title}' ${CLASS} {\n" "${os}" - fi -- printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}" - if ! ${recovery} ; then - save_default_entry | sed -e "s/^/\t/" - fi -@@ -123,7 +133,7 @@ - dirname=`dirname $linux` - rel_dirname=`make_system_path_relative_to_its_root $dirname` - version=`echo $basename | sed -e "s,^[^0-9]*-,,g"` -- base_init=`echo $basename | sed -e "s,vmlinuz,kernel,g"` -+ base_init=`echo $basename | sed -e "s,vmlinuz,initramfs,g"` - alt_version="${base_init}-fallback" - linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" +diff -ru grub-1.99.orig/util/grub.d/10_linux.in grub-1.99/util/grub.d/10_linux.in +--- grub-1.99.orig/util/grub.d/10_linux.in 2011-08-11 15:54:52.051246328 +0200 ++++ grub-1.99/util/grub.d/10_linux.in 2011-08-11 15:55:41.297910793 +0200 +@@ -134,7 +134,7 @@ -diff -ru grub-1.99~rc1-orig/util/grub-mkconfig_lib.in grub-1.99~rc1/util/grub-mkconfig_lib.in ---- grub-1.99~rc1-orig/util/grub-mkconfig_lib.in 2011-08-08 17:03:17.177418423 +0200 -+++ grub-1.99~rc1/util/grub-mkconfig_lib.in 2011-08-08 17:04:48.064082390 +0200 -@@ -130,7 +130,7 @@ - - grub_file_is_not_garbage () - { -- if test -f "$1" ; then -+ if test -f "$1" -a ! -L "$1" ; then - case "$1" in - *.dpkg-*) return 1 ;; # debian dpkg - README*) return 1 ;; # documentation + case x`uname -m` in + xi?86 | xx86_64) +- list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* /boot/vmlinuz26-* ; do ++ list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* /boot/vmlinuz26-* /boot/vmlinuz26 ; do + if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi + done` ;; + *) +@@ -163,7 +163,8 @@ + "initrd-${alt_version}" "initramfs-${alt_version}.img" \ + "initramfs-genkernel-${version}" \ + "initramfs-genkernel-${alt_version}" \ +- "${basename/vmlinuz/kernel}.img"; do ++ "${basename/vmlinuz/kernel}.img" \ ++ "${basename/vmlinuz/initramfs}.img"; do + if test -e "${dirname}/${i}" ; then + initrd="$i" + break +@@ -194,7 +195,8 @@ + linux_entry "${OS}" "${version}" false \ + "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" + for i in "initramfs-${version}-fallback.img" \ +- "${basename/vmlinuz/kernel}-fallback.img"; do ++ "${basename/vmlinuz/kernel}-fallback.img" \ ++ "${basename/vmlinuz/initramfs}-fallback.img"; do + if test -e "${dirname}/${i}"; then + initrd="$i" + linux_entry "${OS}" "${version}" true \ diff --git a/social/statusnet/PKGBUILD b/social/statusnet/PKGBUILD index 7aa359e38..998751df5 100644 --- a/social/statusnet/PKGBUILD +++ b/social/statusnet/PKGBUILD @@ -1,82 +1,41 @@ # Contributor: fauno <fauno@kiwwwi.com.ar> pkgbase=statusnet -pkgname=('statusnet-base' -'statusnet-plugins-piwikanalytics' -'statusnet-plugins-groupprivatemessage' -'statusnet-plugins-subscriptionthrottle' 'statusnet-plugins-mollom' -'statusnet-plugins-noticetitle' 'statusnet-plugins-googleanalytics' -'statusnet-plugins-groupfavorited' 'statusnet-plugins-simpleurl' -'statusnet-plugins-modhelper' 'statusnet-plugins-meteor' -'statusnet-plugins-newmenu' 'statusnet-plugins-memcached' -'statusnet-plugins-ldapauthorization' 'statusnet-plugins-lilurl' -'statusnet-plugins-template' 'statusnet-plugins-openx' -'statusnet-plugins-sharenotice' 'statusnet-plugins-logfilter' -'statusnet-plugins-spotify' 'statusnet-plugins-adsense' -'statusnet-plugins-postdebug' 'statusnet-plugins-inprocesscache' -'statusnet-plugins-blacklist' 'statusnet-plugins-linkpreview' -'statusnet-plugins-realtime' 'statusnet-plugins-openexternallinktarget' -'statusnet-plugins-diskcache' 'statusnet-plugins-autosandbox' -'statusnet-plugins-linkback' 'statusnet-plugins-apilogger' -'statusnet-plugins-autocomplete' 'statusnet-plugins-wikihashtags' -'statusnet-plugins-imap' 'statusnet-plugins-anonymousfave' -'statusnet-plugins-sample' 'statusnet-plugins-memcache' -'statusnet-plugins-ostatus' 'statusnet-plugins-tabfocus' -'statusnet-plugins-ldapcommon' 'statusnet-plugins-mapstraction' -'statusnet-plugins-userlimit' 'statusnet-plugins-echo' -'statusnet-plugins-tinymce' 'statusnet-plugins-requirevalidatedemail' -'statusnet-plugins-modplus' 'statusnet-plugins-enjit' 'statusnet-plugins-apc' -'statusnet-plugins-cachelog' 'statusnet-plugins-followeveryone' -'statusnet-plugins-facebookbridge' 'statusnet-plugins-emailsummary' -'statusnet-plugins-orbited' 'statusnet-plugins-urlshortener' -'statusnet-plugins-ldapauthentication' 'statusnet-plugins-openid' -'statusnet-plugins-sqlprofile' 'statusnet-plugins-directiondetector' -'statusnet-plugins-twitterbridge' 'statusnet-plugins-geonames' -'statusnet-plugins-extendedprofile' 'statusnet-plugins-wikihowprofile' -'statusnet-plugins-blankad' 'statusnet-plugins-clientsideshorten' -'statusnet-plugins-forcegroup' 'statusnet-plugins-emailauthentication' -'statusnet-plugins-comet' 'statusnet-plugins-recaptcha' -'statusnet-plugins-registerthrottle' 'statusnet-plugins-mobileprofile' -'statusnet-plugins-ptiturl' 'statusnet-plugins-submirror' -'statusnet-plugins-gravatar' 'statusnet-plugins-sphinxsearch' -'statusnet-plugins-geourl' 'statusnet-plugins-infinitescroll' -'statusnet-plugins-slicedfavorites' 'statusnet-plugins-disqus' -'statusnet-plugins-minify' 'statusnet-plugins-tighturl' -'statusnet-plugins-yammerimport' 'statusnet-plugins-bitlyurl' -'statusnet-plugins-awesomeness' 'statusnet-plugins-userflag' -'statusnet-plugins-blogspamnet' -'statusnet-plugins-reverseusernameauthentication' 'statusnet-plugins-sitemap' -'statusnet-plugins-mobile' 'statusnet-plugins-poweredbystatusnet' -'statusnet-plugins-bookmark' 'statusnet-plugins-firephp' -'statusnet-plugins-xcache' 'statusnet-plugins-rsscloud' -'statusnet-plugins-casauthentication' 'statusnet-i18n-nn' -'statusnet-i18n-af' 'statusnet-i18n-cs' 'statusnet-i18n-mk' 'statusnet-i18n-ml' -'statusnet-i18n-hsb' 'statusnet-i18n-pl' 'statusnet-i18n-he' -'statusnet-i18n-en_gb' 'statusnet-i18n-pt' 'statusnet-i18n-tr' -'statusnet-i18n-ja' 'statusnet-i18n-ru' 'statusnet-i18n-uk' 'statusnet-i18n-fi' -'statusnet-i18n-ka' 'statusnet-i18n-bg' 'statusnet-i18n-de' 'statusnet-i18n-hu' -'statusnet-i18n-ar' 'statusnet-i18n-te' 'statusnet-i18n-el' 'statusnet-i18n-ko' -'statusnet-i18n-is' 'statusnet-i18n-da' 'statusnet-i18n-it' -'statusnet-i18n-arz' 'statusnet-i18n-gl' 'statusnet-i18n-fa' -'statusnet-i18n-ca' 'statusnet-i18n-fr' 'statusnet-i18n-en' -'statusnet-i18n-fur' 'statusnet-i18n-br' 'statusnet-i18n-zh_tw' -'statusnet-i18n-eo' 'statusnet-i18n-nl' 'statusnet-i18n-nb' 'statusnet-i18n-es' -'statusnet-i18n-vi' 'statusnet-i18n-pt_br' 'statusnet-i18n-ga' -'statusnet-i18n-ia' 'statusnet-i18n-sv' 'statusnet-i18n-zh_cn') -pkgver=0.9.7 +pkgname=statusnet-base +pkgver=0.9.9 + +# find available plugins and locales +srcfile=${SRCDEST}/${pkgbase}-${pkgver}.tar.gz +if [ -e ${srcfile} ]; then +plugins=($(bsdtar -tf ${srcfile} \ + ${pkgbase}-${pkgver}/plugins | \ + cut -d'/' -f3 | sort -u)) +locales=($(bsdtar -tf ${srcfile} \ + ${pkgbase}-${pkgver}/locale | \ + cut -d'/' -f3 | sort -u)) +fi + +# looping avoids having "statusnet-plugin-" package +pkgname=(${pkgname} + $(for plugin in ${plugins[@]}; do + echo ${plugin} | tr [A-Z] [a-z] | \ + sed "s/^/statusnet-plugin-/" + done) + $(for locale in ${locales[@]}; do + echo ${locale} | tr [A-Z] [a-z] | \ + sed "s/^/statusnet-i18n-/" + done)) pkgrel=1 -pkgdesc="StatusNet is a Free and Open Source microblogging platform." arch=('any') +pkgdesc="StatusNet is a Free and Open Source microblogging platform." url="http://status.net" license=('AGPL') -groups=('social-web') depends=('php>=5.2.3' 'mysql>=5' 'php-gd' 'php-curl' 'php-gmp') -provides=() -options=() source=("http://status.net/${pkgbase}-${pkgver}.tar.gz" statusnet.install) install=statusnet.install -md5sums=('321674f47934e62ff4bd94b80d9d9ba0' - '24991580625ec177c144ed5acdbe6dbc') +md5sums=('766c9d42825fc99d8ad6c554a959568b' + 'c638cb36b7da7eb67a67e031f59e6068') +options=(!strip !zipman emptydirs) build() { /bin/true @@ -86,8 +45,9 @@ package_statusnet-base() { provides=('statusnet') optdepends=('memcache: for caching database queries' 'php-xcache: for accelerating PHP code execution' + 'php-apc: for accelerating PHP code execution' 'php-ldap: for the LDAP plugin' - 'statusnet-plugins-ostatus: for federation') + 'statusnet-plugin-ostatus: for federation') cd "$srcdir/$pkgbase-${pkgver}" @@ -122,6 +82,9 @@ package_statusnet-base() { install -d ${usr_dir}/plugins install -d ${usr_dir}/locale + + install -d ${pkgdir}/srv/http + ln -s /usr/share/webapps/${pkgbase} ${pkgdir}/srv/http/ } # Helper for creating i18n packages @@ -133,1166 +96,36 @@ statusnet-i18n-helper() { } # Helper for creating plugin packages -statusnet-plugins-helper() { +statusnet-plugin-helper() { cd "${srcdir}/${pkgbase}-${pkgver}" install -d "${pkgdir}/usr/share/webapps/statusnet/plugins/${1}" cp -ra "./plugins/${1}" "${pkgdir}/usr/share/webapps/statusnet/plugins/${1}/" } -# Gets the available plugins and returns package_statusnet-plugins-* functions -# Must be ran from PKGBUILD dir after `makepkg -o` -helper_get_plugins() { - cd ./src/${pkgbase}-${pkgver}/plugins - plugins=($(find . -maxdepth 1 -type d | sed "s/^.*\///")) - for plugin in ${plugins[@]}; do - plugin_lower=$(echo ${plugin} | tr [A-Z] [a-z]) +for plugin in ${plugins[@]}; do + plugin_lower=$(echo ${plugin} | tr [A-Z] [a-z]) - echo " -package_statusnet-plugins-${plugin_lower}() { + eval " +package_statusnet-plugin-${plugin_lower}() { pkgdesc='${plugin} plugin for StatusNet' - depends=('statusnet') + depends=('statusnet-base') groups=('statusnet-plugins') - statusnet-plugins-helper ${plugin} + statusnet-plugin-helper ${plugin} }" - done +done - # Generates a pkgname line - echo "${plugins[@]}" | tr [A-Z] [a-z] | \ - sed "s/\(^\| \)\([^ ]\+\)/\1'statusnet-plugins-\2'/g" - - cd ../../.. -} +for locale in ${locales[@]}; do + locale_lower=$(echo ${locale} | tr [A-Z] [a-z]) -# Gets the available plugins and returns package_statusnet-i18n-* functions -# Must be ran from PKGBUILD dir after `makepkg -o` -helper_get_locales() { - cd ./src/${pkgbase}-${pkgver}/locale - locales=($(find . -maxdepth 1 -type d | sed "s/^.*\///")) - - for locale in ${locales[@]}; do - locale_lower=$(echo ${locale} | tr [A-Z] [a-z]) - - echo " + eval " package_statusnet-i18n-${locale_lower}() { pkgdesc='${locale} locale for StatusNet' - depends=('statusnet') + depends=('statusnet-base') groups=('statusnet-locales') statusnet-i18n-helper ${locale} }" - done - - # Generates a pkgname line - echo "${locales[@]}" | tr [A-Z] [a-z] | \ - sed "s/\(^\| \)\([^ ]\+\)/\1'statusnet-i18n-\2'/g" - cd ../../.. -} - -# AUTOGENERATED. Delete from next line before update - -package_statusnet-plugins-piwikanalytics() { - pkgdesc='PiwikAnalytics plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper PiwikAnalytics -} - -package_statusnet-plugins-groupprivatemessage() { - pkgdesc='GroupPrivateMessage plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper GroupPrivateMessage -} - -package_statusnet-plugins-subscriptionthrottle() { - pkgdesc='SubscriptionThrottle plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper SubscriptionThrottle -} - -package_statusnet-plugins-mollom() { - pkgdesc='Mollom plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper Mollom -} - -package_statusnet-plugins-noticetitle() { - pkgdesc='NoticeTitle plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper NoticeTitle -} - -package_statusnet-plugins-googleanalytics() { - pkgdesc='GoogleAnalytics plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper GoogleAnalytics -} - -package_statusnet-plugins-groupfavorited() { - pkgdesc='GroupFavorited plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper GroupFavorited -} - -package_statusnet-plugins-simpleurl() { - pkgdesc='SimpleUrl plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper SimpleUrl -} - -package_statusnet-plugins-modhelper() { - pkgdesc='ModHelper plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper ModHelper -} - -package_statusnet-plugins-meteor() { - pkgdesc='Meteor plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper Meteor -} - -package_statusnet-plugins-newmenu() { - pkgdesc='NewMenu plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper NewMenu -} - -package_statusnet-plugins-memcached() { - pkgdesc='Memcached plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper Memcached -} - -package_statusnet-plugins-ldapauthorization() { - pkgdesc='LdapAuthorization plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper LdapAuthorization -} - -package_statusnet-plugins-lilurl() { - pkgdesc='LilUrl plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper LilUrl -} - -package_statusnet-plugins-template() { - pkgdesc='Template plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper Template -} - -package_statusnet-plugins-openx() { - pkgdesc='OpenX plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper OpenX -} - -package_statusnet-plugins-sharenotice() { - pkgdesc='ShareNotice plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper ShareNotice -} - -package_statusnet-plugins-logfilter() { - pkgdesc='LogFilter plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper LogFilter -} - -package_statusnet-plugins-spotify() { - pkgdesc='Spotify plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper Spotify -} - -package_statusnet-plugins-adsense() { - pkgdesc='Adsense plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper Adsense -} - -package_statusnet-plugins-postdebug() { - pkgdesc='PostDebug plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper PostDebug -} - -package_statusnet-plugins-inprocesscache() { - pkgdesc='InProcessCache plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper InProcessCache -} - -package_statusnet-plugins-blacklist() { - pkgdesc='Blacklist plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper Blacklist -} - -package_statusnet-plugins-linkpreview() { - pkgdesc='LinkPreview plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper LinkPreview -} - -package_statusnet-plugins-realtime() { - pkgdesc='Realtime plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper Realtime -} - -package_statusnet-plugins-openexternallinktarget() { - pkgdesc='OpenExternalLinkTarget plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper OpenExternalLinkTarget -} - -package_statusnet-plugins-diskcache() { - pkgdesc='DiskCache plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper DiskCache -} - -package_statusnet-plugins-autosandbox() { - pkgdesc='AutoSandbox plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper AutoSandbox -} - -package_statusnet-plugins-linkback() { - pkgdesc='Linkback plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper Linkback -} - -package_statusnet-plugins-apilogger() { - pkgdesc='ApiLogger plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper ApiLogger -} - -package_statusnet-plugins-autocomplete() { - pkgdesc='Autocomplete plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper Autocomplete -} - -package_statusnet-plugins-wikihashtags() { - pkgdesc='WikiHashtags plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper WikiHashtags -} - -package_statusnet-plugins-imap() { - pkgdesc='Imap plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper Imap -} - -package_statusnet-plugins-anonymousfave() { - pkgdesc='AnonymousFave plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper AnonymousFave -} - -package_statusnet-plugins-sample() { - pkgdesc='Sample plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper Sample -} - -package_statusnet-plugins-memcache() { - pkgdesc='Memcache plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper Memcache -} - -package_statusnet-plugins-ostatus() { - pkgdesc='OStatus plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper OStatus -} - -package_statusnet-plugins-tabfocus() { - pkgdesc='TabFocus plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper TabFocus -} - -package_statusnet-plugins-ldapcommon() { - pkgdesc='LdapCommon plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper LdapCommon -} - -package_statusnet-plugins-mapstraction() { - pkgdesc='Mapstraction plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper Mapstraction -} - -package_statusnet-plugins-userlimit() { - pkgdesc='UserLimit plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper UserLimit -} - -package_statusnet-plugins-echo() { - pkgdesc='Echo plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper Echo -} - -package_statusnet-plugins-tinymce() { - pkgdesc='TinyMCE plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper TinyMCE -} - -package_statusnet-plugins-requirevalidatedemail() { - pkgdesc='RequireValidatedEmail plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper RequireValidatedEmail -} - -package_statusnet-plugins-modplus() { - pkgdesc='ModPlus plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper ModPlus -} - -package_statusnet-plugins-enjit() { - pkgdesc='Enjit plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper Enjit -} - -package_statusnet-plugins-apc() { - pkgdesc='APC plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper APC -} - -package_statusnet-plugins-cachelog() { - pkgdesc='CacheLog plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper CacheLog -} - -package_statusnet-plugins-followeveryone() { - pkgdesc='FollowEveryone plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper FollowEveryone -} - -package_statusnet-plugins-facebookbridge() { - pkgdesc='FacebookBridge plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper FacebookBridge -} - -package_statusnet-plugins-emailsummary() { - pkgdesc='EmailSummary plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper EmailSummary -} - -package_statusnet-plugins-orbited() { - pkgdesc='Orbited plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper Orbited -} - -package_statusnet-plugins-urlshortener() { - pkgdesc='UrlShortener plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper UrlShortener -} - -package_statusnet-plugins-ldapauthentication() { - pkgdesc='LdapAuthentication plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper LdapAuthentication -} - -package_statusnet-plugins-openid() { - pkgdesc='OpenID plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper OpenID -} - -package_statusnet-plugins-sqlprofile() { - pkgdesc='SQLProfile plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper SQLProfile -} - -package_statusnet-plugins-directiondetector() { - pkgdesc='DirectionDetector plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper DirectionDetector -} - -package_statusnet-plugins-twitterbridge() { - pkgdesc='TwitterBridge plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper TwitterBridge -} - -package_statusnet-plugins-geonames() { - pkgdesc='Geonames plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper Geonames -} - -package_statusnet-plugins-extendedprofile() { - pkgdesc='ExtendedProfile plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper ExtendedProfile -} - -package_statusnet-plugins-wikihowprofile() { - pkgdesc='WikiHowProfile plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper WikiHowProfile -} - -package_statusnet-plugins-blankad() { - pkgdesc='BlankAd plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper BlankAd -} - -package_statusnet-plugins-clientsideshorten() { - pkgdesc='ClientSideShorten plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper ClientSideShorten -} - -package_statusnet-plugins-forcegroup() { - pkgdesc='ForceGroup plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper ForceGroup -} - -package_statusnet-plugins-emailauthentication() { - pkgdesc='EmailAuthentication plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper EmailAuthentication -} - -package_statusnet-plugins-comet() { - pkgdesc='Comet plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper Comet -} - -package_statusnet-plugins-recaptcha() { - pkgdesc='Recaptcha plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper Recaptcha -} - -package_statusnet-plugins-registerthrottle() { - pkgdesc='RegisterThrottle plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper RegisterThrottle -} - -package_statusnet-plugins-mobileprofile() { - pkgdesc='MobileProfile plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper MobileProfile -} - -package_statusnet-plugins-ptiturl() { - pkgdesc='PtitUrl plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper PtitUrl -} - -package_statusnet-plugins-submirror() { - pkgdesc='SubMirror plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper SubMirror -} - -package_statusnet-plugins-gravatar() { - pkgdesc='Gravatar plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper Gravatar -} - -package_statusnet-plugins-sphinxsearch() { - pkgdesc='SphinxSearch plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper SphinxSearch -} - -package_statusnet-plugins-geourl() { - pkgdesc='GeoURL plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper GeoURL -} - -package_statusnet-plugins-infinitescroll() { - pkgdesc='InfiniteScroll plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper InfiniteScroll -} - -package_statusnet-plugins-slicedfavorites() { - pkgdesc='SlicedFavorites plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper SlicedFavorites -} - -package_statusnet-plugins-disqus() { - pkgdesc='Disqus plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper Disqus -} - -package_statusnet-plugins-minify() { - pkgdesc='Minify plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper Minify -} - -package_statusnet-plugins-tighturl() { - pkgdesc='TightUrl plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper TightUrl -} - -package_statusnet-plugins-yammerimport() { - pkgdesc='YammerImport plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper YammerImport -} - -package_statusnet-plugins-bitlyurl() { - pkgdesc='BitlyUrl plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper BitlyUrl -} - -package_statusnet-plugins-awesomeness() { - pkgdesc='Awesomeness plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper Awesomeness -} - -package_statusnet-plugins-userflag() { - pkgdesc='UserFlag plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper UserFlag -} - -package_statusnet-plugins-blogspamnet() { - pkgdesc='BlogspamNet plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper BlogspamNet -} - -package_statusnet-plugins-reverseusernameauthentication() { - pkgdesc='ReverseUsernameAuthentication plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper ReverseUsernameAuthentication -} - -package_statusnet-plugins-sitemap() { - pkgdesc='Sitemap plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper Sitemap -} - -package_statusnet-plugins-mobile() { - pkgdesc='Mobile plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper Mobile -} - -package_statusnet-plugins-poweredbystatusnet() { - pkgdesc='PoweredByStatusNet plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper PoweredByStatusNet -} - -package_statusnet-plugins-bookmark() { - pkgdesc='Bookmark plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper Bookmark -} - -package_statusnet-plugins-firephp() { - pkgdesc='FirePHP plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper FirePHP -} - -package_statusnet-plugins-xcache() { - pkgdesc='XCache plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper XCache -} - -package_statusnet-plugins-rsscloud() { - pkgdesc='RSSCloud plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper RSSCloud -} - -package_statusnet-plugins-casauthentication() { - pkgdesc='CasAuthentication plugin for StatusNet' - depends=('statusnet') - groups=('statusnet-plugins') - - statusnet-plugins-helper CasAuthentication -} - -package_statusnet-i18n-nn() { - pkgdesc='nn locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper nn -} - -package_statusnet-i18n-af() { - pkgdesc='af locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper af -} - -package_statusnet-i18n-cs() { - pkgdesc='cs locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper cs -} - -package_statusnet-i18n-mk() { - pkgdesc='mk locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper mk -} - -package_statusnet-i18n-ml() { - pkgdesc='ml locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper ml -} - -package_statusnet-i18n-hsb() { - pkgdesc='hsb locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper hsb -} - -package_statusnet-i18n-pl() { - pkgdesc='pl locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper pl -} - -package_statusnet-i18n-he() { - pkgdesc='he locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper he -} - -package_statusnet-i18n-en_gb() { - pkgdesc='en_GB locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper en_GB -} - -package_statusnet-i18n-pt() { - pkgdesc='pt locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper pt -} - -package_statusnet-i18n-tr() { - pkgdesc='tr locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper tr -} - -package_statusnet-i18n-ja() { - pkgdesc='ja locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper ja -} - -package_statusnet-i18n-ru() { - pkgdesc='ru locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper ru -} - -package_statusnet-i18n-uk() { - pkgdesc='uk locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper uk -} - -package_statusnet-i18n-fi() { - pkgdesc='fi locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper fi -} - -package_statusnet-i18n-ka() { - pkgdesc='ka locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper ka -} - -package_statusnet-i18n-bg() { - pkgdesc='bg locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper bg -} - -package_statusnet-i18n-de() { - pkgdesc='de locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper de -} - -package_statusnet-i18n-hu() { - pkgdesc='hu locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper hu -} - -package_statusnet-i18n-ar() { - pkgdesc='ar locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper ar -} - -package_statusnet-i18n-te() { - pkgdesc='te locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper te -} - -package_statusnet-i18n-el() { - pkgdesc='el locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper el -} - -package_statusnet-i18n-ko() { - pkgdesc='ko locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper ko -} - -package_statusnet-i18n-is() { - pkgdesc='is locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper is -} - -package_statusnet-i18n-da() { - pkgdesc='da locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper da -} - -package_statusnet-i18n-it() { - pkgdesc='it locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper it -} - -package_statusnet-i18n-arz() { - pkgdesc='arz locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper arz -} - -package_statusnet-i18n-gl() { - pkgdesc='gl locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper gl -} - -package_statusnet-i18n-fa() { - pkgdesc='fa locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper fa -} - -package_statusnet-i18n-ca() { - pkgdesc='ca locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper ca -} - -package_statusnet-i18n-fr() { - pkgdesc='fr locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper fr -} - -package_statusnet-i18n-en() { - pkgdesc='en locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper en -} - -package_statusnet-i18n-fur() { - pkgdesc='fur locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper fur -} - -package_statusnet-i18n-br() { - pkgdesc='br locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper br -} - -package_statusnet-i18n-zh_tw() { - pkgdesc='zh_TW locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper zh_TW -} - -package_statusnet-i18n-eo() { - pkgdesc='eo locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper eo -} - -package_statusnet-i18n-nl() { - pkgdesc='nl locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper nl -} - -package_statusnet-i18n-nb() { - pkgdesc='nb locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper nb -} - -package_statusnet-i18n-es() { - pkgdesc='es locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper es -} - -package_statusnet-i18n-vi() { - pkgdesc='vi locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper vi -} - -package_statusnet-i18n-pt_br() { - pkgdesc='pt_BR locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper pt_BR -} - -package_statusnet-i18n-ga() { - pkgdesc='ga locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper ga -} - -package_statusnet-i18n-ia() { - pkgdesc='ia locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper ia -} - -package_statusnet-i18n-sv() { - pkgdesc='sv locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper sv -} - -package_statusnet-i18n-zh_cn() { - pkgdesc='zh_CN locale for StatusNet' - depends=('statusnet') - groups=('statusnet-locales') - - statusnet-i18n-helper zh_CN -} +done diff --git a/social/statusnet/statusnet.install b/social/statusnet/statusnet.install index 426934404..5ec72e7c2 100644 --- a/social/statusnet/statusnet.install +++ b/social/statusnet/statusnet.install @@ -2,8 +2,6 @@ post_install(){ cat <<EOM StatusNet is now installed on your system. -You should link /usr/share/webapps/statusnet to /srv/http/ - Start MySQL and your prefered webserver and visit http://yoursite.tld/statusnet/install.php diff --git a/social/tinc/PKGBUILD b/social/tinc/PKGBUILD index b8f16a57c..72c1a8186 100644 --- a/social/tinc/PKGBUILD +++ b/social/tinc/PKGBUILD @@ -1,6 +1,6 @@ pkgname=tinc -pkgver=1.0.15 -pkgrel=2 +pkgver=1.0.16 +pkgrel=1 pkgdesc="VPN (Virtual Private Network) daemon" arch=(i686 x86_64) url="http://www.tinc-vpn.org/" @@ -9,7 +9,9 @@ depends=('lzo2' 'zlib' 'openssl') source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz tincd.conf tincd.rcd) -md5sums=('44bb7d1618955a0a56e9e159f1c46362') +md5sums=('f1c7ed94878725fb2cf4efb02bf160da' + '9b40646cd898709e90ae3c32baecb075' + '75516d05803ee6c6b22516e10129ad99') build() { cd "$srcdir/$pkgname-$pkgver" @@ -28,6 +30,3 @@ package() { install -Dm755 $srcdir/tincd.rcd $pkgdir/etc/rc.d/tincd install -Dm755 $srcdir/tincd.conf $pkgdir/etc/conf.d/tincd } -md5sums=('44bb7d1618955a0a56e9e159f1c46362' - '9b40646cd898709e90ae3c32baecb075' - '75516d05803ee6c6b22516e10129ad99') |