November 2014 - crux-commits

ports/opt (3.1): [notify] php: update to 5.5.19
by crux＠crux.nu 19 Nov '14

19 Nov '14

commit 12490338116820f20fdf76009f4c60895f9c1237 Author: Juergen Daubert <jue(a)jue.li> Date: Wed Nov 19 11:21:00 2014 +0100 [notify] php: update to 5.5.19 update includes a security fix for CVE-2014-3710, see - http://php.net/ChangeLog-5.php#5.5.19 - https://bugs.php.net/bug.php?id=68283 diff --git a/php/.md5sum b/php/.md5sum index 447e6b0..fbd71af 100644 --- a/php/.md5sum +++ b/php/.md5sum @@ -1 +1 @@ -3984f32985842afebe5795457e26931f php-5.5.18.tar.xz +c63dcfd8b318d12127ba6d39ecc8a444 php-5.5.19.tar.xz diff --git a/php/Pkgfile b/php/Pkgfile index 44ff09f..90b9f28 100644 --- a/php/Pkgfile +++ b/php/Pkgfile @@ -4,7 +4,7 @@ # Depends on: readline libpcre libxml2 curl db gdbm xz name=php -version=5.5.18 +version=5.5.19 release=1 source=(http://php.net/distributions/php-$version.tar.xz)

1 0

ports/opt (3.1): mod_php: update to 5.5.19
by crux＠crux.nu 19 Nov '14

19 Nov '14

commit e2094fa175fcfba5491fbfd669c3c075a25a9e51 Author: Juergen Daubert <jue(a)jue.li> Date: Wed Nov 19 11:25:38 2014 +0100 mod_php: update to 5.5.19 diff --git a/mod_php/.md5sum b/mod_php/.md5sum index 447e6b0..fbd71af 100644 --- a/mod_php/.md5sum +++ b/mod_php/.md5sum @@ -1 +1 @@ -3984f32985842afebe5795457e26931f php-5.5.18.tar.xz +c63dcfd8b318d12127ba6d39ecc8a444 php-5.5.19.tar.xz diff --git a/mod_php/Pkgfile b/mod_php/Pkgfile index 200a3db..ccf738f 100644 --- a/mod_php/Pkgfile +++ b/mod_php/Pkgfile @@ -4,7 +4,7 @@ # Depends on: xz apache libxml2 name=mod_php -version=5.5.18 +version=5.5.19 release=1 source=(http://php.net/distributions/php-$version.tar.xz)

1 0

ports/opt (3.0): [notify] ruby: 1.9.3-p550 -> 1.9.3-p551
by crux＠crux.nu 19 Nov '14

19 Nov '14

commit b35681dbd38f54c68bf2466451eb8fd0cc6a21b0 Author: Thomas Penteker <tek(a)serverop.de> Date: Wed Nov 19 09:55:28 2014 +0100 [notify] ruby: 1.9.3-p550 -> 1.9.3-p551 Fixes CVE-2014-8090. https://www.ruby-lang.org/en/news/2014/11/13/ruby-1-9-3-p551-is-released/ diff --git a/ruby/.md5sum b/ruby/.md5sum index f7d2873..564b761 100644 --- a/ruby/.md5sum +++ b/ruby/.md5sum @@ -1,2 +1,2 @@ -c2169c8b14ccefd036081aba5ffa96da ruby-1.9.3-p550.tar.bz2 +0d8b272b05c3449dc848bb7570f65bfe ruby-1.9.3-p551.tar.bz2 ce941d90c1361ce6ab6561bbe3f990fe ruby-arch.patch diff --git a/ruby/Pkgfile b/ruby/Pkgfile index 79e80f2..9744ef8 100644 --- a/ruby/Pkgfile +++ b/ruby/Pkgfile @@ -4,7 +4,7 @@ # Depends on: gdbm ncurses openssl readline zlib libffi libyaml name=ruby -version=1.9.3-p550 +version=1.9.3-p551 release=1 source=(ftp://ftp.ruby-lang.org/pub/$name/1.9/$name-$version.tar.bz2 \ $name-arch.patch)

1 0

ports/opt (3.1): openntpd: Improved init script
by crux＠crux.nu 19 Nov '14

19 Nov '14

commit 8370e0eac7f2e094c8bbf872678c4587ae43c888 Author: Alan Mizrahi <alan+crux(a)mizrahi.com.ve> Date: Wed Nov 19 11:14:36 2014 +0900 openntpd: Improved init script diff --git a/openntpd/.md5sum b/openntpd/.md5sum index fe455d1..1225415 100644 --- a/openntpd/.md5sum +++ b/openntpd/.md5sum @@ -1,3 +1,3 @@ 1edcbbfaed3be43cea078c9b863865e6 linux-adjtimex.patch -6e76cfac0e9fb9bb727c49a98dcf898b ntpd +8e42b6b3709b17ba8b56cb6b1be01543 ntpd afc34175f38d08867c1403d9008600b3 openntpd-3.9p1.tar.gz diff --git a/openntpd/Pkgfile b/openntpd/Pkgfile index 1a920fb..63666c8 100644 --- a/openntpd/Pkgfile +++ b/openntpd/Pkgfile @@ -5,7 +5,7 @@ name=openntpd version=3.9p1 -release=3 +release=4 source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/$name-$version.tar.gz \ ntpd \ linux-adjtimex.patch ) diff --git a/openntpd/ntpd b/openntpd/ntpd index 9061d26..26e6850 100644 --- a/openntpd/ntpd +++ b/openntpd/ntpd @@ -1,23 +1,77 @@ -#!/bin/sh -# -# /etc/rc.d/ntpd: start/stop ntpd daemon -# +#!/bin/bash + +NAME=ntpd +USER=root +CONFIG= +RUNDIR=/var/run +PIDFILE= +STARTCMD="/usr/sbin/ntpd -s" +STOPCMD= +STOPTIMEOUT=120 + +function getpid() { + if [ -z "$PIDFILE" ]; then + pid="$(pgrep -xfn "$STARTCMD")" + else + if [ -f "$PIDFILE" ]; then + pid=$(< $PIDFILE) + if [ ! -d /proc/"$pid" ]; then + echo "$NAME: removing stale pidfile $PIDFILE" >&2 + rm -f "$PIDFILE" + unset pid + fi + fi + fi + echo "$pid" +} case $1 in - start) - /usr/sbin/ntpd -s +start) + pid=$(getpid) + install -d -m 755 -o $USER $RUNDIR || exit 1 + if [ -n "$pid" ]; then + echo "$NAME already running with pid $pid" >&2 + exit 1 + fi + eval "$STARTCMD" ;; - stop) - killall -q /usr/sbin/ntpd +stop) + pid=$(getpid) + if [ -n "$pid" ]; then + if [ -n "$STOPCMD" ]; then + eval "$STOPCMD" + else + kill "$pid" + fi + t=$(printf '%(%s)T' -1) + tend=$((t+STOPTIMEOUT)) + while [ -d /proc/$pid -a $t -lt $tend ]; do + sleep 0.5 + t=$(printf '%(%s)T' -1) + done + if [ -d /proc/"$pid" ]; then + echo "$NAME still running with pid $pid" >&2 + else + [ -n "$PIDFILE" ] && rm -f "$PIDFILE" + fi + else + echo "$NAME is not running" >&2 + fi ;; - restart) +restart) $0 stop - sleep 2 $0 start ;; - *) - echo "usage: $0 [start|stop|restart]" +status) + pid=$(getpid) + if [ -n "$pid" ]; then + echo "$NAME is running with pid $pid" + else + echo "$NAME is not running" + fi + ;; +*) + echo "usage: $0 [start|stop|restart|status]" ;; esac -# End of file

1 0

ports/contrib (3.1): xscreensaver: 5.29 -> 5.31
by crux＠crux.nu 19 Nov '14

19 Nov '14

commit 77c9a587ea538d086224d28b7639bcc1dafda3cd Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Wed Nov 19 12:42:44 2014 +1100 xscreensaver: 5.29 -> 5.31 diff --git a/xscreensaver/.footprint b/xscreensaver/.footprint index 8b4a216..ff243f5 100644 --- a/xscreensaver/.footprint +++ b/xscreensaver/.footprint @@ -26,6 +26,7 @@ drwxr-xr-x root/root usr/lib/xscreensaver/ -rwxr-xr-x root/root usr/lib/xscreensaver/attraction -rwxr-xr-x root/root usr/lib/xscreensaver/atunnel -rwxr-xr-x root/root usr/lib/xscreensaver/barcode +-rwxr-xr-x root/root usr/lib/xscreensaver/binaryring -rwxr-xr-x root/root usr/lib/xscreensaver/blaster -rwxr-xr-x root/root usr/lib/xscreensaver/blinkbox -rwxr-xr-x root/root usr/lib/xscreensaver/blitspin @@ -44,6 +45,7 @@ drwxr-xr-x root/root usr/lib/xscreensaver/ -rwxr-xr-x root/root usr/lib/xscreensaver/ccurve -rwxr-xr-x root/root usr/lib/xscreensaver/celtic -rwxr-xr-x root/root usr/lib/xscreensaver/circuit +-rwxr-xr-x root/root usr/lib/xscreensaver/cityflow -rwxr-xr-x root/root usr/lib/xscreensaver/cloudlife -rwxr-xr-x root/root usr/lib/xscreensaver/companioncube -rwxr-xr-x root/root usr/lib/xscreensaver/compass @@ -85,6 +87,7 @@ drwxr-xr-x root/root usr/lib/xscreensaver/ -rwxr-xr-x root/root usr/lib/xscreensaver/galaxy -rwxr-xr-x root/root usr/lib/xscreensaver/gears -rwxr-xr-x root/root usr/lib/xscreensaver/geodesic +-rwxr-xr-x root/root usr/lib/xscreensaver/geodesicgears -rwxr-xr-x root/root usr/lib/xscreensaver/gflux -rwxr-xr-x root/root usr/lib/xscreensaver/glblur -rwxr-xr-x root/root usr/lib/xscreensaver/glcells @@ -212,6 +215,7 @@ drwxr-xr-x root/root usr/lib/xscreensaver/ -rwxr-xr-x root/root usr/lib/xscreensaver/webcollage -rwxr-xr-x root/root usr/lib/xscreensaver/webcollage-helper -rwxr-xr-x root/root usr/lib/xscreensaver/whirlwindwarp +-rwxr-xr-x root/root usr/lib/xscreensaver/winduprobot -rwxr-xr-x root/root usr/lib/xscreensaver/wormhole -rwxr-xr-x root/root usr/lib/xscreensaver/xanalogtv -rwxr-xr-x root/root usr/lib/xscreensaver/xflame @@ -243,6 +247,7 @@ drwxr-xr-x root/root usr/man/man6/ -rw-r--r-- root/root usr/man/man6/attraction.6.gz -rw-r--r-- root/root usr/man/man6/atunnel.6.gz -rw-r--r-- root/root usr/man/man6/barcode.6.gz +-rw-r--r-- root/root usr/man/man6/binaryring.6.gz -rw-r--r-- root/root usr/man/man6/blaster.6.gz -rw-r--r-- root/root usr/man/man6/blinkbox.6.gz -rw-r--r-- root/root usr/man/man6/blitspin.6.gz @@ -261,6 +266,7 @@ drwxr-xr-x root/root usr/man/man6/ -rw-r--r-- root/root usr/man/man6/ccurve.6.gz -rw-r--r-- root/root usr/man/man6/celtic.6.gz -rw-r--r-- root/root usr/man/man6/circuit.6.gz +-rw-r--r-- root/root usr/man/man6/cityflow.6.gz -rw-r--r-- root/root usr/man/man6/cloudlife.6.gz -rw-r--r-- root/root usr/man/man6/companioncube.6.gz -rw-r--r-- root/root usr/man/man6/compass.6.gz @@ -303,6 +309,7 @@ drwxr-xr-x root/root usr/man/man6/ -rw-r--r-- root/root usr/man/man6/galaxy.6.gz -rw-r--r-- root/root usr/man/man6/gears.6.gz -rw-r--r-- root/root usr/man/man6/geodesic.6.gz +-rw-r--r-- root/root usr/man/man6/geodesicgears.6.gz -rw-r--r-- root/root usr/man/man6/gflux.6.gz -rw-r--r-- root/root usr/man/man6/glblur.6.gz -rw-r--r-- root/root usr/man/man6/glcells.6.gz @@ -427,6 +434,7 @@ drwxr-xr-x root/root usr/man/man6/ -rw-r--r-- root/root usr/man/man6/wander.6.gz -rw-r--r-- root/root usr/man/man6/webcollage.6.gz -rw-r--r-- root/root usr/man/man6/whirlwindwarp.6.gz +-rw-r--r-- root/root usr/man/man6/winduprobot.6.gz -rw-r--r-- root/root usr/man/man6/wormhole.6.gz -rw-r--r-- root/root usr/man/man6/xanalogtv.6.gz -rw-r--r-- root/root usr/man/man6/xflame.6.gz @@ -457,6 +465,7 @@ drwxr-xr-x root/root usr/share/xscreensaver/config/ -rw-r--r-- root/root usr/share/xscreensaver/config/attraction.xml -rw-r--r-- root/root usr/share/xscreensaver/config/atunnel.xml -rw-r--r-- root/root usr/share/xscreensaver/config/barcode.xml +-rw-r--r-- root/root usr/share/xscreensaver/config/binaryring.xml -rw-r--r-- root/root usr/share/xscreensaver/config/blaster.xml -rw-r--r-- root/root usr/share/xscreensaver/config/blinkbox.xml -rw-r--r-- root/root usr/share/xscreensaver/config/blitspin.xml @@ -475,6 +484,7 @@ drwxr-xr-x root/root usr/share/xscreensaver/config/ -rw-r--r-- root/root usr/share/xscreensaver/config/ccurve.xml -rw-r--r-- root/root usr/share/xscreensaver/config/celtic.xml -rw-r--r-- root/root usr/share/xscreensaver/config/circuit.xml +-rw-r--r-- root/root usr/share/xscreensaver/config/cityflow.xml -rw-r--r-- root/root usr/share/xscreensaver/config/cloudlife.xml -rw-r--r-- root/root usr/share/xscreensaver/config/companioncube.xml -rw-r--r-- root/root usr/share/xscreensaver/config/compass.xml @@ -516,6 +526,7 @@ drwxr-xr-x root/root usr/share/xscreensaver/config/ -rw-r--r-- root/root usr/share/xscreensaver/config/galaxy.xml -rw-r--r-- root/root usr/share/xscreensaver/config/gears.xml -rw-r--r-- root/root usr/share/xscreensaver/config/geodesic.xml +-rw-r--r-- root/root usr/share/xscreensaver/config/geodesicgears.xml -rw-r--r-- root/root usr/share/xscreensaver/config/gflux.xml -rw-r--r-- root/root usr/share/xscreensaver/config/glblur.xml -rw-r--r-- root/root usr/share/xscreensaver/config/glcells.xml @@ -641,6 +652,7 @@ drwxr-xr-x root/root usr/share/xscreensaver/config/ -rw-r--r-- root/root usr/share/xscreensaver/config/wander.xml -rw-r--r-- root/root usr/share/xscreensaver/config/webcollage.xml -rw-r--r-- root/root usr/share/xscreensaver/config/whirlwindwarp.xml +-rw-r--r-- root/root usr/share/xscreensaver/config/winduprobot.xml -rw-r--r-- root/root usr/share/xscreensaver/config/wormhole.xml -rw-r--r-- root/root usr/share/xscreensaver/config/xanalogtv.xml -rw-r--r-- root/root usr/share/xscreensaver/config/xflame.xml diff --git a/xscreensaver/.md5sum b/xscreensaver/.md5sum index 763f3ad..88479b9 100644 --- a/xscreensaver/.md5sum +++ b/xscreensaver/.md5sum @@ -1 +1,2 @@ -14f9104fa03f85371f885bdad956764d xscreensaver-5.29.tar.gz +effb80cc6bbcc9b3b82fdcc21640de59 xscreensaver-5.31-1001-binaryring.c-include-stdint.patch +edad550c27660f2018927eaf3ca3999c xscreensaver-5.31.tar.gz diff --git a/xscreensaver/Pkgfile b/xscreensaver/Pkgfile index 0c7c0eb..2b8324e 100644 --- a/xscreensaver/Pkgfile +++ b/xscreensaver/Pkgfile @@ -5,12 +5,15 @@ # Depends on: bc fortune libglade giflib intltool netpbm xorg-libxmu glu name=xscreensaver -version=5.29 +version=5.31 release=1 -source=(http://www.jwz.org/$name/$name-$version.tar.gz) +source=(http://www.jwz.org/$name/$name-$version.tar.gz + xscreensaver-5.31-1001-binaryring.c-include-stdint.patch) build() { cd $name-$version + + patch -p1 -i $SRC/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch sed -i configure \ -e 's/USE_NLS=yes/USE_NLS=no/' \ diff --git a/xscreensaver/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch b/xscreensaver/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch new file mode 100644 index 0000000..13f1f01 --- /dev/null +++ b/xscreensaver/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch @@ -0,0 +1,36 @@ +From 3b9f847b4692d34f966af368a63d03887be11a79 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA <mtasaka(a)fedoraproject.org> +Date: Sun, 16 Nov 2014 16:55:48 +0900 +Subject: [PATCH] binaryring.c: include stdint +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +On Fedora 21, binaryring.c fails to compile as: + +../../hacks/binaryring.c:40:9: error: unknown type name ‘uint32_t’ + typedef uint32_t pixel_t; + ^ +Makefile:542: recipe for target 'binaryring.o' failed + +Just include stdint.h for this type. +--- + hacks/binaryring.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/hacks/binaryring.c b/hacks/binaryring.c +index 2432073..e3a58d9 100644 +--- a/hacks/binaryring.c ++++ b/hacks/binaryring.c +@@ -27,6 +27,8 @@ + #include "colors.h" + #include "hsv.h" + ++#include <stdint.h> ++ + #define ANTIALIAS 1 + #define BLACK 0 + #define WHITE 1 +-- +2.1.0 +

1 0

ports/contrib (3.1): tor: 0.2.4.24 -> 0.2.4.25
by crux＠crux.nu 18 Nov '14

18 Nov '14

commit a7bbc8cd5a145231d7068b0058048f205fe5cc53 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Tue Nov 18 12:57:43 2014 +1100 tor: 0.2.4.24 -> 0.2.4.25 diff --git a/tor/.md5sum b/tor/.md5sum index cb80da2..5702402 100644 --- a/tor/.md5sum +++ b/tor/.md5sum @@ -1,3 +1,3 @@ -9acb86b529f0f48cc495da3801f85d1f tor-0.2.4.24.tar.gz +454744ebff5033ae353f2dd6b1bc425e tor-0.2.4.25.tar.gz 53f221aeaaaede055c810cd1858b294c tor-config.patch 7c7044055ada4eb8e65513763401739b tor.rc diff --git a/tor/Pkgfile b/tor/Pkgfile index 345e0b0..7ffa28a 100644 --- a/tor/Pkgfile +++ b/tor/Pkgfile @@ -5,7 +5,7 @@ # Depends on: libevent openssl zlib name=tor -version=0.2.4.24 +version=0.2.4.25 release=1 source=(https://www.torproject.org/dist/tor-$version.tar.gz tor.rc tor-config.patch)

1 0

ports/opt (3.1): gimp: trim .footprint
by crux＠crux.nu 16 Nov '14

16 Nov '14

commit ee93490efaa8a8f8526a8ab44c55a947e59157d6 Author: Thomas Penteker <tek(a)serverop.de> Date: Sun Nov 16 19:28:58 2014 +0100 gimp: trim .footprint diff --git a/gimp/.footprint b/gimp/.footprint index 6d70b4d..69f55e3 100644 --- a/gimp/.footprint +++ b/gimp/.footprint @@ -343,7 +343,6 @@ drwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/ -rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-pix -rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-png -rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-pnm --rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-ps -rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-psd-load -rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-psd-save -rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-psp @@ -482,7 +481,6 @@ drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/gimp-2.8.1.gz lrwxrwxrwx root/root usr/man/man1/gimp-console-2.8.1.gz -> gimp-2.8.1.gz -lrwxrwxrwx root/root usr/man/man1/gimp-console.1.gz -> gimp-console-2.8.1.gz lrwxrwxrwx root/root usr/man/man1/gimp.1.gz -> gimp-2.8.1.gz -rw-r--r-- root/root usr/man/man1/gimptool-2.0.1.gz drwxr-xr-x root/root usr/man/man5/

1 0

ports/contrib (3.1): libreoffice: 4.2.6 -> 4.2.7
by crux＠crux.nu 16 Nov '14

16 Nov '14

commit 8259e844904787dbc019e53b64890afee5a38ce7 Author: Thomas Penteker <tek(a)serverop.de> Date: Sun Nov 16 18:38:49 2014 +0100 libreoffice: 4.2.6 -> 4.2.7 diff --git a/libreoffice/.md5sum b/libreoffice/.md5sum index 742c572..7d5d96d 100644 --- a/libreoffice/.md5sum +++ b/libreoffice/.md5sum @@ -1 +1 @@ -25d23958e8253182583e1af0ab9d1f5c LibreOffice_4.2.6-secfix_Linux_x86-64_rpm.tar.gz +ea0c0eca0613850493043573e04a9ca8 LibreOffice_4.2.7_Linux_x86-64_rpm.tar.gz diff --git a/libreoffice/Pkgfile b/libreoffice/Pkgfile index dda893b..47914c7 100644 --- a/libreoffice/Pkgfile +++ b/libreoffice/Pkgfile @@ -5,9 +5,10 @@ # Depends on: mesa3d cups xorg-libxaw xorg-libxcursor xorg-libxft xorg-libxinerama xorg-libxi xorg-libxrandr dbus-glib name=libreoffice -version=4.2.6 +version=4.2.7 release=1 -source=(http://download.documentfoundation.org/$name/stable/$version/rpm/x86_64/LibreOffice_${version}-secfix_Linux_x86-64_rpm.tar.gz) +source=(http://download.documentfoundation.org/$name/stable/$version/rpm/x86_64/LibreOffice_${version}_Linux_x86-64_rpm.tar.gz) + build() { local workd="$SRC/tmp_work"

1 0

ports/opt (3.1): nettle: disabled documentation
by crux＠crux.nu 15 Nov '14

15 Nov '14

commit fc2d2549709da63ab30740bb472c0fc45b0680a5 Author: Jose V Beneyto <sepen(a)crux.nu> Date: Thu Nov 13 03:33:43 2014 +0100 nettle: disabled documentation diff --git a/nettle/Pkgfile b/nettle/Pkgfile index a18c7a4..725a783 100644 --- a/nettle/Pkgfile +++ b/nettle/Pkgfile @@ -6,14 +6,15 @@ name=nettle version=2.7.1 -release=1 +release=2 source=(ftp://ftp.gnu.org/gnu/$name/$name-$version.tar.gz) build() { cd $name-$version ./configure --prefix=/usr \ - --libdir=/usr/lib + --libdir=/usr/lib \ + --disable-documentation make make DESTDIR=$PKG install

1 0

ports/opt (3.1): jdk: fixed source file
by crux＠crux.nu 15 Nov '14

15 Nov '14

commit 951ae11daf55200bd283d23ab86ce32118c838dc Author: Jose V Beneyto <sepen(a)crux.nu> Date: Thu Nov 13 02:13:38 2014 +0100 jdk: fixed source file diff --git a/jdk/.md5sum b/jdk/.md5sum index ce946f5..e3d19a1 100644 --- a/jdk/.md5sum +++ b/jdk/.md5sum @@ -1 +1 @@ -cfa44b49e50ea06e5c6ab95ff79e5b2a jdk-7u72-linux-x64.gz +cfa44b49e50ea06e5c6ab95ff79e5b2a jdk-7u72-linux-x64.tar.gz diff --git a/jdk/Pkgfile b/jdk/Pkgfile index 374e790..cd79c20 100644 --- a/jdk/Pkgfile +++ b/jdk/Pkgfile @@ -6,14 +6,7 @@ name=jdk version=1.7.0_72 release=1 -source=(file:///$name-7u${version##*_}-linux-x64.gz) - -unpack_source() { - LOCAL_FILENAME=$(get_filename $source) - COMMAND="bsdtar -p -o -C $SRC -xf $LOCAL_FILENAME" - echo "$COMMAND" - $COMMAND -} +source=(file:///$name-7u${version##*_}-linux-x64.tar.gz) build(){ rm -rf $SRC/jdk*/{man/ja,jre/lib/{locale,deploy/messages_},db/lib/derbyLocale*}*

1 0