Merge branch '3.0' into 3.1

Conflicts:
	dbus/.footprint
	dbus/.md5sum
	dbus/Pkgfile
This commit is contained in:
Juergen Daubert 2014-07-04 14:21:12 +02:00
commit fd250b75e8
9 changed files with 45 additions and 34 deletions

View File

@ -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

View File

@ -1,2 +1,2 @@
41f7348b348e3f72fcfb4f4d76701352 Python-2.7.7.tar.xz
d235bdfa75b8396942e360a70487ee00 Python-2.7.8.tar.xz
387d5f6d00d2be01ecb87216cac0f88c pyconfig.h

View File

@ -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)

View File

@ -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

View File

@ -1,2 +1,3 @@
448caca4745aef1a842f4fdb1aa62e1e samba
f9efc506e08c680d2b79b13be28c959c samba-4.1.9.tar.gz
befcb6d70805a641aaaef38550b07725 samba-install_yapp_driver.patch

View File

@ -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

View File

@ -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

View File

@ -1 +1 @@
1bb135672e9867f1781516764bda254a scite342.tgz
b2da4a9ba397968a4563998397497a5a scite344.tgz

View File

@ -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)