Merge branch '2.3' into 2.4
This commit is contained in:
Tilman Sauerbeck
commit
0bca97404b
@ -14,9 +14,9 @@ drwxr-xr-x root/root usr/include/cairo/
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
-rw-r--r-- root/root usr/lib/libcairo.a
|
||||
-rwxr-xr-x root/root usr/lib/libcairo.la
|
||||
lrwxrwxrwx root/root usr/lib/libcairo.so -> libcairo.so.2.11.5
|
||||
lrwxrwxrwx root/root usr/lib/libcairo.so.2 -> libcairo.so.2.11.5
|
||||
-rwxr-xr-x root/root usr/lib/libcairo.so.2.11.5
|
||||
lrwxrwxrwx root/root usr/lib/libcairo.so -> libcairo.so.2.11.6
|
||||
lrwxrwxrwx root/root usr/lib/libcairo.so.2 -> libcairo.so.2.11.6
|
||||
-rwxr-xr-x root/root usr/lib/libcairo.so.2.11.6
|
||||
drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/cairo-ft.pc
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/cairo-glitz.pc
|
||||
|
||||
@ -1 +1 @@
|
||||
5598a5e500ad922e37b159dee72fc993 cairo-1.4.10.tar.gz
|
||||
8e50c2c0d56388e4ee94196c0c7a7904 cairo-1.4.12.tar.gz
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
# Description: A 2D graphics library with support for multiple output devices
|
||||
# URL: http://www.cairographics.org/
|
||||
# Maintainer: Matt Housh, jaeger at morpheus dot net
|
||||
# Maintainer: Matt Housh, jaeger at crux dot nu
|
||||
# Depends on: fontconfig, glitz, libpng, xorg-libxrender
|
||||
|
||||
name=cairo
|
||||
version=1.4.10
|
||||
version=1.4.12
|
||||
release=1
|
||||
source=(http://cairographics.org/releases/$name-$version.tar.gz)
|
||||
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
84f76a73dff5a3c9e9f11f3c29a4e93b chrony-1.21.tar.gz
|
||||
7c14e438020092ba2cd10d2014749088 chrony-gcc4.patch
|
||||
8450f776b8763a17a4e59b0f93aa79f8 chrony.conf
|
||||
ffce77695e55d8efda19ab0b78309c23 chrony-1.23.tar.gz
|
||||
3c53b2da1757f0c9de704b841adda511 chrony.conf
|
||||
ec43dcf700698a7d2891a1f8504b5e22 chrony.keys
|
||||
ef4b4ca7c250397656d81a329faf60d2 chronyd
|
||||
|
||||
@ -4,20 +4,19 @@
|
||||
# Depends on: ncurses, readline
|
||||
|
||||
name=chrony
|
||||
version=1.21
|
||||
release=2
|
||||
version=1.23
|
||||
release=1
|
||||
source=(http://chrony.sunsite.dk/download/$name-$version.tar.gz \
|
||||
$name-gcc4.patch chronyd chrony.conf chrony.keys)
|
||||
chronyd chrony.conf chrony.keys)
|
||||
|
||||
build () {
|
||||
cd $name-$version
|
||||
patch -p1 < $SRC/$name-gcc4.patch
|
||||
./configure --prefix=/usr
|
||||
make
|
||||
make DESTDIR=$PKG install
|
||||
|
||||
rm -r $PKG/usr/doc
|
||||
|
||||
|
||||
install -d $PKG/var/{lib,log}/chrony
|
||||
install -D -m 755 $SRC/chronyd $PKG/etc/rc.d/chronyd
|
||||
install -m 600 $SRC/chrony.* $PKG/etc
|
||||
|
||||
@ -1,82 +0,0 @@
|
||||
diff -Nru chrony-1.21.orig/addrfilt.c chrony-1.21/addrfilt.c
|
||||
--- chrony-1.21.orig/addrfilt.c 2006-02-20 15:54:23.000000000 +0100
|
||||
+++ chrony-1.21/addrfilt.c 2006-02-20 16:03:59.000000000 +0100
|
||||
@@ -43,17 +43,15 @@
|
||||
/* Define the table size */
|
||||
#define TABLE_SIZE (1UL<<NBITS)
|
||||
|
||||
-struct _TableNode;
|
||||
-
|
||||
-typedef struct _TableNode ExtendedTable[TABLE_SIZE];
|
||||
-
|
||||
typedef enum {DENY, ALLOW, AS_PARENT} State;
|
||||
|
||||
typedef struct _TableNode {
|
||||
State state;
|
||||
- ExtendedTable *extended;
|
||||
+ struct _TableNode *extended;
|
||||
} TableNode;
|
||||
|
||||
+typedef struct _TableNode ExtendedTable[TABLE_SIZE];
|
||||
+
|
||||
struct ADF_AuthTableInst {
|
||||
TableNode base;
|
||||
};
|
||||
@@ -101,7 +99,7 @@
|
||||
|
||||
if (node->extended != NULL) {
|
||||
for (i=0; i<TABLE_SIZE; i++) {
|
||||
- child_node = &((*(node->extended))[i]);
|
||||
+ child_node = node->extended + i;
|
||||
close_node(child_node);
|
||||
}
|
||||
Free(node->extended);
|
||||
@@ -124,10 +122,10 @@
|
||||
|
||||
if (node->extended == NULL) {
|
||||
|
||||
- node->extended = MallocNew(ExtendedTable);
|
||||
+ node->extended = (TableNode *) MallocArray(ExtendedTable, TABLE_SIZE);
|
||||
|
||||
for (i=0; i<TABLE_SIZE; i++) {
|
||||
- child_node = &((*(node->extended))[i]);
|
||||
+ child_node = node->extended + i;
|
||||
child_node->state = AS_PARENT;
|
||||
child_node->extended = NULL;
|
||||
}
|
||||
@@ -168,7 +166,7 @@
|
||||
if (!(node->extended)) {
|
||||
open_node(node);
|
||||
}
|
||||
- node = &((*(node->extended))[subnet]);
|
||||
+ node = node->extended + subnet;
|
||||
bits_to_go -= NBITS;
|
||||
}
|
||||
|
||||
@@ -187,7 +185,7 @@
|
||||
if (!(node->extended)) {
|
||||
open_node(node);
|
||||
}
|
||||
- node = &((*(node->extended))[subnet]);
|
||||
+ node = node->extended + subnet;
|
||||
bits_to_go -= NBITS;
|
||||
}
|
||||
|
||||
@@ -199,7 +197,7 @@
|
||||
}
|
||||
|
||||
for (i=subnet, j=0; j<N; i++, j++) {
|
||||
- this_node = &((*(node->extended))[i]);
|
||||
+ this_node = node->extended + i;
|
||||
if (delete_children) {
|
||||
close_node(this_node);
|
||||
}
|
||||
@@ -283,7 +281,7 @@
|
||||
if (node->extended) {
|
||||
subnet = get_subnet(residual);
|
||||
residual = get_residual(residual);
|
||||
- node = &((*(node->extended))[subnet]);
|
||||
+ node = node->extended + subnet;
|
||||
} else {
|
||||
/* Make decision on this node */
|
||||
finished = 1;
|
||||
@ -24,7 +24,7 @@ logdir /var/log/chrony
|
||||
# Enable this only if you have enhanced real time
|
||||
# clock support build into your kernel
|
||||
! log rtc
|
||||
! rtcdevice /dev/misc/rtc
|
||||
! rtcdevice /dev/rtc
|
||||
! rtcfile /var/lib/chrony/chrony.rtc
|
||||
|
||||
# End of file
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
3fdff0bdb3638fce1c4bc6795ed81fb3 git-1.5.3.5.tar.bz2
|
||||
2cc722f80968b1c2f99a217457b056d4 git-manpages-1.5.3.5.tar.bz2
|
||||
a114cbf532ff627698a031a66d072173 git-1.5.3.7.tar.bz2
|
||||
bc810162a466e63ee5819ff35e4fb343 git-manpages-1.5.3.7.tar.bz2
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
# Nice to have: tk
|
||||
|
||||
name=git
|
||||
version=1.5.3.5
|
||||
version=1.5.3.7
|
||||
release=1
|
||||
source=(http://www.kernel.org/pub/software/scm/$name/$name-{,manpages-}$version.tar.bz2)
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
a9c3b70ab56d65015b28c6b795491c80 gecko-sdk-i686-pc-linux-gnu-1.8b1.tar.gz
|
||||
b44be48b2d34e6509b8f12597da7a712 mplayerplug-in-3.45.tar.gz
|
||||
7a9306c39f6550090c16b9c1d87e3168 mplayerplug-in-3.50.tar.gz
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
# Depends on: mplayer, firefox, gettext
|
||||
|
||||
name=mplayerplug-in
|
||||
version=3.45
|
||||
version=3.50
|
||||
release=1
|
||||
source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz \
|
||||
http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.8b1/gecko-sdk-i686-pc-linux-gnu-1.8b1.tar.gz)
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
5aa32e99a1e58adbbd28928d1086183e Makefile.config
|
||||
f740e754a399c222645a7bd398d9e298 netpbm-10.35.33.tar.gz
|
||||
30b771b50f8ba88c6b84a4a723bc5c09 netpbm-10.35.34.tar.gz
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# Depends on: ghostscript
|
||||
|
||||
name=netpbm
|
||||
version=10.35.33
|
||||
version=10.35.34
|
||||
release=1
|
||||
source=(http://aon.iki.fi/files/netpbm/netpbm-$version.tar.gz
|
||||
Makefile.config)
|
||||
|
||||
@ -8,16 +8,18 @@ drwxr-xr-x root/root etc/squid/
|
||||
-rw-r--r-- root/root etc/squid/squid.conf.default
|
||||
drwxr-xr-x root/root usr/
|
||||
drwxr-xr-x root/root usr/bin/
|
||||
-rwxr-xr-x root/root usr/bin/RunCache
|
||||
-rwxr-xr-x root/root usr/bin/cossdump
|
||||
-rwxr-xr-x root/root usr/bin/squidclient
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
drwxr-xr-x root/root usr/lib/squid/
|
||||
-rwxr-xr-x root/root usr/lib/squid/cachemgr.cgi
|
||||
-rwxr-xr-x root/root usr/lib/squid/unlinkd
|
||||
drwxr-xr-x root/root usr/man/
|
||||
drwxr-xr-x root/root usr/man/man8/
|
||||
-rw-r--r-- root/root usr/man/man8/cachemgr.cgi.8.gz
|
||||
-rw-r--r-- root/root usr/man/man8/squid.8.gz
|
||||
drwxr-xr-x root/root usr/sbin/
|
||||
-rwxr-xr-x root/root usr/sbin/cachemgr.cgi
|
||||
-rwxr-xr-x root/root usr/sbin/squid
|
||||
-rwxr-xr-x root/root usr/sbin/unlinkd
|
||||
drwxr-xr-x root/root usr/share/
|
||||
drwxr-xr-x root/root usr/share/squid/
|
||||
drwxr-xr-x root/root usr/share/squid/errors/
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
9ce54d2a0a7959df4470178e7aac5e27 squid
|
||||
849bee6f269e6c773f215fd4b41de0e3 squid-2.6.STABLE16.tar.bz2
|
||||
3094e711ce9888d226479ef682146329 squid.conf
|
||||
e6face0dff4ea054d3ba94236eb56ea1 squid-2.6.STABLE17.tar.bz2
|
||||
ef23fc10fc753050a11b4f16ddcf2739 squid.conf
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# Maintainer: Jürgen Daubert, juergen dot daubert at t-online dot de
|
||||
|
||||
name=squid
|
||||
version=2.6.STABLE16
|
||||
version=2.6.STABLE17
|
||||
release=1
|
||||
source=(http://www.squid-cache.org/Versions/v2/2.6/$name-$version.tar.bz2 \
|
||||
squid.conf squid)
|
||||
@ -13,15 +13,21 @@ build () {
|
||||
./configure --prefix=/usr \
|
||||
--mandir=/usr/man \
|
||||
--sysconfdir=/etc/squid \
|
||||
--libexecdir=/usr/sbin \
|
||||
--libexecdir=/usr/lib/squid \
|
||||
--localstatedir=/var/squid \
|
||||
--datadir=/usr/share/squid \
|
||||
--enable-linux-netfilter \
|
||||
--enable-err-languages=English \
|
||||
--enable-epoll
|
||||
--enable-epoll \
|
||||
--enable-storeio=ufs,aufs,coss \
|
||||
--with-large-files \
|
||||
--with-pthreads \
|
||||
--with-aufs-threads=16
|
||||
|
||||
make all
|
||||
make DESTDIR=$PKG install
|
||||
|
||||
rm $PKG/usr/bin/RunCache
|
||||
rm -r $PKG/{var/squid/logs,etc/squid/mime.conf.default}
|
||||
mv $PKG/usr/share/squid/errors/{English/*,.}
|
||||
rm -r $PKG/usr/share/squid/errors/English
|
||||
|
||||
@ -16,13 +16,16 @@ cache_effective_user squid
|
||||
cache_effective_group squid
|
||||
|
||||
# Directory where cache swap files will be stored
|
||||
# Size 100MB, 16/256 subdirecctories
|
||||
cache_dir ufs /var/squid 100 16 256
|
||||
# coos: size 100MB, max. 5K/object
|
||||
# aufs: size 1000MB, 16/256 subdirecctories
|
||||
#cache_dir coss /var/squid/coss_01 100 block-size=512 max-size=5120
|
||||
cache_dir aufs /var/squid 1000 16 256
|
||||
|
||||
# Log files
|
||||
cache_access_log /var/log/squid/access.log
|
||||
cache_log /var/log/squid/cache.log
|
||||
cache_store_log /var/log/squid/store.log
|
||||
cache_swap_log /var/squid/swap_%s.log
|
||||
|
||||
# Where the error-messages and icons are stored
|
||||
icon_directory /usr/share/squid/icons
|
||||
|
||||
@ -135,6 +135,9 @@ drwxr-xr-x root/root usr/include/wine/windows/
|
||||
-rw-r--r-- root/root usr/include/wine/windows/d3dx8core.h
|
||||
-rw-r--r-- root/root usr/include/wine/windows/d3dx8math.h
|
||||
-rw-r--r-- root/root usr/include/wine/windows/d3dx8math.inl
|
||||
-rw-r--r-- root/root usr/include/wine/windows/d3dx9.h
|
||||
-rw-r--r-- root/root usr/include/wine/windows/d3dx9math.h
|
||||
-rw-r--r-- root/root usr/include/wine/windows/d3dx9math.inl
|
||||
-rw-r--r-- root/root usr/include/wine/windows/dbghelp.h
|
||||
-rw-r--r-- root/root usr/include/wine/windows/dbinit.idl
|
||||
-rw-r--r-- root/root usr/include/wine/windows/dbprop.idl
|
||||
@ -258,6 +261,7 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/
|
||||
-rw-r--r-- root/root usr/include/wine/windows/ipifcons.h
|
||||
-rw-r--r-- root/root usr/include/wine/windows/iprtrmib.h
|
||||
-rw-r--r-- root/root usr/include/wine/windows/iptypes.h
|
||||
-rw-r--r-- root/root usr/include/wine/windows/isguids.h
|
||||
-rw-r--r-- root/root usr/include/wine/windows/ks.h
|
||||
-rw-r--r-- root/root usr/include/wine/windows/ksguid.h
|
||||
-rw-r--r-- root/root usr/include/wine/windows/ksmedia.h
|
||||
@ -455,6 +459,7 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/
|
||||
-rw-r--r-- root/root usr/include/wine/windows/ver.h
|
||||
-rw-r--r-- root/root usr/include/wine/windows/vfw.h
|
||||
-rw-r--r-- root/root usr/include/wine/windows/vfwmsgs.h
|
||||
-rw-r--r-- root/root usr/include/wine/windows/wfext.h
|
||||
-rw-r--r-- root/root usr/include/wine/windows/winbase.h
|
||||
-rw-r--r-- root/root usr/include/wine/windows/wincon.h
|
||||
-rw-r--r-- root/root usr/include/wine/windows/wincred.h
|
||||
|
||||
@ -1 +1 @@
|
||||
417912f28e48ddc6c4285a493d070564 wine-0.9.49.tar.bz2
|
||||
1f2a34569b4a76eb270f5ad206a464b8 wine-0.9.50.tar.bz2
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
# Depends on: fontforge
|
||||
|
||||
name=wine
|
||||
version=0.9.49
|
||||
version=0.9.50
|
||||
release=1
|
||||
source=(http://ibiblio.org/pub/linux/system/emulators/wine/wine-$version.tar.bz2)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user