From ade9c8a829d805ea2068164f34a9e38c6502a03e Mon Sep 17 00:00:00 2001 From: Fredrik Rinnestam Date: Thu, 3 Jul 2014 18:44:27 +0200 Subject: [PATCH 1/4] [notify] dbus: updated to 1.6.22. Fixes CVE-2014-3532, CVE-2014-3533 --- dbus/.footprint | 6 +++--- dbus/.md5sum | 2 +- dbus/Pkgfile | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dbus/.footprint b/dbus/.footprint index b863adc54..cf134ae91 100644 --- a/dbus/.footprint +++ b/dbus/.footprint @@ -46,9 +46,9 @@ drwxr-xr-x root/root usr/lib/dbus-1.0/include/dbus/ drwxr-xr-x root/root usr/lib/dbus/ -rwsr-x--- root/messagebus usr/lib/dbus/dbus-daemon-launch-helper -rwxr-xr-x root/root usr/lib/libdbus-1.la -lrwxrwxrwx root/root usr/lib/libdbus-1.so -> libdbus-1.so.3.7.7 -lrwxrwxrwx root/root usr/lib/libdbus-1.so.3 -> libdbus-1.so.3.7.7 --rwxr-xr-x root/root usr/lib/libdbus-1.so.3.7.7 +lrwxrwxrwx root/root usr/lib/libdbus-1.so -> libdbus-1.so.3.7.8 +lrwxrwxrwx root/root usr/lib/libdbus-1.so.3 -> libdbus-1.so.3.7.8 +-rwxr-xr-x root/root usr/lib/libdbus-1.so.3.7.8 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/dbus-1.pc drwxr-xr-x root/root usr/man/ diff --git a/dbus/.md5sum b/dbus/.md5sum index 6da750408..f0c44478b 100644 --- a/dbus/.md5sum +++ b/dbus/.md5sum @@ -1,3 +1,3 @@ 23bc5ff22fe4f9a208d65fbbfd489ad9 30-dbus.launch -16aacf0addca0b4ff8ed0dd3d36dc6f5 dbus-1.6.20.tar.gz +5e50717d0f355c33debe1e8ed6805655 dbus-1.6.22.tar.gz dd882e45b9397a5dbf8650057ee9a340 rc.dbus diff --git a/dbus/Pkgfile b/dbus/Pkgfile index d9e7affee..51c0b1fc9 100644 --- a/dbus/Pkgfile +++ b/dbus/Pkgfile @@ -5,7 +5,7 @@ # Depends on: expat name=dbus -version=1.6.20 +version=1.6.22 release=1 source=(http://dbus.freedesktop.org/releases/dbus/$name-$version.tar.gz \ rc.dbus 30-dbus.launch) From 657c773fc28faa96448f0c5ffbfc2374817a470b Mon Sep 17 00:00:00 2001 From: Juergen Daubert Date: Fri, 4 Jul 2014 09:38:47 +0200 Subject: [PATCH 2/4] scite: update to 3.4.4 --- scite/.md5sum | 2 +- scite/Pkgfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scite/.md5sum b/scite/.md5sum index b3c0d6457..40e8a4a7b 100644 --- a/scite/.md5sum +++ b/scite/.md5sum @@ -1 +1 @@ -1bb135672e9867f1781516764bda254a scite342.tgz +b2da4a9ba397968a4563998397497a5a scite344.tgz diff --git a/scite/Pkgfile b/scite/Pkgfile index 06c48ac47..40224144b 100644 --- a/scite/Pkgfile +++ b/scite/Pkgfile @@ -4,7 +4,7 @@ # Depends on: gtk name=scite -version=3.4.2 +version=3.4.4 release=1 source=(http://downloads.sourceforge.net/project/scintilla/SciTE/$version/$name${version//./}.tgz) From f0e0da4f789a10292d31ac0bf6ccc6ee6bff4145 Mon Sep 17 00:00:00 2001 From: Juergen Daubert Date: Fri, 4 Jul 2014 09:39:08 +0200 Subject: [PATCH 3/4] python: update to 2.7.8 --- python/.footprint | 30 +++++++++++++++++++++++++++--- python/.md5sum | 2 +- python/Pkgfile | 2 +- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/python/.footprint b/python/.footprint index 71b663e91..c6285a218 100644 --- a/python/.footprint +++ b/python/.footprint @@ -1294,6 +1294,12 @@ drwxr-xr-x root/root usr/lib/python2.7/idlelib/idle_test/ -rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/mock_tk.py -rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/mock_tk.pyc -rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/mock_tk.pyo +-rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_autocomplete.py +-rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_autocomplete.pyc +-rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_autocomplete.pyo +-rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_autoexpand.py +-rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_autoexpand.pyc +-rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_autoexpand.pyo -rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_calltips.py -rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_calltips.pyc -rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_calltips.pyo @@ -1309,9 +1315,15 @@ drwxr-xr-x root/root usr/lib/python2.7/idlelib/idle_test/ -rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_grep.py -rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_grep.pyc -rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_grep.pyo +-rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_hyperparser.py +-rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_hyperparser.pyc +-rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_hyperparser.pyo -rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_idlehistory.py -rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_idlehistory.pyc -rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_idlehistory.pyo +-rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_parenmatch.py +-rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_parenmatch.pyc +-rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_parenmatch.pyo -rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_pathbrowser.py -rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_pathbrowser.pyc -rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_pathbrowser.pyo @@ -1324,6 +1336,9 @@ drwxr-xr-x root/root usr/lib/python2.7/idlelib/idle_test/ -rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_text.py -rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_text.pyc -rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_text.pyo +-rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_textview.py +-rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_textview.pyc +-rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_textview.pyo -rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_warning.py -rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_warning.pyc -rw-r--r-- root/root usr/lib/python2.7/idlelib/idle_test/test_warning.pyo @@ -1393,7 +1408,7 @@ drwxr-xr-x root/root usr/lib/python2.7/json/ -rw-r--r-- root/root usr/lib/python2.7/keyword.pyc -rw-r--r-- root/root usr/lib/python2.7/keyword.pyo drwxr-xr-x root/root usr/lib/python2.7/lib-dynload/ --rw-r--r-- root/root usr/lib/python2.7/lib-dynload/Python-2.7.7-py2.7.egg-info +-rw-r--r-- root/root usr/lib/python2.7/lib-dynload/Python-2.7.8-py2.7.egg-info -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/_bisect.so -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/_bsddb.so -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/_codecs_cn.so @@ -1498,6 +1513,12 @@ drwxr-xr-x root/root usr/lib/python2.7/lib-tk/test/test_tkinter/ -rw-r--r-- root/root usr/lib/python2.7/lib-tk/test/test_tkinter/__init__.py (EMPTY) -rw-r--r-- root/root usr/lib/python2.7/lib-tk/test/test_tkinter/__init__.pyc -rw-r--r-- root/root usr/lib/python2.7/lib-tk/test/test_tkinter/__init__.pyo +-rw-r--r-- root/root usr/lib/python2.7/lib-tk/test/test_tkinter/test_geometry_managers.py +-rw-r--r-- root/root usr/lib/python2.7/lib-tk/test/test_tkinter/test_geometry_managers.pyc +-rw-r--r-- root/root usr/lib/python2.7/lib-tk/test/test_tkinter/test_geometry_managers.pyo +-rw-r--r-- root/root usr/lib/python2.7/lib-tk/test/test_tkinter/test_images.py +-rw-r--r-- root/root usr/lib/python2.7/lib-tk/test/test_tkinter/test_images.pyc +-rw-r--r-- root/root usr/lib/python2.7/lib-tk/test/test_tkinter/test_images.pyo -rw-r--r-- root/root usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.py -rw-r--r-- root/root usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.pyc -rw-r--r-- root/root usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.pyo @@ -1558,9 +1579,9 @@ drwxr-xr-x root/root usr/lib/python2.7/lib-tk/test/test_ttk/ -rw-r--r-- root/root usr/lib/python2.7/lib-tk/turtle.pyo drwxr-xr-x root/root usr/lib/python2.7/lib2to3/ -rw-r--r-- root/root usr/lib/python2.7/lib2to3/Grammar.txt --rw-r--r-- root/root usr/lib/python2.7/lib2to3/Grammar2.7.7.final.0.pickle +-rw-r--r-- root/root usr/lib/python2.7/lib2to3/Grammar2.7.8.final.0.pickle -rw-r--r-- root/root usr/lib/python2.7/lib2to3/PatternGrammar.txt --rw-r--r-- root/root usr/lib/python2.7/lib2to3/PatternGrammar2.7.7.final.0.pickle +-rw-r--r-- root/root usr/lib/python2.7/lib2to3/PatternGrammar2.7.8.final.0.pickle -rw-r--r-- root/root usr/lib/python2.7/lib2to3/__init__.py -rw-r--r-- root/root usr/lib/python2.7/lib2to3/__init__.pyc -rw-r--r-- root/root usr/lib/python2.7/lib2to3/__init__.pyo @@ -3398,6 +3419,9 @@ drwxr-xr-x root/root usr/lib/python2.7/test/subprocessdata/ -rw-r--r-- root/root usr/lib/python2.7/test/test_sort.py -rw-r--r-- root/root usr/lib/python2.7/test/test_sort.pyc -rw-r--r-- root/root usr/lib/python2.7/test/test_sort.pyo +-rw-r--r-- root/root usr/lib/python2.7/test/test_spwd.py +-rw-r--r-- root/root usr/lib/python2.7/test/test_spwd.pyc +-rw-r--r-- root/root usr/lib/python2.7/test/test_spwd.pyo -rw-r--r-- root/root usr/lib/python2.7/test/test_sqlite.py -rw-r--r-- root/root usr/lib/python2.7/test/test_sqlite.pyc -rw-r--r-- root/root usr/lib/python2.7/test/test_sqlite.pyo diff --git a/python/.md5sum b/python/.md5sum index 84d91fcaa..a773e880a 100644 --- a/python/.md5sum +++ b/python/.md5sum @@ -1,2 +1,2 @@ -41f7348b348e3f72fcfb4f4d76701352 Python-2.7.7.tar.xz +d235bdfa75b8396942e360a70487ee00 Python-2.7.8.tar.xz 387d5f6d00d2be01ecb87216cac0f88c pyconfig.h diff --git a/python/Pkgfile b/python/Pkgfile index 25695cc33..2b9d5b486 100644 --- a/python/Pkgfile +++ b/python/Pkgfile @@ -4,7 +4,7 @@ # Depends on: db gdbm openssl bzip2 zlib sqlite3 name=python -version=2.7.7 +version=2.7.8 release=1 source=(http://www.python.org/ftp/$name/$version/Python-$version.tar.xz \ pyconfig.h) From 9b8b41a1e2b1c640fa21b341eec512392e7b0c86 Mon Sep 17 00:00:00 2001 From: Juergen Daubert Date: Fri, 4 Jul 2014 13:39:30 +0200 Subject: [PATCH 4/4] samba: install yapp unconditionally, fix man-page install --- samba/.footprint | 4 ++++ samba/.md5sum | 1 + samba/Pkgfile | 15 +++++++++------ samba/samba-config.patch | 21 --------------------- 4 files changed, 14 insertions(+), 27 deletions(-) delete mode 100644 samba/samba-config.patch diff --git a/samba/.footprint b/samba/.footprint index f5e50e794..677d99983 100644 --- a/samba/.footprint +++ b/samba/.footprint @@ -923,6 +923,10 @@ drwxr-xr-x root/root usr/man/man5/ -rw-r--r-- root/root usr/man/man5/smb.conf.5.gz -rw-r--r-- root/root usr/man/man5/smbgetrc.5.gz -rw-r--r-- root/root usr/man/man5/smbpasswd.5.gz +drwxr-xr-x root/root usr/man/man7/ +-rw-r--r-- root/root usr/man/man7/libsmbclient.7.gz +-rw-r--r-- root/root usr/man/man7/samba.7.gz +-rw-r--r-- root/root usr/man/man7/winbind_krb5_locator.7.gz drwxr-xr-x root/root usr/man/man8/ -rw-r--r-- root/root usr/man/man8/eventlogadm.8.gz -rw-r--r-- root/root usr/man/man8/idmap_ad.8.gz diff --git a/samba/.md5sum b/samba/.md5sum index ac088e2fa..f7b316e63 100644 --- a/samba/.md5sum +++ b/samba/.md5sum @@ -1,2 +1,3 @@ 448caca4745aef1a842f4fdb1aa62e1e samba f9efc506e08c680d2b79b13be28c959c samba-4.1.9.tar.gz +befcb6d70805a641aaaef38550b07725 samba-install_yapp_driver.patch diff --git a/samba/Pkgfile b/samba/Pkgfile index 815984256..4aa6971d6 100644 --- a/samba/Pkgfile +++ b/samba/Pkgfile @@ -5,13 +5,16 @@ name=samba version=4.1.9 -release=1 +release=2 source=(http://www.samba.org/samba/ftp/stable/$name-$version.tar.gz \ + samba-install_yapp_driver.patch samba) build () { cd $name-$version + patch -d pidl/lib -p0 -i $SRC/samba-install_yapp_driver.patch + local JOBS=$(awk 'BEGIN{RS="-j|--jobs="} NR==2 {print $1}' <<< $MAKEFLAGS) test -n "$JOBS" && export JOBS="$JOBS" @@ -23,13 +26,13 @@ build () { --with-privatedir=/etc/samba/private make - make DESTDIR=$PKG install + make -j1 DESTDIR=$PKG install # man pages - install -d $PKG/usr/man/man{1,5,8} - install -m 644 docs/manpages/*.1 $PKG/usr/man/man1 - install -m 644 docs/manpages/*.5 $PKG/usr/man/man5 - install -m 644 docs/manpages/*.8 $PKG/usr/man/man8 + local p + for p in docs/manpages/*; do + install -D -m 644 $p $PKG/usr/man/man${p##*.}/${p##*/} + done # cleanup chmod 1777 $PKG/var/lock diff --git a/samba/samba-config.patch b/samba/samba-config.patch deleted file mode 100644 index 5cc3be121..000000000 --- a/samba/samba-config.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nru samba-3.0.26a.orig/examples/smb.conf.default samba-3.0.26a/examples/smb.conf.default ---- samba-3.0.26a.orig/examples/smb.conf.default 2007-09-12 09:39:16.000000000 +0200 -+++ samba-3.0.26a/examples/smb.conf.default 2007-09-12 09:39:40.000000000 +0200 -@@ -63,7 +63,7 @@ - - # this tells Samba to use a separate log file for each machine - # that connects -- log file = /usr/local/samba/var/log.%m -+ log file = /var/log/samba/log.%m - - # Put a capping on the size of the log files (in Kb). - max log size = 50 -@@ -184,7 +184,7 @@ - # specifically define each individual printer - [printers] - comment = All Printers -- path = /usr/spool/samba -+ path = /var/spool/samba - browseable = no - # Set public = yes to allow user 'guest account' to print - guest ok = no