From 3d6877ee9ee7bba813a4b6be30a11d2b1942c656 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Sun, 13 Apr 2014 03:48:21 +0000 Subject: Sun Apr 13 03:42:18 UTC 2014 --- community/docker/PKGBUILD | 4 +- community/erlang-cl/PKGBUILD | 16 +- community/erlang-sdl/PKGBUILD | 28 ++- community/metakit/PKGBUILD | 37 --- community/nautilus-share/PKGBUILD | 26 ++ community/ogle/PKGBUILD | 43 ---- community/ogle/dvdread-4.1.3.patch | 129 ---------- community/ogle/gcc34alsafix.patch | 15 -- community/ogle/gcc4.patch | 12 - community/ogle/ogle-vuln-scripts-makefile.patch | 36 --- community/ogle/xvideofix.patch | 205 --------------- community/python-psutil/PKGBUILD | 8 +- community/redshift/PKGBUILD | 19 +- community/tdl/ChangeLog | 3 - community/tdl/PKGBUILD | 35 ++- community/tdl/readline63.patch | 32 +++ core/btrfs-progs/PKGBUILD | 36 +-- core/file/PKGBUILD | 38 ++- core/file/file-5.17-off-by-one.patch | 25 -- ...-DM_snapshot_cow-signature-without-prompt.patch | 199 --------------- ...ot-zero-cow-header-for-read-only-snapshot.patch | 74 ------ core/lvm2/PKGBUILD | 19 +- core/pcre/PKGBUILD | 34 +-- extra/libreoffice/PKGBUILD | 14 +- extra/nmap/PKGBUILD | 8 +- libre/cups-filters-libre/PKGBUILD | 53 ---- libre/grub/09_parabola | 195 --------------- libre/grub/PKGBUILD | 275 --------------------- libre/icecat-noscript/PKGBUILD | 31 --- libre/iceweasel-noscript/PKGBUILD | 31 --- libre/xbmc-libre/PKGBUILD | 140 ----------- libre/xbmc-libre/xbmc.service | 16 -- pcr/expac-relative/PKGBUILD | 46 ---- .../add-options-dbpath-and-config.patch | 196 --------------- 34 files changed, 184 insertions(+), 1894 deletions(-) delete mode 100644 community/metakit/PKGBUILD create mode 100644 community/nautilus-share/PKGBUILD delete mode 100644 community/ogle/PKGBUILD delete mode 100644 community/ogle/dvdread-4.1.3.patch delete mode 100644 community/ogle/gcc34alsafix.patch delete mode 100644 community/ogle/gcc4.patch delete mode 100644 community/ogle/ogle-vuln-scripts-makefile.patch delete mode 100644 community/ogle/xvideofix.patch delete mode 100644 community/tdl/ChangeLog create mode 100644 community/tdl/readline63.patch delete mode 100644 core/file/file-5.17-off-by-one.patch delete mode 100644 core/lvm2/0001-wiping-wipe-DM_snapshot_cow-signature-without-prompt.patch delete mode 100644 core/lvm2/0002-snapshot-zero-cow-header-for-read-only-snapshot.patch delete mode 100644 libre/cups-filters-libre/PKGBUILD delete mode 100644 libre/grub/09_parabola delete mode 100644 libre/grub/PKGBUILD delete mode 100644 libre/icecat-noscript/PKGBUILD delete mode 100644 libre/iceweasel-noscript/PKGBUILD delete mode 100644 libre/xbmc-libre/PKGBUILD delete mode 100644 libre/xbmc-libre/xbmc.service delete mode 100644 pcr/expac-relative/PKGBUILD delete mode 100644 pcr/expac-relative/add-options-dbpath-and-config.patch diff --git a/community/docker/PKGBUILD b/community/docker/PKGBUILD index 77f6669ac..ff210c1b9 100644 --- a/community/docker/PKGBUILD +++ b/community/docker/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 108340 2014-03-27 00:30:28Z seblu $ +# $Id: PKGBUILD 109230 2014-04-11 23:37:28Z seblu $ # Maintainer: Sébastien "Seblu" Luttringer pkgname=docker -pkgver=0.9.1 +pkgver=0.10.0 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container' diff --git a/community/erlang-cl/PKGBUILD b/community/erlang-cl/PKGBUILD index b195be36e..27d0a3d0f 100644 --- a/community/erlang-cl/PKGBUILD +++ b/community/erlang-cl/PKGBUILD @@ -4,29 +4,25 @@ pkgname=erlang-cl pkgver=1.2.1 -pkgrel=1 +pkgrel=2 arch=('x86_64' 'i686') pkgdesc='OpenCL binding for Erlang' url='http://github.com/tonyrog/cl' license=('MIT') depends=('erlang' 'libcl' 'bash') replaces=('cl') -makedepends=('opencl-headers' 'rebar') -source=("https://github.com/tonyrog/cl/archive/cl-$pkgver.zip") -sha256sums=('63d720995f5bfa9f6a11211bb0ec400ad28799d127d2a642f06ee33769b145ab') +makedepends=('opencl-headers' 'rebar' 'git') +source=("$pkgname::git://github.com/tonyrog/cl.git#tag=cl-1.2.1") +md5sums=('SKIP') build() { - cd "cl-cl-$pkgver/c_src" + cd "$pkgname" rebar compile - #make configure - #./configure --with-wordsize="$_wordsize" --prefix=/usr - #[ $CARCH = x86_64 ] && make all64 || make all32 - #rm config.* } package() { - cd "cl-cl-$pkgver" + cd "$pkgname" mkdir -p "$pkgdir/usr/lib/erlang/lib/cl-$pkgver" cp -r * "$pkgdir/usr/lib/erlang/lib/cl-$pkgver" diff --git a/community/erlang-sdl/PKGBUILD b/community/erlang-sdl/PKGBUILD index 5ab68f661..6074cb98d 100644 --- a/community/erlang-sdl/PKGBUILD +++ b/community/erlang-sdl/PKGBUILD @@ -1,31 +1,33 @@ -# $Id: PKGBUILD 85602 2013-03-03 21:28:43Z arodseth $ +# $Id: PKGBUILD 109263 2014-04-12 18:24:06Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: kappa pkgname=erlang-sdl -pkgver=1.2 -pkgrel=7 +pkgver=1.3.1 +pkgrel=1 arch=('x86_64' 'i686') pkgdesc='SDL and OpenGL bindings for Erlang' -url='http://esdl.sourceforge.net/' +url='http://github.com/dgud/esdl/' license=('custom') -depends=('erlang' 'sdl' 'glu' 'libgl' 'erlang') -makedepends=('mesa-libgl') -replaces=('esdl') -source=("$pkgname-$pkgver.tar.gz::https://github.com/dgud/esdl/archive/master.tar.gz") -sha256sums=('6a18010e12eed2abeb9b9893a2d89586e3ff14b44fce9c15b8ed091b67709438') +depends=('erlang' 'sdl' 'glu' 'libgl') +makedepends=('mesa-libgl' 'rebar' 'git') +# tag=esdl-1.3.1 fails mysteriously. Using commit instead. +source=("esdl::git://github.com/dgud/esdl.git#commit=dbd8ce9228aa36828091df2e8706c364094a3e22") +md5sums=('SKIP') build() { - cd "$srcdir/esdl-master" + cd esdl find -type f -print0 | xargs -0 chmod 644 - make + CFLAGS="$CFLAGS -Wno-deprecated-declarations" rebar compile } package() { - cd "$srcdir/esdl-master" + cd esdl - make INSTALLDIR="$pkgdir/usr/lib/erlang/lib/esdl-$pkgver" install + install -d "$pkgdir/usr/lib/erlang/lib/esdl-$pkgver" + cp -ruv c_src doc ebin include priv src \ + "$pkgdir/usr/lib/erlang/lib/esdl-$pkgver/" install -Dm644 license.terms "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/metakit/PKGBUILD b/community/metakit/PKGBUILD deleted file mode 100644 index 2a8115db8..000000000 --- a/community/metakit/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 99910 2013-10-31 02:25:20Z allan $ -# Contributor: Tom Newsom - -pkgname=metakit -pkgver=2.4.9.7 -pkgrel=5 -pkgdesc='MetaKit is an efficient database library with a small footprint' -arch=('i686' 'x86_64') -url='http://www.equi4.com/metakit/' -makedepends=('tcl' 'python2') -license=('BSD') -source=("http://www.equi4.com/pub/mk/${pkgname}-${pkgver}.tar.gz") -md5sums=('17330257376eea657827ed632ea62c9e') - -build() { - cd ${pkgname}-${pkgver}/builds - - sed -i 's_"${prefix}/include/python2.5"_"${prefix}/include/python2.7"_' ../unix/configure - sed -i 's_"${prefix}/lib/python2.5/site-packages"_"${prefix}/lib/python2.7/site-packages"_' ../unix/configure - - ../unix/configure \ - --prefix=/usr \ - --with-python \ - --with-tcl=/usr/include - - make -} - -package() { - cd ${pkgname}-${pkgver}/builds - - mkdir -p ${pkgdir}/usr/lib/python2.7/site-packages - - make DESTDIR=${pkgdir} install - - install -D -m644 ../license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/community/nautilus-share/PKGBUILD b/community/nautilus-share/PKGBUILD new file mode 100644 index 000000000..7e21de285 --- /dev/null +++ b/community/nautilus-share/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 109245 2014-04-12 15:53:10Z bgyorgy $ +# Maintainer: Balló György +# Contributor: Nevar + +pkgname=nautilus-share +pkgver=0.7.3 +pkgrel=7 +pkgdesc='Nautilus extension to share folder using Samba' +arch=('i686' 'x86_64') +url="https://git.gnome.org/browse/nautilus-share" +license=('GPL') +depends=('nautilus' 'samba') +makedepends=('intltool') +source=("http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz") +sha256sums=('1686b1c3f9f2b4b35bcb0fc9f826f89e540d1e5fee8eb64806a8d31e3db55ad5') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/community/ogle/PKGBUILD b/community/ogle/PKGBUILD deleted file mode 100644 index e168226be..000000000 --- a/community/ogle/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 99932 2013-10-31 02:32:50Z allan $ -# Maintainer: Eric Bélanger - -pkgname=ogle -pkgver=0.9.2 -pkgrel=13 -pkgdesc="A simple DVD player for Linux" -arch=('i686' 'x86_64') -url="http://www.dtek.chalmers.se/groups/dvd/" -license=('GPL') -depends=('sh' 'libxml2' 'libdvdread' 'libjpeg' 'libmad' 'libxinerama' 'libxv' - 'alsa-lib' 'a52dec' 'libxxf86vm') -# http://www.dtek.chalmers.se/groups/dvd/dist/${pkgname}-${pkgver}.tar.gz -source=(ftp://ftp.archlinux.org/other/ogle/${pkgname}-${pkgver}.tar.gz \ - xvideofix.patch gcc34alsafix.patch gcc4.patch dvdread-4.1.3.patch \ - ogle-vuln-scripts-makefile.patch) -md5sums=('a76a9892bdb807a4bcf859d15a91f0f9' - '57f1cf36eed82c56f24e9c0fc25ce2b3' - '4ebc822b252fade6b53c5ceb5be45bf5' - 'd08cff87c5ec41a7eebc0d2384835688' - '597906c64ff7f5185de8430fdae3107d' - 'd052b01f293c61d399fdd0ac2abb1cf4') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 -i "${srcdir}/dvdread-4.1.3.patch" - patch -p1 -i "${srcdir}/xvideofix.patch" - patch -p1 -i "${srcdir}/gcc34alsafix.patch" - patch -p1 -i "${srcdir}/gcc4.patch" - patch -p0 -i "${srcdir}/ogle-vuln-scripts-makefile.patch" - - # fix alsa detection - stolen from their cvs - sed -i 's|^.*MINOR\=\=5.*$|#if SND_LIB_MAJOR==0 && SND_LIB_MINOR<6|' configure - sed -i 's|__diga_end:|\0;|' libogleao/alsa_audio.c - ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --with-x - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - export LIBRARY_PATH="${pkgdir}/usr/lib/ogle" - make DESTDIR="${pkgdir}" install -} diff --git a/community/ogle/dvdread-4.1.3.patch b/community/ogle/dvdread-4.1.3.patch deleted file mode 100644 index d928ac2aa..000000000 --- a/community/ogle/dvdread-4.1.3.patch +++ /dev/null @@ -1,129 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2009/01/27 02:06:49 jmcneill Exp $ - ---- vmg/ifo_dump.c.orig 2009-01-26 21:00:17.000000000 -0500 -+++ vmg/ifo_dump.c 2009-01-26 21:00:33.000000000 -0500 -@@ -65,38 +65,38 @@ static void print_ifo(char *path, int ti - if(h->vmgi_mat != NULL) { - - printf("VMG top level\n-------------\n"); -- ifoPrint_VMGI_MAT(h->vmgi_mat); -+ ifo_print_VMGI_MAT(h->vmgi_mat); - - printf("\nFirst Play PGC\n--------------\n"); -- ifoPrint_PGC(h->first_play_pgc); -+ ifo_print_PGC(h->first_play_pgc); - - printf("\nTitle Track search pointer table\n"); - printf( "------------------------------------------------\n"); -- ifoPrint_TT_SRPT(h->tt_srpt); -+ ifo_print_TT_SRPT(h->tt_srpt); - - printf("\nMenu PGCI Unit table\n"); - printf( "--------------------\n"); - if(h->vmgi_mat->vmgm_pgci_ut != 0) { -- ifoPrint_PGCI_UT(h->pgci_ut); -+ ifo_print_PGCI_UT(h->pgci_ut); - } else - printf("No Menu PGCI Unit table present\n"); - - printf("\nParental Manegment Information table\n"); - printf( "------------------------------------\n"); - if(h->vmgi_mat->ptl_mait != 0) { -- ifoPrint_PTL_MAIT(h->ptl_mait); -+ ifo_print_PTL_MAIT(h->ptl_mait); - } else - printf("No Parental Management Information present\n"); - - printf("\nVideo Title Set Attribute Table\n"); - printf( "-------------------------------\n"); -- ifoPrint_VTS_ATRT(h->vts_atrt); -+ ifo_print_VTS_ATRT(h->vts_atrt); - - - printf("\nText Data Manager Information\n"); - printf( "-----------------------------\n"); - if(h->vmgi_mat->txtdt_mgi != 0) { -- //ifoPrint_TXTDT_MGI(h->txtdt_mgi); -+ //ifo_print_TXTDT_MGI(h->txtdt_mgi); - printf("Can't print Text Data Manager Information yet\n"); - } else - printf("No Text Data Manager Information present\n"); -@@ -106,14 +106,14 @@ static void print_ifo(char *path, int ti - printf("\nCell Address table\n"); - printf( "-----------------\n"); - if(h->vmgi_mat->vmgm_c_adt != 0) { -- ifoPrint_C_ADT(h->menu_c_adt); -+ ifo_print_C_ADT(h->menu_c_adt); - } else - printf("No Cell Address table present\n"); - - printf("\nVideo Title set Menu VOBU address map\n"); - printf( "-----------------\n"); - if(h->vmgi_mat->vmgm_vobu_admap != 0) { -- ifoPrint_VOBU_ADMAP(h->menu_vobu_admap); -+ ifo_print_VOBU_ADMAP(h->menu_vobu_admap); - } else - printf("No Menu VOBU address map present\n"); - } -@@ -122,20 +122,20 @@ static void print_ifo(char *path, int ti - if(h->vtsi_mat != NULL) { - - printf("VTS top level\n-------------\n"); -- ifoPrint_VTSI_MAT(h->vtsi_mat); -+ ifo_print_VTSI_MAT(h->vtsi_mat); - - printf("\nPart of title search pointer table information\n"); - printf( "----------------------------------------------\n"); -- ifoPrint_VTS_PTT_SRPT(h->vts_ptt_srpt); -+ ifo_print_VTS_PTT_SRPT(h->vts_ptt_srpt); - - printf("\nPGCI Unit table\n"); - printf( "--------------------\n"); -- ifoPrint_PGCIT(h->vts_pgcit); -+ ifo_print_PGCIT(h->vts_pgcit); - - printf("\nMenu PGCI Unit table\n"); - printf( "--------------------\n"); - if(h->vtsi_mat->vtsm_pgci_ut != 0) { -- ifoPrint_PGCI_UT(h->pgci_ut); -+ ifo_print_PGCI_UT(h->pgci_ut); - } else - printf("No Menu PGCI Unit table present\n"); - -@@ -144,31 +144,31 @@ static void print_ifo(char *path, int ti - printf("\nTime Map table\n"); - printf( "-----------------\n"); - if(h->vtsi_mat->vts_tmapt != 0) { -- ifoPrint_VTS_TMAPT(h->vts_tmapt); -+ ifo_print_VTS_TMAPT(h->vts_tmapt); - } else - printf("No Time Map table present\n"); - - printf("\nMenu Cell Address table\n"); - printf( "-----------------\n"); - if(h->vtsi_mat->vtsm_c_adt != 0) { -- ifoPrint_C_ADT(h->menu_c_adt); -+ ifo_print_C_ADT(h->menu_c_adt); - } else - printf("No Cell Address table present\n"); - - printf("\nVideo Title Set Menu VOBU address map\n"); - printf( "-----------------\n"); - if(h->vtsi_mat->vtsm_vobu_admap != 0) { -- ifoPrint_VOBU_ADMAP(h->menu_vobu_admap); -+ ifo_print_VOBU_ADMAP(h->menu_vobu_admap); - } else - printf("No Menu VOBU address map present\n"); - - printf("\nCell Address table\n"); - printf( "-----------------\n"); -- ifoPrint_C_ADT(h->vts_c_adt); -+ ifo_print_C_ADT(h->vts_c_adt); - - printf("\nVideo Title Set VOBU address map\n"); - printf( "-----------------\n"); -- ifoPrint_VOBU_ADMAP(h->vts_vobu_admap); -+ ifo_print_VOBU_ADMAP(h->vts_vobu_admap); - - } - } diff --git a/community/ogle/gcc34alsafix.patch b/community/ogle/gcc34alsafix.patch deleted file mode 100644 index 76de3462d..000000000 --- a/community/ogle/gcc34alsafix.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ogle-0.9.2/libogleao/alsa_audio.c 2003-10-18 17:38:30.000000000 -0700 -+++ ogle-0.9.2-patch/libogleao/alsa_audio.c 2005-04-22 18:21:23.000000000 -0700 -@@ -248,10 +248,9 @@ - //Shouldn't ctl_handle be closed here? - } - -- snd_ctl_close(ctl_handle); -- -- __diga_end: -+ snd_ctl_close(ctl_handle); - } -+ __diga_end: - - return 0; - } diff --git a/community/ogle/gcc4.patch b/community/ogle/gcc4.patch deleted file mode 100644 index b6a10a325..000000000 --- a/community/ogle/gcc4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN ogle-0.9.2-old/ac3/ac3dec_wrap.c ogle-0.9.2/ac3/ac3dec_wrap.c ---- ogle-0.9.2-old/ac3/ac3dec_wrap.c 2003-03-02 15:50:03.000000000 +0000 -+++ ogle-0.9.2/ac3/ac3dec_wrap.c 2005-09-30 17:07:27.000000000 +0000 -@@ -48,7 +48,7 @@ - static void handle_events(MsgEventQ_t *q, MsgEvent_t *ev); - - --static char *program_name; -+char *program_name; - - static FILE *outfile; - diff --git a/community/ogle/ogle-vuln-scripts-makefile.patch b/community/ogle/ogle-vuln-scripts-makefile.patch deleted file mode 100644 index f25964378..000000000 --- a/community/ogle/ogle-vuln-scripts-makefile.patch +++ /dev/null @@ -1,36 +0,0 @@ -This patch inhibits the installation of debug scripts vulnerable to a symlink -attack, see bug 245921 for reference. - ---- scripts/Makefile.in.orig 2009-04-04 18:13:33.000000000 +0200 -+++ scripts/Makefile.in 2009-04-04 18:15:46.000000000 +0200 -@@ -133,10 +133,10 @@ - subdir = scripts - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_CLEAN_FILES = ogle --SCRIPTS = $(bin_SCRIPTS) $(dist_pkglib_SCRIPTS) -+SCRIPTS = $(bin_SCRIPTS) - - DIST_SOURCES = --DIST_COMMON = $(dist_pkglib_SCRIPTS) Makefile.am Makefile.in ogle.in -+DIST_COMMON = Makefile.am Makefile.in ogle.in - all: all-am - - .SUFFIXES: -@@ -279,7 +279,7 @@ - - install-data-am: - --install-exec-am: install-binSCRIPTS install-dist_pkglibSCRIPTS -+install-exec-am: install-binSCRIPTS - - install-info: install-info-am - -@@ -295,7 +295,7 @@ - - mostlyclean-am: mostlyclean-generic mostlyclean-libtool - --uninstall-am: uninstall-binSCRIPTS uninstall-dist_pkglibSCRIPTS \ -+uninstall-am: uninstall-binSCRIPTS \ - uninstall-info-am - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ diff --git a/community/ogle/xvideofix.patch b/community/ogle/xvideofix.patch deleted file mode 100644 index aafde447a..000000000 --- a/community/ogle/xvideofix.patch +++ /dev/null @@ -1,205 +0,0 @@ ---- ogle-0.9.2/mpeg2_video/video_output_x11.c 2003-11-04 04:02:10.000000000 -0800 -+++ ogle-0.9.2-patch/mpeg2_video/video_output_x11.c 2005-04-22 18:37:56.000000000 -0700 -@@ -286,6 +286,7 @@ - } - } - -+ - /* This section of the code looks for the Xv extension for hardware - * yuv->rgb and scaling. If it is not found, or any suitable adapter - * is not found, use_xv will be set to 0. Otherwise it allocates a -@@ -299,121 +300,136 @@ - { - int xv_found = 0; - #ifdef HAVE_XV -- int i, j; -+ int i, j, k; - int result; - - xv_port = 0; /* We have no port yet. */ -- -+ - /* Check for the Xvideo extension */ -- result = XvQueryExtension(mydisplay, &xv_version, &xv_release, -- &xv_request_base, &xv_event_base, -+ result = XvQueryExtension(mydisplay, &xv_version, &xv_release, -+ &xv_request_base, &xv_event_base, - &xv_error_base); - if(result != Success) { - WARNING("%s", "Xvideo extension not found\n"); - use_xv = 0; - return; - } -- -+ - NOTE("Found Xv extension %d.%d, checking for suitable adaptors\n", - xv_version, xv_release); -- -+ - /* Check for available adaptors */ -- result = XvQueryAdaptors(mydisplay, DefaultRootWindow (mydisplay), -+ result = XvQueryAdaptors(mydisplay, DefaultRootWindow (mydisplay), - &xv_num_adaptors, &xv_adaptor_info); - if(result != Success) { - WARNING("%s", "No Xv adaptors found\n"); - use_xv = 0; - return; - } -- -+ - /* Check adaptors */ - for(i = 0; i < xv_num_adaptors; i++) { -- -+ - /* Is it usable for displaying XvImages */ - if(!(xv_adaptor_info[i].type & XvInputMask) || - !(xv_adaptor_info[i].type & XvImageMask)) - continue; -- -- xv_port = xv_adaptor_info[i].base_id; -- -- /* Check image formats of adaptor */ -- xv_formats = XvListImageFormats(mydisplay, xv_port, &xv_num_formats); -- for(j = 0; j < xv_num_formats; j++) { -- if(xv_formats[j].id == 0x32315659) { /* YV12 */ -- //if(xv_formats[j].id == 0x30323449) { /* I420 */ -- xv_id = xv_formats[j].id; -- break; -- } -- } -- /* No matching format found */ -- if(j == xv_num_formats) -- continue; -- -- NOTE("Xv adaptor \"%s\" port %li image format %i\n", -- xv_adaptor_info[i].name, xv_port, xv_id); -- -- /* Allocate XvImages */ -+ -+ /* Check Available Ports */ -+ for (j = 0; j < xv_adaptor_info[i].num_ports && !xv_port ; j++) { -+ -+ /* Check Image formats of adaptor */ -+ xv_formats = XvListImageFormats(mydisplay,xv_adaptor_info[i].base_id + j, &xv_num_formats); -+ for (k = 0; k < xv_num_formats; k ++) { -+ -+ /* Check for proper format (YV12) and see if we can grab the port */ -+ if ( (xv_formats[k].id == 0x32315659) && (XvGrabPort(mydisplay,xv_adaptor_info[i].base_id + j,0) == Success) ) { -+ xv_id = xv_formats[k].id; -+ xv_port = xv_adaptor_info[i].base_id + j; -+ break; -+ } -+ -+ } -+ -+ /* delete stuff nicely */ -+ XFree(xv_formats); -+ } -+ -+ /* Check next Adapter */ -+ if (xv_port==0) continue; -+ -+ /* Report what we found */ -+ NOTE("Xv adaptor \"%s\" port %li image format %i\n", xv_adaptor_info[i].name, xv_port, xv_id); -+ -+ /* Allocate XvImage */ - xv_image = XvShmCreateImage(mydisplay, xv_port, xv_id, NULL, - padded_width, -- padded_height, -+ padded_height, - &shm_info); -- -- /* Got an Image? */ -+ -+ /* Got an milk? */ - if(xv_image == NULL) - continue; -- -+ - /* Test and see if we really got padded_width x padded_height */ - if(xv_image->width != padded_width || - xv_image->height != padded_height) { - FATAL("XvShmCreateImage got size: %d x %d\n", - xv_image->width, xv_image->height); - exit(1); -- } -- -+ } -+ -+ /* Now Finish Up */ - shm_info.shmid = picture_buffer_shmid; - shm_info.shmaddr = picture_buffer_addr; -- -- /* Set the data pointer to the decoders picture segment. */ -+ -+ /* Set the data pointer to the decoders picture segment. */ - // xv_image->data = picture_data->y; - shm_info.readOnly = True; -- -+ - /* make sure we don't have any unhandled errors */ - XSync(mydisplay, False); -- -+ - /* set error handler so we can check if xshmattach failed */ - prev_xerrhandler = XSetErrorHandler(xshm_errorhandler); -- -+ - /* get the serial of the xshmattach request */ - req_serial = NextRequest(mydisplay); -- -+ - /* try to attach */ - XShmAttach(mydisplay, &shm_info); -- -+ - /* make sure xshmattach has been processed and any errors - have been returned to us */ - XSync(mydisplay, False); -- -+ - /* revert to the previous xerrorhandler */ - XSetErrorHandler(prev_xerrhandler); -- -+ - if(use_xshm) { - #if 0 - shmctl(shm_info.shmid, IPC_RMID, 0); // only works on Linux.. - #endif -- -+ - CompletionType = XShmGetEventBase(mydisplay) + ShmCompletion; - } - xv_found = 1; - - /* All set up! */ - break; -- } -+ } -+ -+ /* Clean up */ -+ XvFreeAdaptorInfo(xv_adaptor_info); -+ - #endif /* HAVE_XV */ -+ /* In case we didn't find a working Xv */ - if(!xv_found) { - use_xv = 0; -- } --} -- -+ } -+ -+ } -+ - - /* This section of the code tries to use the MIT XShm extension for - * accellerated transfers to to X. XShm extension is need and only -@@ -1726,6 +1742,8 @@ - - if(mydisplay) { - XSync(mydisplay,True); -+ if (use_xv) -+ XvUngrabPort(mydisplay,xv_port,CurrentTime); - if(use_xshm) - XShmDetach(mydisplay, &shm_info); - if(window.ximage != 0) diff --git a/community/python-psutil/PKGBUILD b/community/python-psutil/PKGBUILD index 56b185db6..43032b93f 100644 --- a/community/python-psutil/PKGBUILD +++ b/community/python-psutil/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 108467 2014-03-27 14:48:02Z fyan $ +# $Id: PKGBUILD 109232 2014-04-11 23:45:33Z seblu $ # Maintainer: Sébastien Luttringer pkgbase=python-psutil pkgname=('python-psutil' 'python2-psutil') -pkgver=2.0.0 -pkgrel=2 +pkgver=2.1.0 +pkgrel=1 arch=('i686' 'x86_64') url='http://code.google.com/p/psutil/' license=('custom: BSD') makedepends=('python' 'python-setuptools' 'python2' 'python2-setuptools') checkdepends=('net-tools' 'procps-ng') source=("https://pypi.python.org/packages/source/p/psutil/psutil-$pkgver.tar.gz") -md5sums=('9ee83ff3d68396f91ebdf71ae83b152d') +md5sums=('ba1f51f4c8e2c74cba48cef70b8a5bec') build() { cd psutil-$pkgver diff --git a/community/redshift/PKGBUILD b/community/redshift/PKGBUILD index d75a6c2c2..aff73c9fd 100644 --- a/community/redshift/PKGBUILD +++ b/community/redshift/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 103169 2013-12-28 17:00:30Z lfleischer $ +# $Id: PKGBUILD 109293 2014-04-12 21:39:07Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: Geoffrey Teale # Contributor: Mark, Huo Mian # Contributor: Biginoz pkgname=redshift -pkgver=1.8 +pkgver=1.9 pkgrel=1 pkgdesc='Adjusts the color temperature of your screen according to your surroundings.' arch=('i686' 'x86_64') @@ -13,22 +13,17 @@ url='http://jonls.dk/redshift/' license=('GPL3') depends=('gconf' 'geoclue' 'libxxf86vm') optdepends=('pygtk: for gtk-redshift' - 'python2-xdg: for gtk-redshift' + 'python-xdg: for gtk-redshift' 'librsvg: for gtk-redshift') -makedepends=('python2') +makedepends=('python') install='redshift.install' -source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2") -md5sums=('a05c34bc7b8fbb4f5d546a0b5cca5d6f') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's/python/python2/' src/redshift-gtk/redshift-gtk -} +source=("https://github.com/jonls/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.xz") +md5sums=('9640218cd9ba88f6d10b347b2277c415') build() { cd "${srcdir}/${pkgname}-${pkgver}" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr + PYTHON=/usr/bin/python ./configure --prefix=/usr make } diff --git a/community/tdl/ChangeLog b/community/tdl/ChangeLog deleted file mode 100644 index dba4cf7ec..000000000 --- a/community/tdl/ChangeLog +++ /dev/null @@ -1,3 +0,0 @@ -2007-06-27 tardo -* Built for x86_64 - diff --git a/community/tdl/PKGBUILD b/community/tdl/PKGBUILD index fbcd02fdc..12d9cec49 100644 --- a/community/tdl/PKGBUILD +++ b/community/tdl/PKGBUILD @@ -1,26 +1,35 @@ -# $Id: PKGBUILD 66539 2012-02-26 00:04:59Z lfleischer $ -# Maintainer: Jeff Mickey -# Contributor: Jeff "codemac" Mickey +# $Id: PKGBUILD 109251 2014-04-12 16:55:40Z arodseth $ +# Maintainer: Alexander Rødseth +# Contributor: Jeff Mickey pkgname=tdl pkgver=1.5.2 -pkgrel=5 -pkgdesc="A to-do list manager." -arch=('i686' 'x86_64') -url="http://www.rc0.org.uk/tdl/" +pkgrel=6 +pkgdesc='TODO list manager' +arch=('x86_64' 'i686') +url='https://github.com/rc0/tdl' license=('GPL') -depends=('ncurses') -source=("http://www.rpcurnow.force9.co.uk/tdl/$pkgname-$pkgver.tar.gz") -md5sums=('620cb00bf99b7e786e2b54cda6339a1e') +depends=('readline') +makedepends=('git') +source=("$pkgname::git://github.com/T-J-Teru/tdl.git#commit=382c52a2d1f2d064110c189459fe09a6edb12761" 'readline63.patch') +md5sums=('SKIP' + 'dada1488632f9d672e75e15cfb011ecb') + +prepare() { + cd "$pkgname" + + patch -p1 -i "$srcdir/readline63.patch" +} build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname" ./configure --prefix=/usr --mandir=/usr/share/man make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + make -C "$pkgname" DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/community/tdl/readline63.patch b/community/tdl/readline63.patch new file mode 100644 index 000000000..b42ddec02 --- /dev/null +++ b/community/tdl/readline63.patch @@ -0,0 +1,32 @@ +--- a/inter.c 2014-04-12 18:48:39.020103780 +0200 ++++ b/inter.c 2014-04-12 18:48:33.323365100 +0200 +@@ -556,7 +556,7 @@ + static char *interactive_text_readline(char *prompt, char *initval, int *is_blank, int *error)/*{{{*/ + { + char *line; +- Function *old_rl_pre_input_hook = NULL; ++ rl_command_func_t *old_rl_pre_input_hook = NULL; + + *error = 0; + old_rl_pre_input_hook = rl_pre_input_hook; +@@ -633,9 +633,9 @@ + #ifdef USE_READLINE + if (isatty(0)) { + char *result; +- rl_attempted_completion_function = (CPPFunction *) null_tdl_completion; ++ rl_attempted_completion_function = null_tdl_completion; + result = interactive_text_readline(prompt, initval, is_blank, error); +- rl_attempted_completion_function = (CPPFunction *) tdl_completion; ++ rl_attempted_completion_function = tdl_completion; + return result; + } else { + /* In case someone wants to drive tdl from a script, by redirecting stdin to it. */ +@@ -653,7 +653,7 @@ + #ifdef USE_READLINE + if (isatty(0)) { + rl_completion_entry_function = NULL; +- rl_attempted_completion_function = (CPPFunction *) tdl_completion; ++ rl_attempted_completion_function = tdl_completion; + interactive_readline(); + } else { + /* In case someone wants to drive tdl from a script, by redirecting stdin to it. */ diff --git a/core/btrfs-progs/PKGBUILD b/core/btrfs-progs/PKGBUILD index 0c7b57c62..3890c5c46 100644 --- a/core/btrfs-progs/PKGBUILD +++ b/core/btrfs-progs/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 202441 2013-12-21 23:13:17Z tomegun $ -# Maintainer: Tom Gundersen +# $Id: PKGBUILD 210214 2014-04-11 23:33:01Z seblu $ +# Maintainer: Sébastien "Seblu" Luttringer +# Contributor: Tom Gundersen # Contributor: Tobias Powalowski pkgname=btrfs-progs -pkgver=3.12 +pkgver=3.14 pkgrel=1 -pkgdesc="btrfs filesystem utilities" -arch=(i686 x86_64) -depends=('glibc' 'e2fsprogs' 'lzo2') +pkgdesc='Btrfs filesystem utilities' +arch=('i686' 'x86_64') +depends=('glibc' 'e2fsprogs' 'lzo2' 'zlib') makedepends=('git') -url="http://btrfs.wiki.kernel.org/" +url='http://btrfs.wiki.kernel.org/' replaces=('btrfs-progs-unstable') conflicts=('btrfs-progs-unstable') provides=('btrfs-progs-unstable') license=('GPL2') source=("git://git.kernel.org/pub/scm/linux/kernel/git/mason/${pkgname}.git#tag=v${pkgver}" - initcpio-install-btrfs - initcpio-hook-btrfs) + 'initcpio-install-btrfs' + 'initcpio-hook-btrfs') install=btrfs-progs.install options=(!staticlibs) md5sums=('SKIP' @@ -32,16 +33,17 @@ build() { package() { cd $pkgname - make prefix=$pkgdir/usr install - install -Dm755 btrfs-select-super $pkgdir/usr/bin + make prefix="$pkgdir"/usr install + install -Dm755 btrfs-select-super "$pkgdir"/usr/bin # fix manpage - mkdir -p $pkgdir/usr/share/ - mv $pkgdir/usr/man $pkgdir/usr/share/man + install -d "$pkgdir"/usr/share/ + mv "$pkgdir"/usr/man "$pkgdir"/usr/share/man # install mkinitcpio hooks - install -Dm644 "$srcdir/initcpio-install-btrfs" \ - "$pkgdir/usr/lib/initcpio/install/btrfs" - install -Dm644 "$srcdir/initcpio-hook-btrfs" \ - "$pkgdir/usr/lib/initcpio/hooks/btrfs" + cd "$srcdir" + install -Dm644 initcpio-install-btrfs "$pkgdir/usr/lib/initcpio/install/btrfs" + install -Dm644 initcpio-hook-btrfs "$pkgdir/usr/lib/initcpio/hooks/btrfs" } + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/core/file/PKGBUILD b/core/file/PKGBUILD index 859091149..9d2291d7f 100644 --- a/core/file/PKGBUILD +++ b/core/file/PKGBUILD @@ -1,37 +1,29 @@ -# $Id: PKGBUILD 207101 2014-03-06 12:36:01Z allan $ -# Maintainer: Allan McRae +# $Id: PKGBUILD 210213 2014-04-11 23:33:00Z seblu $ +# Mainainer: Sébastien Luttringer +# Contributor: Allan McRae # Contributor: Andreas Radke pkgname=file -pkgver=5.17 -pkgrel=2 -pkgdesc="File type identification utility" +pkgver=5.18 +pkgrel=1 +pkgdesc='File type identification utility' arch=('i686' 'x86_64') license=('custom') groups=('base' 'base-devel') -url="http://www.darwinsys.com/file/" +url='http://www.darwinsys.com/file/' depends=('glibc' 'zlib') -source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz - file-5.17-off-by-one.patch) -md5sums=('e19c47e069ced7b01ccb4db402cc01d3' - 'f36a87784f1db2e415ce09badb38fbe8') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # https://github.com/file/file/commit/70c65d2e1841 - patch -p1 -i $srcdir/file-5.17-off-by-one.patch -} +source=("ftp://ftp.astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('d420d8f2990cd344673acfbf8d76ff5a') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr --datadir=/usr/share/file - make + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install - - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + rmdir "$pkgdir/usr/share/man/man5" } diff --git a/core/file/file-5.17-off-by-one.patch b/core/file/file-5.17-off-by-one.patch deleted file mode 100644 index 0e8beb442..000000000 --- a/core/file/file-5.17-off-by-one.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 70c65d2e1841491f59168db1f905e8b14083fb1c Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Tue, 4 Mar 2014 17:42:19 +0000 -Subject: [PATCH] off by one in out of bounds calculations (Jan Kaluza) - ---- - src/softmagic.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/softmagic.c b/src/softmagic.c -index 170de95..5ed3998 100644 ---- a/src/softmagic.c -+++ b/src/softmagic.c -@@ -72,7 +72,7 @@ private int mcopy(struct magic_set *, union VALUETYPE *, int, int, - private void cvt_32(union VALUETYPE *, const struct magic *); - private void cvt_64(union VALUETYPE *, const struct magic *); - --#define OFFSET_OOB(n, o, i) ((n) < (o) || (i) >= ((n) - (o))) -+#define OFFSET_OOB(n, o, i) ((n) < (o) || (i) > ((n) - (o))) - /* - * softmagic - lookup one file in parsed, in-memory copy of database - * Passed the name and FILE * of one file to be typed. --- -1.8.5.5 - diff --git a/core/lvm2/0001-wiping-wipe-DM_snapshot_cow-signature-without-prompt.patch b/core/lvm2/0001-wiping-wipe-DM_snapshot_cow-signature-without-prompt.patch deleted file mode 100644 index 3e9154bf9..000000000 --- a/core/lvm2/0001-wiping-wipe-DM_snapshot_cow-signature-without-prompt.patch +++ /dev/null @@ -1,199 +0,0 @@ -From a29d36c9ac41aa3aa4818c277c9c0e20cbd6175b Mon Sep 17 00:00:00 2001 -From: Peter Rajnoha -Date: Mon, 10 Feb 2014 13:28:13 +0100 -Subject: [PATCH 1/2] wiping: wipe DM_snapshot_cow signature without prompt in - newly created LVs -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The libblkid can detect DM_snapshot_cow signature and when creating -new LVs with blkid wiping used (allocation/use_blkid_wiping=1 lvm.conf -setting and --wipe y used at the same time - which it is by default). - -Do not issue any prompts about this signature when new LV is created -and just wipe it right away without asking questions. Still keep the -log in verbose mode though. - -Conflicts: - WHATS_NEW - lib/device/dev-type.c - -[backported to 2.02.105 by Thomas Bächler, thomas@archlinux.org] ---- - WHATS_NEW | 2 ++ - lib/device/dev-type.c | 47 ++++++++++++++++++++++++++++++++--------------- - lib/device/dev-type.h | 6 +++++- - lib/metadata/lv_manip.c | 4 +++- - lib/metadata/metadata.c | 4 +++- - 5 files changed, 45 insertions(+), 18 deletions(-) - -diff --git a/WHATS_NEW b/WHATS_NEW -index 26b63ae..d2a3482 100644 ---- a/WHATS_NEW -+++ b/WHATS_NEW -@@ -1,3 +1,5 @@ -+ Wipe DM_snapshot_cow signature without prompt in new LVs with blkid wiping. -+ - Version 2.02.105 - 20th January 2014 - ==================================== - Fix thin LV flagging for udev to skip scanning only if the LV is wiped. -diff --git a/lib/device/dev-type.c b/lib/device/dev-type.c -index 78b093c..d2ff71e 100644 ---- a/lib/device/dev-type.c -+++ b/lib/device/dev-type.c -@@ -449,17 +449,25 @@ out: - - #ifdef BLKID_WIPING_SUPPORT - -+static inline int _type_in_flag_list(const char *type, uint32_t flag_list) -+{ -+ return (((flag_list & TYPE_LVM2_MEMBER) && !strcmp(type, "LVM2_member")) || -+ ((flag_list & TYPE_LVM1_MEMBER) && !strcmp(type, "LVM1_member")) || -+ ((flag_list & TYPE_DM_SNAPSHOT_COW) && !strcmp(type, "DM_snapshot_cow"))); -+} -+ - static int _blkid_wipe(blkid_probe probe, struct device *dev, const char *name, -- int exclude_lvm_member, int yes, force_t force) -+ uint32_t types_to_exclude, uint32_t types_no_prompt, -+ int yes, force_t force) - { -+ static const char* msg_wiping = "Wiping %s signature on %s."; - const char *offset = NULL, *type = NULL, *magic = NULL, - *usage = NULL, *label = NULL, *uuid = NULL; - loff_t offset_value; - size_t len; - - if (!blkid_probe_lookup_value(probe, "TYPE", &type, NULL)) { -- if (exclude_lvm_member && -- (!strcmp(type, "LVM1_member") || !strcmp(type, "LVM2_member"))) -+ if (_type_in_flag_list(type, types_to_exclude)) - return 1; - if (!blkid_probe_lookup_value(probe, "SBMAGIC_OFFSET", &offset, NULL) && - blkid_probe_lookup_value(probe, "SBMAGIC", &magic, &len)) -@@ -483,12 +491,15 @@ static int _blkid_wipe(blkid_probe probe, struct device *dev, const char *name, - "UUID=\"%s\" TYPE=\"%s\" USAGE=\"%s\"", - name, offset, label, uuid, type, usage); - -- if (!yes && (force == PROMPT) && -- yes_no_prompt("WARNING: %s signature detected on %s at offset %s. " -- "Wipe it? [y/n] ", type, name, offset) != 'y') -- return_0; -+ if (!_type_in_flag_list(type, types_no_prompt)) { -+ if (!yes && (force == PROMPT) && -+ yes_no_prompt("WARNING: %s signature detected on %s at offset %s. " -+ "Wipe it? [y/n] ", type, name, offset) != 'y') -+ return_0; -+ log_print_unless_silent(msg_wiping, type, name); -+ } else -+ log_verbose(msg_wiping, type, name); - -- log_print_unless_silent("Wiping %s signature on %s.", type, name); - if (!dev_set(dev, offset_value, len, 0)) { - log_error("Failed to wipe %s signature on %s.", type, name); - return 0; -@@ -498,7 +509,8 @@ static int _blkid_wipe(blkid_probe probe, struct device *dev, const char *name, - } - - static int _wipe_known_signatures_with_blkid(struct device *dev, const char *name, -- int exclude_lvm_member, -+ uint32_t types_to_exclude, -+ uint32_t types_no_prompt, - int yes, force_t force) - { - blkid_probe probe = NULL; -@@ -526,7 +538,7 @@ static int _wipe_known_signatures_with_blkid(struct device *dev, const char *nam - - while (!blkid_do_probe(probe)) { - found++; -- if (_blkid_wipe(probe, dev, name, exclude_lvm_member, yes, force)) -+ if (_blkid_wipe(probe, dev, name, types_to_exclude, types_no_prompt, yes, force)) - wiped++; - } - -@@ -580,7 +592,8 @@ static int _wipe_signature(struct device *dev, const char *type, const char *nam - } - - static int _wipe_known_signatures_with_lvm(struct device *dev, const char *name, -- int exclude_lvm_member, -+ uint32_t types_to_exclude __attribute__((unused)), -+ uint32_t types_no_prompt __attribute__((unused)), - int yes, force_t force) - { - if (!_wipe_signature(dev, "software RAID md superblock", name, 4, yes, force, dev_is_md) || -@@ -592,16 +605,20 @@ static int _wipe_known_signatures_with_lvm(struct device *dev, const char *name, - } - - int wipe_known_signatures(struct cmd_context *cmd, struct device *dev, -- const char *name, int exclude_lvm_member, -- int yes, force_t force) -+ const char *name, uint32_t types_to_exclude, -+ uint32_t types_no_prompt, int yes, force_t force) - { - #ifdef BLKID_WIPING_SUPPORT - if (find_config_tree_bool(cmd, allocation_use_blkid_wiping_CFG, NULL)) - return _wipe_known_signatures_with_blkid(dev, name, -- exclude_lvm_member, yes, force); -+ types_to_exclude, -+ types_no_prompt, -+ yes, force); - #endif - return _wipe_known_signatures_with_lvm(dev, name, -- exclude_lvm_member, yes, force); -+ types_to_exclude, -+ types_no_prompt, -+ yes, force); - } - - #ifdef __linux__ -diff --git a/lib/device/dev-type.h b/lib/device/dev-type.h -index 284280e..b1520ee 100644 ---- a/lib/device/dev-type.h -+++ b/lib/device/dev-type.h -@@ -60,8 +60,12 @@ int dev_is_swap(struct device *dev, uint64_t *signature); - int dev_is_luks(struct device *dev, uint64_t *signature); - - /* Signature wiping. */ -+#define TYPE_LVM1_MEMBER 0x001 -+#define TYPE_LVM2_MEMBER 0x002 -+#define TYPE_DM_SNAPSHOT_COW 0x004 - int wipe_known_signatures(struct cmd_context *cmd, struct device *dev, const char *name, -- int exclude_lvm_member, int yes, force_t force); -+ uint32_t types_to_exclude, uint32_t types_no_prompt, -+ int yes, force_t force); - - /* Type-specific device properties */ - unsigned long dev_md_stripe_width(struct dev_types *dt, struct device *dev); -diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c -index f45c89f..66f3bd7 100644 ---- a/lib/metadata/lv_manip.c -+++ b/lib/metadata/lv_manip.c -@@ -5448,7 +5448,9 @@ int wipe_lv(struct logical_volume *lv, struct wipe_params wp) - if (wp.do_wipe_signatures) { - log_verbose("Wiping known signatures on logical volume \"%s/%s\"", - lv->vg->name, lv->name); -- if (!wipe_known_signatures(lv->vg->cmd, dev, name, 0, wp.yes, wp.force)) -+ if (!wipe_known_signatures(lv->vg->cmd, dev, name, 0, -+ TYPE_DM_SNAPSHOT_COW, -+ wp.yes, wp.force)) - stack; - } - -diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c -index 4d4778b..e4e1771 100644 ---- a/lib/metadata/metadata.c -+++ b/lib/metadata/metadata.c -@@ -1372,7 +1372,9 @@ static int pvcreate_check(struct cmd_context *cmd, const char *name, - goto bad; - } - -- if (!wipe_known_signatures(cmd, dev, name, 1, pp->yes, pp->force)) { -+ if (!wipe_known_signatures(cmd, dev, name, -+ TYPE_LVM1_MEMBER | TYPE_LVM2_MEMBER, -+ 0, pp->yes, pp->force)) { - log_error("Aborting pvcreate on %s.", name); - goto bad; - } --- -1.9.0 - diff --git a/core/lvm2/0002-snapshot-zero-cow-header-for-read-only-snapshot.patch b/core/lvm2/0002-snapshot-zero-cow-header-for-read-only-snapshot.patch deleted file mode 100644 index b1f9775bb..000000000 --- a/core/lvm2/0002-snapshot-zero-cow-header-for-read-only-snapshot.patch +++ /dev/null @@ -1,74 +0,0 @@ -From d5c2c146ee050905a175b73dd3d0155f46d5cf81 Mon Sep 17 00:00:00 2001 -From: Zdenek Kabelac -Date: Wed, 26 Feb 2014 00:17:11 +0100 -Subject: [PATCH 2/2] snapshot: zero cow header for read-only snapshot -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When read-only snapshot was created, tool was skipping header -initialization of cow device. If it happened device has been -already containing header from some previous snapshot, it's -been 'reused' for a newly created snapshot instead of being cleared. - -Conflicts: - WHATS_NEW - -[Backported to 2.02.105 by Thomas Bächler (thomas@archlinux.org)] ---- - WHATS_NEW | 1 + - test/shell/snapshot-usage.sh | 11 +++++++++++ - tools/lvcreate.c | 8 ++++++-- - 3 files changed, 18 insertions(+), 2 deletions(-) - -diff --git a/WHATS_NEW b/WHATS_NEW -index d2a3482..eeb3517 100644 ---- a/WHATS_NEW -+++ b/WHATS_NEW -@@ -1,3 +1,4 @@ -+ Zero snapshot COW header when creating read-only snapshot. - Wipe DM_snapshot_cow signature without prompt in new LVs with blkid wiping. - - Version 2.02.105 - 20th January 2014 -diff --git a/test/shell/snapshot-usage.sh b/test/shell/snapshot-usage.sh -index 9e6a14f..17abe9b 100644 ---- a/test/shell/snapshot-usage.sh -+++ b/test/shell/snapshot-usage.sh -@@ -128,4 +128,15 @@ vgremove -ff $vg1 - - fi - -+lvremove -f $vg -+ -+# Check snapshot really deletes COW header for read-only snapshot -+aux lvmconf "allocation/wipe_signatures_when_zeroing_new_lvs = 1" -+lvcreate -L10 -n $lv1 $vg -+lvcreate -s -L10 -n snap $vg/$lv1 -+# Populate snapshot with some filesystem signatures -+mkfs.ext4 "$DM_DEV_DIR/$vg/snap" -+lvremove -f $vg/snap -+lvcreate -s -pr -l12 -n snap $vg/$lv1 -+ - vgremove -ff $vg -diff --git a/tools/lvcreate.c b/tools/lvcreate.c -index d0ca7bc..e8270c4 100644 ---- a/tools/lvcreate.c -+++ b/tools/lvcreate.c -@@ -644,8 +644,12 @@ static int _read_activation_params(struct lvcreate_params *lp, struct cmd_contex - lp->permission = arg_uint_value(cmd, permission_ARG, - LVM_READ | LVM_WRITE); - -- /* Must not zero/wipe read only volume */ -- if (!(lp->permission & LVM_WRITE)) { -+ if (lp->snapshot) { -+ /* Snapshot has to zero COW header */ -+ lp->zero = 1; -+ lp->wipe_signatures = 0; -+ } else if (!(lp->permission & LVM_WRITE)) { -+ /* Must not zero/wipe read only volume */ - lp->zero = 0; - lp->wipe_signatures = 0; - } --- -1.9.0 - diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD index 566e06924..0fcd10d11 100644 --- a/core/lvm2/PKGBUILD +++ b/core/lvm2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 206501 2014-02-28 22:40:15Z thomas $ +# $Id: PKGBUILD 210240 2014-04-12 17:56:22Z thomas $ # Maintainer: Eric Bélanger # Maintainer: Thomas Bächler pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') -pkgver=2.02.105 -pkgrel=2 +pkgver=2.02.106 +pkgrel=1 arch=('i686' 'x86_64') url="http://sourceware.org/lvm2/" license=('GPL2' 'LGPL2.1') @@ -21,10 +21,8 @@ source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc} dmeventd.socket lvm-monitoring.service lvmetad.service - lvmetad.socket - 0001-wiping-wipe-DM_snapshot_cow-signature-without-prompt.patch - 0002-snapshot-zero-cow-header-for-read-only-snapshot.patch) -sha1sums=('796163e766480cdc427cd443dc1336ae8e8e3bd7' + lvmetad.socket) +sha1sums=('0943d1c401675dfdc2118b9ad4fd4d7fb50eaaff' 'SKIP' '76e83966d1bc84f9a1e30bcaff84b8b8fefbca0f' 'ff0fdf0a3005a41acd4b36865056109effc3474b' @@ -35,17 +33,12 @@ sha1sums=('796163e766480cdc427cd443dc1336ae8e8e3bd7' '1d56f47a81350ae37ffbf61ee036fe31f4c5d504' 'aad90fce0e12eda41d38571d8eb27c5d5a8c59ec' 'f857a4a63fcc604a981e56875edda91767d4f1bf' - 'fcfc265e3b10294cc4b10949a342e9db4310b186' - '044d426c49919b5a86fd84228d1c7e1f3a86c59a' - '4f83555347e7c3596c53d9009f260c1d65639e6d') + 'fcfc265e3b10294cc4b10949a342e9db4310b186') prepare() { cd LVM2.${pkgver} # enable lvmetad sed -i 's|use_lvmetad = 0|use_lvmetad = 1|' conf/example.conf.in - - patch -p1 -i "${srcdir}"/0001-wiping-wipe-DM_snapshot_cow-signature-without-prompt.patch - patch -p1 -i "${srcdir}"/0002-snapshot-zero-cow-header-for-read-only-snapshot.patch } build() { diff --git a/core/pcre/PKGBUILD b/core/pcre/PKGBUILD index e726405f9..f5e0da1c1 100644 --- a/core/pcre/PKGBUILD +++ b/core/pcre/PKGBUILD @@ -1,23 +1,25 @@ -# $Id: PKGBUILD 204393 2014-01-19 00:33:32Z allan $ -# Maintainer: Allan McRae +# $Id: PKGBUILD 210215 2014-04-11 23:57:22Z seblu $ +# Maintainer: Sébastien "Seblu" Luttringer +# Contributor: Allan McRae # Contributor: Eric Belanger # Contributor: John Proctor pkgname=pcre -pkgver=8.34 -pkgrel=2 -pkgdesc="A library that implements Perl 5-style regular expressions" +pkgver=8.35 +pkgrel=1 +pkgdesc='A library that implements Perl 5-style regular expressions' arch=('i686' 'x86_64') -url="http://www.pcre.org/" +url='http://www.pcre.org/' license=('BSD') -depends=('readline' 'zlib' 'bzip2') -source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2{,.sig}) -md5sums=('5439e321351bddd5533551bbce128d07' +depends=('gcc-libs' 'readline' 'zlib' 'bzip2' 'bash') +source=("ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$pkgname-$pkgver.tar.bz2"{,.sig}) +md5sums=('6aacb23986adccd9b3bc626c00979958' 'SKIP') build() { - cd "${srcdir}"/${pkgname}-${pkgver} - ./configure --prefix=/usr \ + cd $pkgname-$pkgver + ./configure \ + --prefix=/usr \ --enable-unicode-properties \ --enable-pcre16 \ --enable-pcre32 \ @@ -29,13 +31,15 @@ build() { } check() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd $pkgname-$pkgver make -j1 check } package() { - cd "${srcdir}"/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install - install -Dm644 LICENCE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE + install -Dm644 LICENCE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } + +# vim:set ts=2 sw=2 et: diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index b458c97a2..1697ace46 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 210194 2014-04-11 09:13:27Z bpiotrowski $ +# $Id: PKGBUILD 210242 2014-04-12 18:31:21Z bpiotrowski $ # Maintainer: AndyRTR # Maintainer: Bartłomiej Piotrowski @@ -20,7 +20,7 @@ pkgname=('libreoffice-common' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) _LOver=4.2.3.3 pkgver=4.2.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -38,8 +38,7 @@ makedepends=( # makedepends 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' #'telepathy-glib' - 'gstreamer0.10-base' 'gst-plugins-base-libs' 'glu' - 'ttf-liberation' # to satisfy regression tests + 'gst-plugins-base-libs' 'glu' 'ttf-liberation' # to satisfy regression tests 'git') # there's only one single static library in libreoffice-sdk, # the next build that removes it may lead to trouble if people may use it @@ -130,9 +129,9 @@ noextract=(15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2 libabw-0.0.2.tar.bz2) md5sums=('0347f2c919e809b3f3794ed509caa902' 'SKIP' - '11a2381971a7444fe5154ab9ae9578d6' + 'fa82b4c4510c78fe22a3a56d53fb9752' 'SKIP' - '21f4ff9b4e49c2b1a6464b4dae6cfb42' + '81759541de9ce626a02d652399cd1ffe' 'SKIP' '15cb8c0803064faef0c4ddf5bc5ca279' '1f24ab1d39f4a51faf22244c94a6203f' @@ -239,6 +238,7 @@ build() { --enable-kde4\ --enable-gtk3 \ --enable-gstreamer \ + --disable-gstreamer-0-10 \ --enable-lockdown\ --enable-opencl \ --enable-opengl \ @@ -322,7 +322,7 @@ package_libreoffice-common() { 'graphite' "icu>=52.1" 'clucene' 'lcms2' "poppler>=0.24.0" #'telepathy-glib' # (calc telepathy-glib libtubeslo.so) 'libodfgen' 'libvisio' 'harfbuzz-icu' 'hicolor-icon-theme' 'glu' - 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'gstreamer0.10-base') + 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' 'pstoedit: translates PostScript and PDF graphics into other vector formats' diff --git a/extra/nmap/PKGBUILD b/extra/nmap/PKGBUILD index 2b785b28f..7d919e386 100644 --- a/extra/nmap/PKGBUILD +++ b/extra/nmap/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 191740 2013-07-30 01:18:34Z bisson $ +# $Id: PKGBUILD 210221 2014-04-12 15:47:33Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Angel Velasquez # Contributor: Hugo Doria pkgname=nmap -pkgver=6.40 +pkgver=6.45 pkgrel=1 pkgdesc='Utility for network discovery and security auditing' url='http://nmap.org/' arch=('i686' 'x86_64') -license=('GPL') +license=('GPL2') makedepends=('pygtk') optdepends=('pygtk: zenmap' 'sudo: privilege escalation for zenmap' @@ -18,7 +18,7 @@ optdepends=('pygtk: zenmap' 'gksu: privilege escalation for zenmap') depends=('pcre' 'openssl' 'libpcap' 'lua') source=("http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('ee1bec1bb62045c7c1fc69ff183b2ae9b97bd0eb') +sha1sums=('3a634d319c57f6d93e5ccb69b45c133690d437e1') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD deleted file mode 100644 index ebfa4796b..000000000 --- a/libre/cups-filters-libre/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 207606 2014-03-12 18:51:05Z andyrtr $ -# Maintainer: Andreas Radke - -pkgname=cups-filters-libre -_pkgname=cups-filters -pkgver=1.0.48 -pkgrel=1 -pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation" -arch=('i686' 'x86_64') -url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" -license=('GPL') -depends=('lcms2' 'poppler' 'qpdf') -makedepends=('ghostscript' 'ttf-dejavu') # 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') -backup=(etc/fonts/conf.d/99pdftoopvp.conf - etc/cups/cups-browsed.conf) -source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz) -provides=("${_pkgname}=${pkgver}" 'foomatic-filters') -replaces=("${_pkgname}" 'foomatic-filters') -conflicts=("${_pkgname}" 'foomatic-filters') -md5sums=('9a879473de978b6fdbd4899f2a455be3') - -build() { - cd $_pkgname-$pkgver - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --sbindir=/usr/bin \ - --localstatedir=/var \ - --with-rcdir=no \ - --enable-avahi \ - --with-browseremoteprotocols=DNSSD,CUPS \ - --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf - make -} - -check() { - cd $_pkgname-$pkgver - make check -} - -package() { - cd $_pkgname-$pkgver - make DESTDIR="$pkgdir/" install - - # add upstream systemd support file - install -Dm644 utils/cups-browsed.service ${pkgdir}/usr/lib/systemd/system/cups-browsed.service - sed -i "s|/usr/sbin/cups-browsed|/usr/bin/cups-browsed|" ${pkgdir}/usr/lib/systemd/system/cups-browsed.service - - # use lp group from cups pkg FS#36769 - chgrp -R lp ${pkgdir}/etc/cups -} diff --git a/libre/grub/09_parabola b/libre/grub/09_parabola deleted file mode 100644 index 90a9062a3..000000000 --- a/libre/grub/09_parabola +++ /dev/null @@ -1,195 +0,0 @@ -#!/usr/bin/env bash - -## -## grub-mkconfig helper script specific to Parabola GNU/Linux-libre -## Contributed by "Keshav Amburay" -## Rebranded for Parabola by "André Silva" -## Updated on 08 February 2014 -## -## Script based on do_grub_config() function in Arch Archboot ISO Installer/Setup script -## Some parts taken from /etc/grub.d/10_linux script shipped by GRUB(2) upstream -## -## This script can be freely distributed and/or modified -## under the terms of the GNU General Public License as published by -## the Free Software Foundation, either version 3 of the License, or -## (at your option) any later version. -## -## This script 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. -## - -_FUNC_GRUB_FILE_PRESENT() { - - [[ -z "${GRUB_PLATFORM}" ]] && GRUB_PLATFORM="x86" - - if [[ "${GRUB_PLATFORM}" == "x86" ]]; then - check="--is-x86-linux32" - elif [[ "${GRUB_PLATFORM}" == "i386-xen-pae" ]]; then - check="--is-i386-xen-pae-domu" - elif [[ "${GRUB_PLATFORM}" == "x86_64-xen" ]]; then - check="--is-x86_64-xen-domu" - else - check="--is-${GRUB_PLATFORM}-linux" - fi - - case "${GRUB_PLATFORM}" in - x86) - list="$(for i in "${GRUB_ROOT}"/boot/vmlinuz-linux* ; do - if grub_file_is_not_garbage "${i}" && "${grub_file}" ${check} "${i}" ; then echo -n "${i} " ; fi - done)" ;; - *) - list="$(for i in "${GRUB_ROOT}"/boot/vmlinuz-linux* ; do - if grub_file_is_not_garbage "${i}" && "${grub_file}" ${check} "${i}" ; then echo -n "${i} " ; fi - done)" ;; - esac -} - -set -e - -prefix="/usr" -exec_prefix="${prefix}" -datarootdir="/usr/share" -datadir="${datarootdir}" -sysconfdir="/etc" - -. "${datarootdir}/grub/grub-mkconfig_lib" - -. "${sysconfdir}/default/grub" - -export TEXTDOMAIN="grub" -export TEXTDOMAINDIR="${datarootdir}/locale" - -CLASS="--class parabola --class gnu-linux --class gnu --class os" - -[[ "${grub_file}" != "" ]] && _FUNC_GRUB_FILE_PRESENT - -BOOT_PART_FS_UUID="$(${grub_probe} --target="fs_uuid" "/boot" 2>/dev/null)" -BOOT_PART_HINTS_STRING="$(${grub_probe} --target="hints_string" "/boot" 2>/dev/null || true)" -BOOT_PART_FS="$(${grub_probe} --target="fs" "/boot" 2>/dev/null)" - -ROOT_PART_GRUB_DEVICE="$(${grub_probe} --target=device / || true)" -ROOT_PART_FS="$(${grub_probe} --device ${ROOT_PART_GRUB_DEVICE} --target=fs 2> /dev/null || echo "unknown")" - -if [[ "${GRUB_LINUX_ROOT_DEVICE}" == "" ]]; then - - case "${ROOT_PART_FS}" in - btrfs) - rootsubvol="$(make_system_path_relative_to_its_root /)" - rootsubvol="${rootsubvol#/}" - if [[ "${rootsubvol}" != "" ]]; then - GRUB_LINUX_ROOT_DEVICE="subvol=${rootsubvol}" - fi - ;; - zfs) - rpool="$(${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true)" - bootfs="$(make_system_path_relative_to_its_root / | sed -e "s,@$,,")" - GRUB_LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs}" - ;; - esac - - if [[ "${GRUB_DEVICE_UUID}" == "" ]] || \ - [[ "${GRUB_DISABLE_LINUX_UUID}" == "true" ]] || \ - [[ ! -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" ]] || \ - uses_abstraction "${GRUB_DEVICE}" lvm ; then - GRUB_LINUX_ROOT_DEVICE="${GRUB_DEVICE}" - else - GRUB_LINUX_ROOT_DEVICE="UUID=${GRUB_DEVICE_UUID}" - fi -fi - -[[ "${GRUB_LINUX_PARAMS}" == "" ]] && GRUB_LINUX_PARAMS="${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" - -for _KERNEL_ in ${list} ; do - - echo "Found linux image: ${_KERNEL_}" >&2 - - basename="$(basename "${_KERNEL_}")" - dirname="$(dirname "${_KERNEL_}")" - REAL_DIR="$(make_system_path_relative_to_its_root "${dirname}")" - - _KERNEL_FILE_="$(echo ${_KERNEL_} | sed 's,/boot/,,g')" - _KERNEL_PKG_="pkg-$(echo ${_KERNEL_FILE_} | sed 's,vmlinuz-,,g')" - - _INITRAMFS_="${_KERNEL_FILE_/vmlinuz-/initramfs-}.img" - - if [[ -e "/boot/${_INITRAMFS_}" ]]; then - - echo "Found initramfs image: /boot/${_INITRAMFS_}" >&2 - -cat << EOF - -menuentry "Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel" ${CLASS} { - $(save_default_entry) - if [ x\$feature_all_video_module = xy ]; then - insmod all_video - fi - set gfxpayload=keep - insmod ${BOOT_PART_FS} - if [ x\$feature_platform_search_hint = xy ]; then - search --no-floppy --fs-uuid --set=root ${BOOT_PART_HINTS_STRING} ${BOOT_PART_FS_UUID} - else - search --no-floppy --fs-uuid --set=root ${BOOT_PART_FS_UUID} - fi - echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel ...' - linux ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} - echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel initramfs ...' - initrd ${REAL_DIR}/${_INITRAMFS_} -} - -EOF - fi - - _INITRAMFS_FALLBACK_="${_KERNEL_FILE_/vmlinuz-/initramfs-}-fallback.img" - - if [[ -e "/boot/${_INITRAMFS_FALLBACK_}" ]]; then - - echo "Found fallback initramfs image: /boot/${_INITRAMFS_FALLBACK_}" >&2 - -cat << EOF - -menuentry "Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel (fallback initramfs)" ${CLASS} { - $(save_default_entry) - if [ x\$feature_all_video_module = xy ]; then - insmod all_video - fi - set gfxpayload=keep - insmod ${BOOT_PART_FS} - if [ x\$feature_platform_search_hint = xy ]; then - search --no-floppy --fs-uuid --set=root ${BOOT_PART_HINTS_STRING} ${BOOT_PART_FS_UUID} - else - search --no-floppy --fs-uuid --set=root ${BOOT_PART_FS_UUID} - fi - echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel ...' - linux ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} - echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel fallback initramfs ...' - initrd ${REAL_DIR}/${_INITRAMFS_FALLBACK_} -} - -EOF - fi - - if [[ ! -e "/boot/${_INITRAMFS_}" ]] && [[ ! -e "/boot/${_INITRAMFS_FALLBACK_}" ]]; then -cat << EOF - -menuentry "Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel (no initramfs)" ${CLASS} { - $(save_default_entry) - if [ x\$feature_all_video_module = xy ]; then - insmod all_video - fi - set gfxpayload=keep - insmod ${BOOT_PART_FS} - if [ x\$feature_platform_search_hint = xy ]; then - search --no-floppy --fs-uuid --set=root ${BOOT_PART_HINTS_STRING} ${BOOT_PART_FS_UUID} - else - search --no-floppy --fs-uuid --set=root ${BOOT_PART_FS_UUID} - fi - echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel ...' - linux ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} -} - -EOF - fi - -done diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD deleted file mode 100644 index ecf9bade2..000000000 --- a/libre/grub/PKGBUILD +++ /dev/null @@ -1,275 +0,0 @@ -# Maintainer : Tobias Powalowski -# Maintainer : Ronald van Haren -# Contributor: Keshav Padram Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> -# Maintainer (Parabola): André Silva -# Contributor (Parabola): Márcio Silva - -_pkgver="2.02" -_GRUB_GIT_TAG="grub-2.02-beta2" - -_UNIFONT_VER="6.3.20131217" - -[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64" -[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386" - -pkgname="grub" -pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)" -pkgver=2.02.beta2 -pkgrel=2.1 -epoch="1" -url="https://www.gnu.org/software/grub/" -arch=('x86_64' 'i686') -license=('GPL3') -backup=('etc/default/grub' 'etc/grub.d/40_custom') -install="${pkgname}.install" -options=('!makeflags') - -conflicts=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}" 'grub-legacy') -replaces=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}") -provides=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}") - -makedepends=('git' 'rsync' 'xz' 'freetype2' 'ttf-dejavu' 'python' 'autogen' - 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse') -depends=('sh' 'xz' 'gettext' 'device-mapper') -optdepends=('freetype2: For grub-mkfont usage' - 'fuse: For grub-mount usage' - 'dosfstools: For grub-mkrescue FAT FS and EFI support' - 'efibootmgr: For grub-install EFI support' - 'libisoburn: Provides xorriso for generating grub rescue iso using grub-mkrescue' - 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems' - 'mtools: For grub-mkrescue FAT FS support') - -source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#tag=${_GRUB_GIT_TAG}" - "grub-extras::git+git://git.sv.gnu.org/grub-extras.git#branch=master" - "http://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz" - "http://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz.sig" - 'grub-add-GRUB_COLOR_variables.patch' - '09_parabola' - '60_memtest86+' - 'grub.default' - '10_linux.in.patch') -md5sums=('SKIP' - 'SKIP' - '728b7439ac733a7c0d56049adec364c7' - 'SKIP' - 'e506ae4a9f9f7d1b765febfa84e10d48' - '9f67330f2979a153acb32af706e0c094' - 'be55eabc102f2c60b38ed35c203686d6' - '52d374e0194e3f2e39ff7c92ecd58a6c' - 'b23a144b7001c88734b79ed3bec491c4') - -pkgver() { - cd "${srcdir}/grub-${_pkgver}/" - echo "$(git describe --tags)" | sed -e 's|grub.||g' -e 's|-|\.|g' -} - -prepare() { - - cd "${srcdir}/grub-${_pkgver}/" - - msg "Patch to enable GRUB_COLOR_* variables in grub-mkconfig" - ## Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html - patch -Np1 -i "${srcdir}/grub-add-GRUB_COLOR_variables.patch" - echo - - msg "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme" - sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "${srcdir}/grub-${_pkgver}/configure.ac" - - msg "Rebranding for some free distros" - patch -Np1 -i "${srcdir}/10_linux.in.patch" - echo - - msg "Fix mkinitcpio 'rw' FS#36275" - sed 's| ro | rw |g' -i "${srcdir}/grub-${_pkgver}/util/grub.d/10_linux.in" - - # msg "autogen.sh requires python (2/3). since bzr is in makedepends, use python2 and no need to pull python3" - # sed 's|python |python2 |g' -i "${srcdir}/grub-${_pkgver}/autogen.sh" - - msg "Pull in latest language files" - ./linguas.sh - echo - - msg "Remove not working langs which need LC_ALL=C.UTF-8" - sed -e 's#en@cyrillic en@greek##g' -i "${srcdir}/grub-${_pkgver}/po/LINGUAS" - - msg "Avoid problem with unifont during compile of grub, http://savannah.gnu.org/bugs/?40330 and https://bugs.archlinux.org/task/37847" - cp "${srcdir}/unifont-${_UNIFONT_VER}.bdf" "${srcdir}/grub-${_pkgver}/unifont.bdf" - -} - -_build_grub-common_and_bios() { - - msg "Set ARCH dependent variables for bios build" - if [[ "${CARCH}" == 'x86_64' ]]; then - _EFIEMU="--enable-efiemu" - else - _EFIEMU="--disable-efiemu" - fi - - msg "Copy the source for building the bios part" - cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-bios" - cd "${srcdir}/grub-${_pkgver}-bios/" - - msg "Add the grub-extra sources for bios build" - install -d "${srcdir}/grub-${_pkgver}-bios/grub-extras" - cp -r "${srcdir}/grub-extras/915resolution" "${srcdir}/grub-${_pkgver}-bios/grub-extras/915resolution" - export GRUB_CONTRIB="${srcdir}/grub-${_pkgver}-bios/grub-extras/" - - msg "Unset all compiler FLAGS for bios build" - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - - cd "${srcdir}/grub-${_pkgver}-bios/" - - msg "Run autogen.sh for bios build" - ./autogen.sh - echo - - msg "Run ./configure for bios build" - ./configure \ - --with-platform="pc" \ - --target="i386" \ - "${_EFIEMU}" \ - --enable-mm-debug \ - --enable-nls \ - --enable-device-mapper \ - --enable-cache-stats \ - --enable-boot-time \ - --enable-grub-mkfont \ - --enable-grub-mount \ - --prefix="/usr" \ - --bindir="/usr/bin" \ - --sbindir="/usr/bin" \ - --mandir="/usr/share/man" \ - --infodir="/usr/share/info" \ - --datarootdir="/usr/share" \ - --sysconfdir="/etc" \ - --program-prefix="" \ - --with-bootdir="/boot" \ - --with-grubdir="grub" \ - --disable-silent-rules \ - --disable-werror - echo - - msg "Run make for bios build" - make - echo -} - -_build_grub-efi() { - - msg "Copy the source for building the ${_EFI_ARCH} efi part" - cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-efi-${_EFI_ARCH}" - cd "${srcdir}/grub-${_pkgver}-efi-${_EFI_ARCH}/" - - msg "Unset all compiler FLAGS for ${_EFI_ARCH} efi build" - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - - cd "${srcdir}/grub-${_pkgver}-efi-${_EFI_ARCH}/" - - msg "Run autogen.sh for ${_EFI_ARCH} efi build" - ./autogen.sh - echo - - msg "Run ./configure for ${_EFI_ARCH} efi build" - ./configure \ - --with-platform="efi" \ - --target="${_EFI_ARCH}" \ - --disable-efiemu \ - --enable-mm-debug \ - --enable-nls \ - --enable-device-mapper \ - --enable-cache-stats \ - --enable-boot-time \ - --enable-grub-mkfont \ - --enable-grub-mount \ - --prefix="/usr" \ - --bindir="/usr/bin" \ - --sbindir="/usr/bin" \ - --mandir="/usr/share/man" \ - --infodir="/usr/share/info" \ - --datarootdir="/usr/share" \ - --sysconfdir="/etc" \ - --program-prefix="" \ - --with-bootdir="/boot" \ - --with-grubdir="grub" \ - --disable-silent-rules \ - --disable-werror - echo - - msg "Run make for ${_EFI_ARCH} efi build" - make - echo - -} - -build() { - - cd "${srcdir}/grub-${_pkgver}/" - - msg "Build grub bios stuff" - _build_grub-common_and_bios - echo - - msg "Build grub ${_EFI_ARCH} efi stuff" - _build_grub-efi - echo - -} - -_package_grub-common_and_bios() { - - cd "${srcdir}/grub-${_pkgver}-bios/" - - msg "Run make install for bios build" - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install - echo - - msg "Remove gdb debugging related files for bios build" - rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true - - msg "Install 09_parabola helper script for grub-mkconfig" - install -D -m0755 "${srcdir}/09_parabola" "${pkgdir}/etc/grub.d/09_parabola" - - msg "Install extra /etc/grub.d/ files" - install -D -m0755 "${srcdir}/60_memtest86+" "${pkgdir}/etc/grub.d/60_memtest86+" - - msg "Install /etc/default/grub (used by grub-mkconfig)" - install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" - - -} - -_package_grub-efi() { - - cd "${srcdir}/grub-${_pkgver}-efi-${_EFI_ARCH}/" - - msg "Run make install for ${_EFI_ARCH} efi build" - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install - echo - - msg "Remove gdb debugging related files for ${_EFI_ARCH} efi build" - rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true - -} - -package() { - - msg "Package grub ${_EFI_ARCH} efi stuff" - _package_grub-efi - - msg "Package grub bios stuff" - _package_grub-common_and_bios - -} diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD deleted file mode 100644 index 732537aa8..000000000 --- a/libre/icecat-noscript/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 106974 2014-03-11 09:44:54Z spupykin $ -# Maintainer: Sergej Pupykin -# Maintainer (Parabola): André Silva - -_pkgname=firefox-noscript -pkgname=icecat-noscript -pkgver=2.6.8.17 -pkgrel=1 -pkgdesc="plugin for icecat which disables script" -arch=('any') -url="http://noscript.net/" -license=('GPL2') -depends=() -provides=$_pkgname=$pkgver -makedepends=('unzip') -source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('11a37854aeda9eae8de3a822633a369d') - -package() { -# _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-` -# depends=("icecat>=${_ffver}" "icecat<=${_ffver/0/99}") - depends=("icecat") - - cd $srcdir - local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf) - local dstdir=$pkgdir/usr/lib/icecat/browser/extensions/${emid} - install -d $dstdir -# sed -i 's#.*#7.*#' install.rdf - cp -R * $dstdir - rm $dstdir/noscript-$pkgver.xpi -} diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD deleted file mode 100644 index 87a1964d3..000000000 --- a/libre/iceweasel-noscript/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 106974 2014-03-11 09:44:54Z spupykin $ -# Maintainer: Sergej Pupykin -# Maintainer (Parabola): André Silva - -_pkgname=firefox-noscript -pkgname=iceweasel-noscript -pkgver=2.6.8.17 -pkgrel=1 -pkgdesc="plugin for iceweasel which disables script" -arch=('any') -url="http://noscript.net/" -license=('GPL2') -depends=() -provides=$_pkgname=$pkgver -makedepends=('unzip') -source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('11a37854aeda9eae8de3a822633a369d') - -package() { -# _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-` -# depends=("iceweasel-libre>=${_ffver}" "iceweasel-libre<=${_ffver/0/99}") - depends=("iceweasel-libre") - - cd $srcdir - local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf) - local dstdir=$pkgdir/usr/lib/iceweasel/browser/extensions/${emid} - install -d $dstdir -# sed -i 's#.*#7.*#' install.rdf - cp -R * $dstdir - rm $dstdir/noscript-$pkgver.xpi -} diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD deleted file mode 100644 index 84abd42f2..000000000 --- a/libre/xbmc-libre/PKGBUILD +++ /dev/null @@ -1,140 +0,0 @@ -# $Id: PKGBUILD 107003 2014-03-11 11:04:53Z spupykin $ -# Maintainer: Sergej Pupykin -# Contributor: Brad Fanella -# Contributor: [vEX] -# Contributor: Zeqadious -# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com > -# Maintainer (Parabola): André Silva - -_prefix=/usr - -_pkgname=xbmc -pkgname=xbmc-libre -pkgver=12.3 -_codename=Frodo -pkgrel=12 -pkgdesc="A software media player and entertainment hub for digital media, without nonfree addons and unrar support" -arch=('i686' 'x86_64') -url="http://xbmc.org" -license=('GPL' 'custom') -replaces=$_pkgname -conflicts=$_pkgname -provides=$_pkgname=$pkgver -depends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' - 'libpng' 'libcdio' 'yajl' 'libmariadbclient' 'libjpeg-turbo' 'libsamplerate' - 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' - 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' - 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez-libs' 'glu' - 'tinyxml' 'taglib' 'ffmpeg-compat') -makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec' - 'udisks' 'upower' 'mesa' 'doxygen' 'swig' 'java-environment') -optdepends=('libcec: support for Pulse-Eight USB-CEC adapter' - 'lirc: remote controller support' - 'udisks: automount external drives' - 'upower: used to trigger power management functionality' - 'xorg-xinit: autostart xbmc') -install="${_pkgname}.install" -mksource=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz") -source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz" - "xbmc.service" - "polkit.rules" - "libass.patch::https://bugs.archlinux.org/index.php?getfile=11285") -mkmd5sums=('7ae385ebf8e5cfcb917393235e6efbdb') -md5sums=('7c71af50af55b097e4365a58b70754e8' - '03e9a33e15714d1fd1f2a516abea5393' - '02f7951824ee13103344f36009c0ef2a' - '7fd6399d2ffbdf06b724f0cc2efa0784') - -mksource() { - cd "${srcdir}/xbmc-$pkgver-$_codename" - - # remove unrar files from the source - rm -rv lib/UnrarXLib -} - -prepare() { - cd "${srcdir}/xbmc-$pkgver-$_codename" - - patch -p0 <$srcdir/libass.patch - - # fix lsb_release dependency - sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp - sed -i -e 's:#include :#include :' xbmc/filesystem/{SmbFile,SMBDirectory}.cpp - - # use addons.xml from Parabola server (without nonfree addons support) - sed -i -e 's|mirrors[.]xbmc[.]org/addons/frodo/addons.xml|repo.parabolagnulinux.org/other/xbmc-libre/addons/frodo/addons.xml|' addons/repository.xbmc.org/addon.xml -} - -build() { - cd "${srcdir}/xbmc-$pkgver-$_codename" - - # Bootstrapping XBMC - ./bootstrap - - # Configuring XBMC - export PYTHON_VERSION=2 # external python v2 - export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH - ./configure --prefix=$_prefix --exec-prefix=$_prefix \ - --disable-debug \ - --enable-optimizations \ - --enable-gl \ - --enable-sdl \ - --enable-vaapi \ - --enable-vdpau \ - --enable-xvba \ - --enable-joystick \ - --enable-xrandr \ - --enable-rsxs \ - --enable-projectm \ - --enable-x11 \ - --enable-rtmp \ - --enable-samba \ - --enable-nfs \ - --enable-afpclient \ - --enable-airplay \ - --enable-airtunes \ - --enable-ffmpeg-libvorbis \ - --enable-dvdcss \ - --disable-hal \ - --enable-avahi \ - --enable-webserver \ - --enable-optical-drive \ - --enable-libbluray \ - --enable-texturepacker \ - --enable-udev \ - --enable-libusb \ - --enable-libcec \ - --enable-external-libraries \ - --enable-external-ffmpeg \ - --disable-non-free - # Now (finally) build - make -} - -package() { - cd "${srcdir}/xbmc-$pkgver-$_codename" - # Running make install - make DESTDIR="${pkgdir}" install - - # run feh with python2 - sed -i -e 's/python/python2/g' ${pkgdir}${_prefix}/bin/xbmc - - # lsb_release fix - sed -i -e 's/which lsb_release &> \/dev\/null/\[ -f \/etc\/arch-release ]/g' "${pkgdir}${_prefix}/bin/xbmc" - sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/ \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/xbmc" - - # Tools - install -D -m 0755 "${srcdir}/xbmc-$pkgver-$_codename/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr" - install -D -m 0755 "${srcdir}/xbmc-$pkgver-$_codename/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/" - - # Licenses - install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${_pkgname}" - for licensef in LICENSE.GPL copying.txt; do - mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${_pkgname}" - done - - install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service -# install -Dm0644 $srcdir/polkit.rules $pkgdir/usr/share/polkit-1/rules.d/10-xbmc.rules -# chmod 0700 $pkgdir/usr/share/polkit-1/rules.d/ -} -# vim:set ts=2 sw=2 et: diff --git a/libre/xbmc-libre/xbmc.service b/libre/xbmc-libre/xbmc.service deleted file mode 100644 index 050460f39..000000000 --- a/libre/xbmc-libre/xbmc.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description = Starts instance of XBMC using xinit -After = systemd-user-sessions.service -Conflicts=getty@tty7.service - -[Service] -User = xbmc -Group = xbmc -PAMName=login -Type = simple -TTYPath=/dev/tty7 -ExecStart = /usr/bin/xinit /usr/bin/dbus-launch /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp vt7 -Restart = on-abort - -[Install] -WantedBy = multi-user.target diff --git a/pcr/expac-relative/PKGBUILD b/pcr/expac-relative/PKGBUILD deleted file mode 100644 index 4f25e926b..000000000 --- a/pcr/expac-relative/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 87501 2013-04-02 00:06:04Z dreisner $ -# Maintainer: Dave Reisner -# Maintainer (Parabola): Esteban Carnevale -# Maintainer (Parabola): André Silva - -_pkgname=expac -pkgname=expac-relative -pkgver=3 -pkgrel=1 -pkgdesc="pacman database extraction utility, with dbpath and config options support" -arch=('i686' 'x86_64' 'mips64el') -url="http://github.com/falconindy/expac" -license=('GPL') -conflicts=$_pkgname -provides=$_pkgname -depends=('pacman') -makedepends=('perl') -source=("http://code.falconindy.com/archive/$_pkgname/$_pkgname-$pkgver.tar.gz"{,.sig} - 'add-options-dbpath-and-config.patch') -md5sums=('2f53f9663b69948a4a8bb03c1aa435a5' - 'SKIP' - '30539a5f7d1acbebb393535ae8ecf570') - -prepare() { - cd "$_pkgname-$pkgver" - - patch -Np1 -i "$srcdir/add-options-dbpath-and-config.patch" - - sed '/\*\//q' expac.c >LICENSE -} - -build() { - cd "$_pkgname-$pkgver" - - make -} - -package() { - cd "$_pkgname-$pkgver" - - make PREFIX=/usr DESTDIR="$pkgdir" install - - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname/LICENSE" -} - -# vim: ft=sh syn=sh diff --git a/pcr/expac-relative/add-options-dbpath-and-config.patch b/pcr/expac-relative/add-options-dbpath-and-config.patch deleted file mode 100644 index 100fbb31d..000000000 --- a/pcr/expac-relative/add-options-dbpath-and-config.patch +++ /dev/null @@ -1,196 +0,0 @@ -From cc0135f30893b719d34845c088e215900962d8dd Mon Sep 17 00:00:00 2001 -From: Esteban Carnevale -Date: Sat, 8 Feb 2014 17:49:10 -0300 -Subject: [PATCH] add options dbpath and config - ---- - README.pod | 12 +++++++++++ - expac.c | 72 +++++++++++++++++++++++++++++++++++++++++--------------------- - 2 files changed, 60 insertions(+), 24 deletions(-) - -diff --git a/README.pod b/README.pod -index 8e51329..ba27281 100644 ---- a/README.pod -+++ b/README.pod -@@ -24,6 +24,18 @@ a query string (in the case of a search), or in repo/package syntax when the - - =over 4 - -+=item B<-b, --dbpath> -+ -+Specify an alternative database location (a typical default is -+/var/lib/pacman). This should not be used unless you know what you are doing. -+NOTE: if specified, this is an absolute path and the root path is not -+automatically prepended. -+ -+=item B<-c, --config> -+ -+Specify an alternate configuration file (a typical default is -+/etc/pacman.conf). -+ - =item B<-Q, --query> - - Search the local database for provided targets. This is the default behavior. -diff --git a/expac.c b/expac.c -index ae3ef6d..3f9b0ba 100644 ---- a/expac.c -+++ b/expac.c -@@ -36,6 +36,8 @@ - #include - - #define DEFAULT_DELIM "\n" -+#define DEFAULT_DBPATH "/var/lib/pacman" -+#define DEFAULT_CONFIGFILE "/etc/pacman.conf" - #define DEFAULT_LISTDELIM " " - #define DEFAULT_TIMEFMT "%c" - #define FORMAT_TOKENS "BCDEGLMNOPRSVabdhmnprsuvw%" -@@ -58,10 +60,13 @@ bool local = false; - bool groups = false; - bool localpkg = false; - char humansize = 'B'; -+char dbtype = NULL; - const char *format = NULL; - const char *timefmt = NULL; - const char *listdelim = NULL; - const char *delim = NULL; -+const char *dbpath = NULL; -+const char *configfile = NULL; - int pkgcounter = 0; - - typedef const char *(*extractfn)(void*); -@@ -154,7 +159,7 @@ static alpm_handle_t *alpm_init(void) { - char line[PATH_MAX]; - char *ptr, *section = NULL; - -- handle = alpm_initialize("/", "/var/lib/pacman", &alpm_errno); -+ handle = alpm_initialize("/", dbpath, &alpm_errno); - if (!handle) { - alpm_strerror(alpm_errno); - return NULL; -@@ -162,9 +167,9 @@ static alpm_handle_t *alpm_init(void) { - - db_local = alpm_get_localdb(handle); - -- fp = fopen("/etc/pacman.conf", "r"); -+ fp = fopen(configfile, "r"); - if (!fp) { -- perror("fopen: /etc/pacman.conf"); -+ fprintf(stderr, "fopen:%s\n", configfile); - return handle; - } - -@@ -209,6 +214,8 @@ static void usage(void) { - " Options:\n" - " -Q, --local search local DB (default)\n" - " -S, --sync search sync DBs\n" -+ " -b, --dbpath alternative database location (default: /var/lib/pacman)\n" -+ " -c, --config alternative configuration file (default: /etc/pacman.conf)\n" - " -s, --search search for matching regex\n" - " -g, --group return packages matching targets as groups\n" - " -H, --humansize format package sizes in SI units (default: bytes)\n" -@@ -222,41 +229,43 @@ static void usage(void) { - "For more details see expac(1).\n"); - } - --static int parse_options(int argc, char *argv[], alpm_handle_t *handle) { -+static int parse_options(int argc, char *argv[]) { - int opt, option_index = 0; - const char *i; - - static struct option opts[] = { -- {"readone", no_argument, 0, '1'}, -- {"delim", required_argument, 0, 'd'}, -- {"listdelim", required_argument, 0, 'l'}, -- {"group", required_argument, 0, 'g'}, -- {"help", no_argument, 0, 'h'}, -- {"file", no_argument, 0, 'p'}, -- {"humansize", required_argument, 0, 'H'}, -- {"query", no_argument, 0, 'Q'}, -- {"sync", no_argument, 0, 'S'}, -- {"search", no_argument, 0, 's'}, -- {"timefmt", required_argument, 0, 't'}, -- {"verbose", no_argument, 0, 'v'}, -+ {"readone", no_argument, 0, '1'}, -+ {"delim", required_argument, 0, 'd'}, -+ {"dbpath", required_argument, 0, 'b'}, -+ {"configfile", required_argument, 0, 'c'}, -+ {"listdelim", required_argument, 0, 'l'}, -+ {"group", required_argument, 0, 'g'}, -+ {"help", no_argument, 0, 'h'}, -+ {"file", no_argument, 0, 'p'}, -+ {"humansize", required_argument, 0, 'H'}, -+ {"query", no_argument, 0, 'Q'}, -+ {"sync", no_argument, 0, 'S'}, -+ {"search", no_argument, 0, 's'}, -+ {"timefmt", required_argument, 0, 't'}, -+ {"verbose", no_argument, 0, 'v'}, - {0, 0, 0, 0} - }; - -- while (-1 != (opt = getopt_long(argc, argv, "1l:d:gH:hf:pQSst:v", opts, &option_index))) { -+ while (-1 != (opt = getopt_long(argc, argv, "1l:d:b:c:gH:hf:pQSst:v", opts, &option_index))) { - switch (opt) { - case 'S': -- if (dblist) { -+ if (dbtype) { - fprintf(stderr, "error: can only select one repo option (use -h for help)\n"); - return 1; - } -- dblist = alpm_list_copy(alpm_get_syncdbs(handle)); -+ dbtype = 's'; - break; - case 'Q': -- if (dblist) { -+ if (dbtype) { - fprintf(stderr, "error: can only select one repo option (use -h for help)\n"); - return 1; - } -- dblist = alpm_list_add(dblist, db_local); -+ dbtype = 'q'; - local = true; - break; - case '1': -@@ -265,6 +274,12 @@ static int parse_options(int argc, char *argv[], alpm_handle_t *handle) { - case 'd': - delim = optarg; - break; -+ case 'b': -+ dbpath = optarg; -+ break; -+ case 'c': -+ configfile = optarg; -+ break; - case 'g': - groups = true; - break; -@@ -719,14 +734,23 @@ int main(int argc, char *argv[]) { - alpm_handle_t *handle; - alpm_list_t *results = NULL, *i; - -+ ret = parse_options(argc, argv); -+ if (ret != 0) { -+ goto finish; -+ } -+ -+ dbpath = dbpath ? dbpath : DEFAULT_DBPATH; -+ configfile = configfile ? configfile : DEFAULT_CONFIGFILE; -+ - handle = alpm_init(); - if (!handle) { - return ret; - } - -- ret = parse_options(argc, argv, handle); -- if (ret != 0) { -- goto finish; -+ if (dbtype == 's') { -+ dblist = alpm_list_copy(alpm_get_syncdbs(handle)); -+ } else if (dbtype == 'q') { -+ dblist = alpm_list_add(dblist, db_local); - } - - /* ensure sane defaults */ --- -1.9.0 - - -- cgit v1.2.3-54-g00ecf