Merge branch '2.6' into 2.7

2010-09-14 20:28:39 +02:00 · 2010-09-14 20:28:39 +02:00 · 8f0c7182cc
commit 8f0c7182cc
parent a9db0fe17f 07f9c50325
3 changed files with 5 additions and 6 deletions
--- a/flash-player-plugin/Pkgfile
+++ b/flash-player-plugin/Pkgfile
@ -2,16 +2,15 @@
 # URL: http://www.adobe.com/products/flashplayer/
 # Maintainer: Jose V Beneyto, sepen at crux dot nu
 # Packager: Matt Housh, jaeger at crux dot nu
-# Depends on: rpm2targz
+# Depends on:

 name=flash-player-plugin
 version=10.1.82.76
-release=1
+release=2
 source=(http://fpdownload.macromedia.com/get/flashplayer/current/flash-plugin-$version-release.i386.rpm)

 build() {
-  rpm2targz ${source##*/}
-  tar xvzf $(basename ${source##*/} .rpm).tar.gz
+  bsdtar -xf $PKGMK_SOURCE_DIR/${source##*/} -C $SRC
  install -D -m 0755 usr/lib/flash-plugin/libflashplayer.so \
    $PKG/usr/lib/mozilla/plugins/libflashplayer.so
 }
--- a/samba/.md5sum
+++ b/samba/.md5sum
@ -1,3 +1,3 @@
 448caca4745aef1a842f4fdb1aa62e1e  samba
-22c8c977eaa18be50f3878c6d0e0c2f0  samba-3.5.4.tar.gz
+278728aeeef9db7e27fa6a2ce5b43509  samba-3.5.5.tar.gz
 fbaccda19afc8f75f6f0123cab82c87e  samba-config.patch
--- a/samba/Pkgfile
+++ b/samba/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:  ncurses openssl readline zlib tdb libcap

 name=samba
-version=3.5.4
+version=3.5.5
 release=1
 source=(http://www.samba.org/samba/ftp/stable/$name-$version.tar.gz \
        samba-config.patch samba)