diff options
author | freaj <freaj@riseup.net> | 2015-03-17 08:39:50 +0100 |
---|---|---|
committer | freaj <freaj@riseup.net> | 2015-03-17 08:39:50 +0100 |
commit | 5c2f3e3963bc955563bc53f882d76da2e37fa01c (patch) | |
tree | 0de6dceb92a1d1b7b7e389506b2524c15b9abfd6 | |
parent | 87e90fe1d4913ffad0c4046e8ff9ec899db20e11 (diff) | |
parent | 53c554ed87485a3fac0b8a73dba70f5b0e06218e (diff) | |
download | abslibre-5c2f3e3963bc955563bc53f882d76da2e37fa01c.tar.gz abslibre-5c2f3e3963bc955563bc53f882d76da2e37fa01c.tar.bz2 abslibre-5c2f3e3963bc955563bc53f882d76da2e37fa01c.zip |
Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre
-rw-r--r-- | libre/java8-openjdk/001_adjust-mflags-for-gmake-4.patch | 46 | ||||
-rw-r--r-- | libre/java8-openjdk/002_gcc.make-4.9.patch | 12 | ||||
-rw-r--r-- | libre/java8-openjdk/003_nonreparenting-wm.patch | 39 | ||||
-rw-r--r-- | libre/java8-openjdk/PKGBUILD | 36 | ||||
-rw-r--r-- | libre/java8-openjdk/install_jdk8-openjdk.sh | 4 | ||||
-rw-r--r-- | libre/unzip/PKGBUILD | 10 | ||||
-rw-r--r-- | libre/unzip/cve20149636.patch | 25 | ||||
-rw-r--r-- | libre/unzip/overflow-fsize.patch | 34 | ||||
-rw-r--r-- | libre/xorg-server/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch | 47 | ||||
-rw-r--r-- | libre/xorg-server/PKGBUILD | 12 | ||||
-rw-r--r-- | pcr/font-manager/PKGBUILD | 7 | ||||
-rw-r--r-- | pcr/lostfiles/PKGBUILD | 5 |
12 files changed, 142 insertions, 135 deletions
diff --git a/libre/java8-openjdk/001_adjust-mflags-for-gmake-4.patch b/libre/java8-openjdk/001_adjust-mflags-for-gmake-4.patch deleted file mode 100644 index d998d8aee..000000000 --- a/libre/java8-openjdk/001_adjust-mflags-for-gmake-4.patch +++ /dev/null @@ -1,46 +0,0 @@ - -# HG changeset patch -# User henryjen -# Date 1390363634 28800 -# Node ID e8d4d0db1f06c26defcbf68e6713afab632f3f30 -# Parent c4b78cbea876aa86112cfda16c0026796848d582 -8028407: adjust-mflags.sh failed build with GNU Make 4.0 with -I<path contains j> -Reviewed-by: erikj - -diff -r c4b78cbea876 -r e8d4d0db1f06 make/bsd/makefiles/adjust-mflags.sh ---- a/make/bsd/makefiles/adjust-mflags.sh Thu Dec 05 00:36:42 2013 -0800 -+++ b/make/bsd/makefiles/adjust-mflags.sh Tue Jan 21 20:07:14 2014 -0800 -@@ -64,7 +64,7 @@ - echo "$MFLAGS" \ - | sed ' - s/^-/ -/ -- s/ -\([^ ][^ ]*\)j/ -\1 -j/ -+ s/ -\([^ I][^ I]*\)j/ -\1 -j/ - s/ -j[0-9][0-9]*/ -j/ - s/ -j\([^ ]\)/ -j -\1/ - s/ -j/ -j'${HOTSPOT_BUILD_JOBS:-${default_build_jobs}}'/ -diff -r c4b78cbea876 -r e8d4d0db1f06 make/linux/makefiles/adjust-mflags.sh ---- a/make/linux/makefiles/adjust-mflags.sh Thu Dec 05 00:36:42 2013 -0800 -+++ b/make/linux/makefiles/adjust-mflags.sh Tue Jan 21 20:07:14 2014 -0800 -@@ -64,7 +64,7 @@ - echo "$MFLAGS" \ - | sed ' - s/^-/ -/ -- s/ -\([^ ][^ ]*\)j/ -\1 -j/ -+ s/ -\([^ I][^ I]*\)j/ -\1 -j/ - s/ -j[0-9][0-9]*/ -j/ - s/ -j\([^ ]\)/ -j -\1/ - s/ -j/ -j'${HOTSPOT_BUILD_JOBS:-${default_build_jobs}}'/ -diff -r c4b78cbea876 -r e8d4d0db1f06 make/solaris/makefiles/adjust-mflags.sh ---- a/make/solaris/makefiles/adjust-mflags.sh Thu Dec 05 00:36:42 2013 -0800 -+++ b/make/solaris/makefiles/adjust-mflags.sh Tue Jan 21 20:07:14 2014 -0800 -@@ -64,7 +64,7 @@ - echo "$MFLAGS" \ - | sed ' - s/^-/ -/ -- s/ -\([^ ][^ ]*\)j/ -\1 -j/ -+ s/ -\([^ I][^ I]*\)j/ -\1 -j/ - s/ -j[0-9][0-9]*/ -j/ - s/ -j\([^ ]\)/ -j -\1/ - s/ -j/ -j'${HOTSPOT_BUILD_JOBS:-${default_build_jobs}}'/ - diff --git a/libre/java8-openjdk/002_gcc.make-4.9.patch b/libre/java8-openjdk/002_gcc.make-4.9.patch deleted file mode 100644 index 13715a5d6..000000000 --- a/libre/java8-openjdk/002_gcc.make-4.9.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- old/make/linux/makefiles/gcc.make 2014-04-23 22:07:59.838205838 +0100 -+++ new/make/linux/makefiles/gcc.make 2014-04-23 22:07:59.754204533 +0100 -@@ -266,6 +266,9 @@ - ifeq ($(shell expr $(CC_VER_MAJOR) = 4 \& $(CC_VER_MINOR) = 3), 1) - OPT_CFLAGS/mulnode.o += $(OPT_CFLAGS/NOOPT) - endif -+ ifeq ($(shell expr $(CC_VER_MAJOR) = 4 \& $(CC_VER_MINOR) = 9), 1) -+ OPT_CFLAGS/macroAssembler_x86.o += -fno-devirtualize -+ endif - endif - - # Flags for generating make dependency flags. diff --git a/libre/java8-openjdk/003_nonreparenting-wm.patch b/libre/java8-openjdk/003_nonreparenting-wm.patch deleted file mode 100644 index c7352f2a2..000000000 --- a/libre/java8-openjdk/003_nonreparenting-wm.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- src/solaris/classes/sun/awt/X11/XWM.java 2014-09-06 18:41:39.018530981 -0400 -+++ src/solaris/classes/sun/awt/X11/XWM.java 2014-09-06 18:46:43.098540372 -0400 -@@ -104,7 +104,8 @@ - COMPIZ_WM = 12, - LG3D_WM = 13, - CWM_WM = 14, -- MUTTER_WM = 15; -+ MUTTER_WM = 15, -+ OTHER_NONREPARENTING_WM = 16; - public String toString() { - switch (WMID) { - case NO_WM: -@@ -596,7 +597,7 @@ - } - - static boolean isNonReparentingWM() { -- return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM); -+ return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM); - } - - /* -@@ -786,6 +787,9 @@ - } else if (doIsIceWM && isIceWM()) { - awt_wmgr = XWM.ICE_WM; - } -+ else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { -+ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; -+ } - /* - * We don't check for legacy WM when we already know that WM - * supports WIN or _NET wm spec. -@@ -1332,6 +1336,7 @@ - res = new Insets(28, 6, 6, 6); - break; - case NO_WM: -+ case OTHER_NONREPARENTING_WM: - case LG3D_WM: - res = zeroInsets; - break; diff --git a/libre/java8-openjdk/PKGBUILD b/libre/java8-openjdk/PKGBUILD index bb9a8c147..ddd8732c7 100644 --- a/libre/java8-openjdk/PKGBUILD +++ b/libre/java8-openjdk/PKGBUILD @@ -10,8 +10,8 @@ pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk') pkgbase=java8-openjdk _java_ver=8 -_jdk_update=31 -_jdk_build=13 +_jdk_update=40 +_jdk_build=20 pkgver=${_java_ver}.u${_jdk_update} _repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build} pkgrel=1.parabola1 @@ -28,20 +28,16 @@ source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/archive/${_repo_ver}.tar.gz jaxws-${_repo_ver}.tar.gz::${_url_src}/jaxws/archive/${_repo_ver}.tar.gz jaxp-${_repo_ver}.tar.gz::${_url_src}/jaxp/archive/${_repo_ver}.tar.gz langtools-${_repo_ver}.tar.gz::${_url_src}/langtools/archive/${_repo_ver}.tar.gz - nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz - 001_adjust-mflags-for-gmake-4.patch - 003_nonreparenting-wm.patch) - -sha256sums=('824b28c554ce32edbdaa77cc4f21f8ed57542c74c8748b89cd06be43a1537b34' - '47b07945d3f534e6b87dc273676b8bcb493292e8769667493bb5febfb5c9f347' - '485b1a88b4b44b468e96211de238a5eed80f7472f91977fc27e2f443a8ab8ed3' - 'b3801935199973cc02df02ac2f2587ff0f1989f98af5bf6fe46520a8108c8d6a' - '04bb35fd8b071f65014fa1d3b9816886b88e06548eeda27181993b80efb6a0bf' - '74bb7a376fa706e4283e235caebbcf9736974a6a4cf97b8c8335d389581965e2' - '3e09a644d2fb38970acf78c72bc201c031d43574b5a3f7e00bec1b11bffec9c4' - '2fbdcb016506de4e86db5813c78b28382df5b601f0e73ffd5465c12519b75fd3' - '682104f7723c5c543c47b53f51cc5577e273a12343bd04bebd1bcd70dd72ded9' - '7d3d7ce8661d0f33ff9ad8247f8cfef528c4dff74615e64fa0ac87f4beb78db4') + nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz) + +sha256sums=('1fc7ca0e760af9bab0620049d2e21cde557961101949e54ea74736872295bdde' + '1363462eff9fa2550c803e823695a3f4086380b106dfcff78c456f10c42beb3e' + 'd61a7a2d4d211e068e469ce0894030a2daf9788d66f3994232d5b82c16c9360d' + '2c4fab3a8589f3ac9ea531c7e70d4c0a8e15d995345a90bc5b3b8d8291af3f33' + '6de0d99d6685761c064814855d1e3401e48aadb830a7c68d03b13f0a41e0e950' + 'ad83699c97dec550c532eaf98a8bc049c8fbf80d7211057e76a3c86e5fcc3c0f' + '2fb4444e00ef3d4fe2b9f8f5c4a8618e1fb0f58704c6c07246bafd43f39b41d1' + '39113708d318c070326b5d4543f1bd499bf7e77012f08b67ba0d0313730935ff') case "${CARCH}" in 'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;; @@ -64,14 +60,6 @@ prepare() { do ln -s ../${subrepo}-${_repo_ver} ${subrepo} done - - cd "${srcdir}/jdk8u-${_repo_ver}/hotspot" - # https://bugs.openjdk.java.net/browse/JDK-8028407 - patch -p1 < "${srcdir}/001_adjust-mflags-for-gmake-4.patch" - - cd "${srcdir}/jdk8u-${_repo_ver}/jdk" - # https://bugs.archlinux.org/task/41846 - patch -p0 < "${srcdir}/003_nonreparenting-wm.patch" } build() { diff --git a/libre/java8-openjdk/install_jdk8-openjdk.sh b/libre/java8-openjdk/install_jdk8-openjdk.sh index 148a64b86..57b68f0e3 100644 --- a/libre/java8-openjdk/install_jdk8-openjdk.sh +++ b/libre/java8-openjdk/install_jdk8-openjdk.sh @@ -42,9 +42,9 @@ post_upgrade() { pre_remove() { if [ "x$(fix_default)" = "x${THIS_JDK}" ]; then - sudo /usr/bin/parabola-java unset + /usr/bin/parabola-java unset if [ -x /usr/lib/jvm/${THIS_JDK}/jre/bin/java ]; then - sudo /usr/bin/parabola-java set ${THIS_JDK}/jre + /usr/bin/parabola-java set ${THIS_JDK}/jre fi fi } diff --git a/libre/unzip/PKGBUILD b/libre/unzip/PKGBUILD index 24915ae62..79c081b2e 100644 --- a/libre/unzip/PKGBUILD +++ b/libre/unzip/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 228890 2015-01-10 19:27:10Z bisson $ +# $Id: PKGBUILD 233850 2015-03-15 04:53:48Z bisson $ # Maintainer (Arch): Gaetan Bisson <bisson@archlinux.org> # Contributor (Arch): Douglas Soares de Andrade <douglas@archlinux.org> # Contributor (Arch): Robson Peixoto @@ -7,7 +7,7 @@ _pkgname=unzip-libre pkgname=unzip pkgver=6.0 _pkgver=${pkgver/./} -pkgrel=9.parabola1 +pkgrel=10.parabola1 pkgdesc='For extracting and viewing files in .zip archives' url='http://www.info-zip.org/UnZip.html' arch=('i686' 'x86_64' 'mips64el') @@ -18,12 +18,16 @@ replaces=("${_pkgname}") mksource=("http://downloads.sourceforge.net/infozip/${pkgname}${_pkgver}.tar.gz" 'match.patch') source=("https://repo.parabola.nu/other/${_pkgname}/${pkgname}${_pkgver}-libre.tar.gz" + 'overflow-fsize.patch' + 'cve20149636.patch' 'test_compr_eb.patch' 'getZip64Data.patch' 'crc32.patch') mksha1sums=('abf7de8a4018a983590ed6f5cbd990d4740f8a22' '63bb2bb8483088d5975ce17443dd31b0362c08c9') sha1sums=('80808a3b520f8b73ee3a4dc4b5c29411cba43aa2' + '2852ce1a9db8d646516f8828436a44d34785a0b3' + 'e8c0bc17c63eeed97ad62b86845d75c849bcf4f8' '614c3e7fa7d6da7c60ea2aa79e36f4cbd17c3824' '691d0751bf0bc98cf9f9889dee39baccabefdc4d' '82c9fe9172779a0ee92a187d544e74e8f512b013') @@ -38,6 +42,8 @@ mksource() { prepare() { cd "${srcdir}/${pkgname}${_pkgver}" sed -i "/MANDIR =/s#)/#)/share/#" unix/Makefile + patch -p1 -i ../overflow-fsize.patch # FS#44171 + patch -p1 -i ../cve20149636.patch # FS#44171 patch -i ../test_compr_eb.patch # FS#43391 patch -i ../getZip64Data.patch # FS#43300 patch -i ../crc32.patch # FS#43300 diff --git a/libre/unzip/cve20149636.patch b/libre/unzip/cve20149636.patch new file mode 100644 index 000000000..228c28377 --- /dev/null +++ b/libre/unzip/cve20149636.patch @@ -0,0 +1,25 @@ +diff --git a/extract.c b/extract.c +index a0a4929..9ef80b3 100644 +--- a/extract.c ++++ b/extract.c +@@ -2214,6 +2214,7 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata) + ulg eb_ucsize; + uch *eb_ucptr; + int r; ++ ush method; + + if (compr_offset < 4) /* field is not compressed: */ + return PK_OK; /* do nothing and signal OK */ +@@ -2223,6 +2224,12 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata) + eb_size <= (compr_offset + EB_CMPRHEADLEN))) + return IZ_EF_TRUNC; /* no compressed data! */ + ++ method = makeword(eb + (EB_HEADSIZE + compr_offset)); ++ if ((method == STORED) && (eb_size != compr_offset + EB_CMPRHEADLEN + eb_ucsize)) ++ return PK_ERR; /* compressed & uncompressed ++ * should match in STORED ++ * method */ ++ + if ( + #ifdef INT_16BIT + (((ulg)(extent)eb_ucsize) != eb_ucsize) || diff --git a/libre/unzip/overflow-fsize.patch b/libre/unzip/overflow-fsize.patch new file mode 100644 index 000000000..910b22d56 --- /dev/null +++ b/libre/unzip/overflow-fsize.patch @@ -0,0 +1,34 @@ +t a/list.c b/list.c +index f7359c3..4c3d703 100644 +--- a/list.c ++++ b/list.c +@@ -97,7 +97,7 @@ int list_files(__G) /* return PK-type error code */ + { + int do_this_file=FALSE, cfactor, error, error_in_archive=PK_COOL; + #ifndef WINDLL +- char sgn, cfactorstr[10]; ++ char sgn, cfactorstr[13]; + int longhdr=(uO.vflag>1); + #endif + int date_format; +@@ -339,7 +339,19 @@ int list_files(__G) /* return PK-type error code */ + G.crec.compression_method == ENHDEFLATED) { + methbuf[5] = dtype[(G.crec.general_purpose_bit_flag>>1) & 3]; + } else if (methnum >= NUM_METHODS) { +- sprintf(&methbuf[4], "%03u", G.crec.compression_method); ++ /* 2013-02-26 SMS. ++ * http://sourceforge.net/tracker/?func=detail ++ * &aid=2861648&group_id=118012&atid=679786 ++ * Unexpectedly large compression methods overflow ++ * &methbuf[]. Use the old, three-digit decimal format ++ * for values which fit. Otherwise, sacrifice the ++ * colon, and use four-digit hexadecimal. ++ */ ++ if (G.crec.compression_method <= 999) { ++ sprintf( &methbuf[ 4], "%03u", G.crec.compression_method); ++ } else { ++ sprintf( &methbuf[ 3], "%04X", G.crec.compression_method); ++ } + } + + #if 0 /* GRR/Euro: add this? */ diff --git a/libre/xorg-server/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch b/libre/xorg-server/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch new file mode 100644 index 000000000..75e5bb92f --- /dev/null +++ b/libre/xorg-server/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch @@ -0,0 +1,47 @@ +From 0a78b599b34cc8b5fe6fe82f90e90234e8ab7a56 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch> +Date: Sat, 7 Feb 2015 18:13:21 +0100 +Subject: [PATCH] int10: Fix error check for pci_device_map_legacy +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +pci_device_map_legacy returns 0 on success. + +Signed-off-by: Jürg Billeter <j@bitron.ch> +Reviewed-by: Adam Jackson <ajax@redhat.com> +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +--- + hw/xfree86/int10/generic.c | 2 +- + hw/xfree86/os-support/linux/int10/linux.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c +index 012d194..8d5c4da 100644 +--- a/hw/xfree86/int10/generic.c ++++ b/hw/xfree86/int10/generic.c +@@ -104,7 +104,7 @@ readIntVec(struct pci_device *dev, unsigned char *buf, int len) + { + void *map; + +- if (!pci_device_map_legacy(dev, 0, len, 0, &map)) ++ if (pci_device_map_legacy(dev, 0, len, 0, &map)) + return FALSE; + + memcpy(buf, map, len); +diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c +index 79b9a88..6ca118f 100644 +--- a/hw/xfree86/os-support/linux/int10/linux.c ++++ b/hw/xfree86/os-support/linux/int10/linux.c +@@ -75,7 +75,7 @@ readLegacy(struct pci_device *dev, unsigned char *buf, int base, int len) + { + void *map; + +- if (!pci_device_map_legacy(dev, base, len, 0, &map)) ++ if (pci_device_map_legacy(dev, base, len, 0, &map)) + return FALSE; + + memcpy(buf, map, len); +-- +2.3.2 + diff --git a/libre/xorg-server/PKGBUILD b/libre/xorg-server/PKGBUILD index 1aa74bf6e..0e612b2f1 100644 --- a/libre/xorg-server/PKGBUILD +++ b/libre/xorg-server/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 231799 2015-02-22 13:05:35Z lcarlier $ +# $Id: PKGBUILD 233821 2015-03-14 18:51:11Z lcarlier $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer (Parabola): Márcio Silva <coadde@parabola.nu> @@ -6,7 +6,7 @@ pkgbase=xorg-server pkgname=('xorg-server') pkgver=1.17.1 -pkgrel=3.parabola1 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild +pkgrel=4.parabola1 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://xorg.freedesktop.org" @@ -21,7 +21,8 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig} xvfb-run xvfb-run.1 os-access-fix-regression-in-server-interpreted-auth.patch - v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch) + v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch + 0001-int10-Fix-error-check-for-pci_device_map_legacy.patch) validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C' 'C383B778255613DFDB409D91DB221A6900000011') sha256sums=('2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab' @@ -29,7 +30,8 @@ sha256sums=('2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' '8a9d76eecf8795ca645fb1ce261733965578e953f6606153ce001a0e15d036e8' - 'a73e33644682d9f430db987c192da0f7193907af50539669ebd59614a5ebd0f9') + 'a73e33644682d9f430db987c192da0f7193907af50539669ebd59614a5ebd0f9' + '2ea82cdbd695f21c935710847913ed58e22d3d5c0c18c96175a4a6cc1142c071') prepare() { cd "${pkgbase}-${pkgver}" @@ -37,6 +39,8 @@ prepare() { patch -Np1 -i ../os-access-fix-regression-in-server-interpreted-auth.patch # partially fix FS#43867, not yet upstream patch -Np1 -i ../v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch + # fix FS#43924, merged upstream + patch -Np1 -i ../0001-int10-Fix-error-check-for-pci_device_map_legacy.patch # fix os name: #Build Operating System = OSNAME="--kernel-name --kernel-release --machine" OSVENDOR="" diff --git a/pcr/font-manager/PKGBUILD b/pcr/font-manager/PKGBUILD index 1ba739fc7..fbdda3ff9 100644 --- a/pcr/font-manager/PKGBUILD +++ b/pcr/font-manager/PKGBUILD @@ -2,20 +2,21 @@ # Contributor (Arch): Guan 'kuno' Qing <neokuno(at)gmail(dot)com> # Contributor (Arch): Guten Ye <ywzhaifei(at)gmail(dot)com> # Contributor (Arch): i_magnific0 <i_magnific0(at)yahoo(dot)com> +# Contributor (Arch): Pavlo <pavlofreemen(at)gmail(dot)com> # Maintainer: Esteban Carnevale <alfplayer@mailoo.org> pkgname=font-manager pkgver=0.5.7 -pkgrel=4 +pkgrel=5 pkgdesc="A font management application for the GNOME desktop" url="http://code.google.com/p/font-manager/" -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') license=('GPL') depends=('pygtk>=2.0' 'libxml2' 'fontconfig') optdepends=('file-roller: to import/export font collections to archives' 'gucharmap: to view selected font using GNOME character map application' 'python-reportlab: to create PDF sample sheets') -source=(http://font-manager.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 +source=(http://ftp.de.debian.org/debian/pool/main/f/font-manager/${pkgname}_${pkgver}.orig.tar.bz2 0001-nonexistent_cache.patch 1001-gcc47.patch 2001-paths.patch diff --git a/pcr/lostfiles/PKGBUILD b/pcr/lostfiles/PKGBUILD index 77c408551..b6fe0d9ad 100644 --- a/pcr/lostfiles/PKGBUILD +++ b/pcr/lostfiles/PKGBUILD @@ -2,15 +2,14 @@ # Maintainer: Esteban Carnevale <alfplayer@mailoo.org> pkgname=lostfiles -pkgver=3.10 +pkgver=3.14 pkgrel=1 pkgdesc='Find orphan files - those not owned by any Arch packages.' arch=('any') license=('GPL2') -depends=('bash') url="https://github.com/graysky2/lostfiles" source=("https://github.com/graysky2/$pkgname/archive/v$pkgver.tar.gz") -sha256sums=('52cb37cb1214d9285fbba7dc774f1490eee0d3380d8f4f383406049e37c4fbc8') +sha256sums=('f16ff9c2b74e18f7826a140df2a7b381bf262aa3d3fe564fb1c3900f531a2675') package() { cd "$pkgname-$pkgver" |