Merge branch '2.3' into 2.4
This commit is contained in:
commit
e466aedf2d
@ -1,9 +1,9 @@
|
||||
drwxr-xr-x root/root usr/
|
||||
drwxr-xr-x root/root usr/bin/
|
||||
-rwxr-xr-x root/root usr/bin/conky
|
||||
drwxr-xr-x root/root usr/etc/
|
||||
drwxr-xr-x root/root usr/etc/conky/
|
||||
-rw-r--r-- root/root usr/etc/conky/conky.conf
|
||||
drwxr-xr-x root/root usr/man/
|
||||
drwxr-xr-x root/root usr/man/man1/
|
||||
-rw-r--r-- root/root usr/man/man1/conky.1.gz
|
||||
drwxr-xr-x root/root usr/share/
|
||||
drwxr-xr-x root/root usr/share/conky/
|
||||
-rwxr-xr-x root/root usr/share/conky/conkyrc.sample
|
||||
|
@ -1 +1 @@
|
||||
40b929889da5f237c5f2af4a70d7f765 conky-1.4.7.tar.bz2
|
||||
42d966fce5aa5c5a326575ec214bff07 conky-1.4.9.tar.bz2
|
||||
|
@ -1,13 +1,13 @@
|
||||
# Description: a light-weight system monitor
|
||||
# URL: http://conky.sourceforge.net/
|
||||
# Maintainer: Jürgen Daubert, juergen dot daubert at t-online dot de
|
||||
# Depends on: xorg-libxdamage, xorg-libxext, xorg-libxft
|
||||
# Depends on: glib, xorg-libxdamage, xorg-libxext, xorg-libxft
|
||||
|
||||
name=conky
|
||||
version=1.4.7
|
||||
version=1.4.9
|
||||
release=1
|
||||
source=(http://dl.sourceforge.net/sourceforge/conky/$name-$version.tar.bz2)
|
||||
|
||||
|
||||
build() {
|
||||
cd $name-$version
|
||||
./configure --prefix=/usr \
|
||||
@ -18,6 +18,5 @@ build() {
|
||||
--enable-portmon \
|
||||
--enable-mpd
|
||||
make
|
||||
make install DESTDIR=$PKG
|
||||
install -D doc/conkyrc.sample $PKG/usr/share/$name/conkyrc.sample
|
||||
make DESTDIR=$PKG install
|
||||
}
|
||||
|
@ -1,3 +1,3 @@
|
||||
01b6a755c5b0fb7df2d2c94571f67e1d cups
|
||||
4bd20d69bb083b42632346a383b6aefb cups-1.3.4-source.tar.bz2
|
||||
355705c528e9a8d0d439da15454d79a6 cups-1.3.5-source.tar.bz2
|
||||
2220f411940c4f7504ed4457c6304d4a cups-config.patch
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Depends on: libpng, libtiff, openssl
|
||||
|
||||
name=cups
|
||||
version=1.3.4
|
||||
version=1.3.5
|
||||
release=1
|
||||
source=(http://ftp.easysw.com/pub/cups/$version/$name-$version-source.tar.bz2 \
|
||||
cups-config.patch cups)
|
||||
|
@ -29,9 +29,9 @@ drwxr-xr-x root/root usr/include/fuse/
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
-rw-r--r-- root/root usr/lib/libfuse.a
|
||||
-rwxr-xr-x root/root usr/lib/libfuse.la
|
||||
lrwxrwxrwx root/root usr/lib/libfuse.so -> libfuse.so.2.7.1
|
||||
lrwxrwxrwx root/root usr/lib/libfuse.so.2 -> libfuse.so.2.7.1
|
||||
-rwxr-xr-x root/root usr/lib/libfuse.so.2.7.1
|
||||
lrwxrwxrwx root/root usr/lib/libfuse.so -> libfuse.so.2.7.2
|
||||
lrwxrwxrwx root/root usr/lib/libfuse.so.2 -> libfuse.so.2.7.2
|
||||
-rwxr-xr-x root/root usr/lib/libfuse.so.2.7.2
|
||||
-rw-r--r-- root/root usr/lib/libulockmgr.a
|
||||
-rwxr-xr-x root/root usr/lib/libulockmgr.la
|
||||
lrwxrwxrwx root/root usr/lib/libulockmgr.so -> libulockmgr.so.1.0.1
|
||||
|
@ -1 +1 @@
|
||||
f95b4a238a3df5a92e9013ecb55c2c17 fuse-2.7.1.tar.gz
|
||||
813782a4f23211386c1ea91dc0ac7ded fuse-2.7.2.tar.gz
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Packager: Jukka Heino, jukka dot heino at gmail dot com
|
||||
|
||||
name=fuse
|
||||
version=2.7.1
|
||||
version=2.7.2
|
||||
release=1
|
||||
source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz)
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
6e2f5cfb258b8955fa345a2070b6c4b0 db.localhost
|
||||
020d9bffda1f19fa9287c80672554ecf maradns
|
||||
3ab8a3231cebe65db2bf9473848f9ddb maradns-1.2.12.08.tar.bz2
|
||||
b5fdf1ab14405bbbb62e926cc118bc07 mararc
|
||||
ee82cb6d4989cee2b9937257dc48c025 maradns-1.2.12.09.tar.bz2
|
||||
11cd417167ec03c04499c454a329c99b mararc
|
||||
|
@ -3,7 +3,7 @@
|
||||
# Maintainer: Jürgen Daubert, juergen dot daubert at t-online dot de
|
||||
|
||||
name=maradns
|
||||
version=1.2.12.08
|
||||
version=1.2.12.09
|
||||
release=1
|
||||
source=(http://www.maradns.org/download/1.2/$version/maradns-$version.tar.bz2 \
|
||||
mararc maradns db.localhost)
|
||||
|
@ -42,7 +42,7 @@ admin_acl = "localhost,localnet"
|
||||
ipv4_alias["icann"] = "198.41.0.4,192.228.79.201,192.33.4.12,128.8.10.90,"
|
||||
ipv4_alias["icann"] += "192.203.230.10,192.5.5.241,192.112.36.4,"
|
||||
ipv4_alias["icann"] += "128.63.2.53,192.36.148.17,192.58.128.30,"
|
||||
ipv4_alias["icann"] += "193.0.14.129,198.32.64.12,202.12.27.33"
|
||||
ipv4_alias["icann"] += "193.0.14.129,199.7.83.42,202.12.27.33"
|
||||
|
||||
# ORSN, Open Root Server Network (http://www.orsn.org)
|
||||
ipv4_alias["orsn"] = "217.146.128.77,193.238.157.7,212.7.160.13,195.226.7.66,"
|
||||
|
@ -1 +1,2 @@
|
||||
f17da840eed792e896c3408d0ce97718 sqlite-3.5.4.tar.gz
|
||||
b0887758b555ff4ae51754491c5d2786 sqlite3-without_tcl.patch
|
||||
|
@ -5,12 +5,14 @@
|
||||
|
||||
name=sqlite3
|
||||
version=3.5.4
|
||||
release=1
|
||||
release=2
|
||||
|
||||
source=(http://www.sqlite.org/sqlite-$version.tar.gz)
|
||||
source=(http://www.sqlite.org/sqlite-$version.tar.gz \
|
||||
$name-without_tcl.patch)
|
||||
|
||||
build () {
|
||||
cd sqlite-$version
|
||||
patch -p1 -i $SRC/$name-without_tcl.patch
|
||||
./configure --prefix=/usr \
|
||||
--enable-threadsafe \
|
||||
--disable-tcl
|
||||
|
23
sqlite3/sqlite3-without_tcl.patch
Normal file
23
sqlite3/sqlite3-without_tcl.patch
Normal file
@ -0,0 +1,23 @@
|
||||
diff -Nru sqlite-3.5.4.orig/Makefile.in sqlite-3.5.4/Makefile.in
|
||||
--- sqlite-3.5.4.orig/Makefile.in 2007-12-17 10:23:23.000000000 +0100
|
||||
+++ sqlite-3.5.4/Makefile.in 2007-12-17 10:25:05.000000000 +0100
|
||||
@@ -317,18 +317,11 @@
|
||||
-rpath $(libdir)/sqlite \
|
||||
-version-info "8:6:8"
|
||||
|
||||
-testcli$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h
|
||||
+sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h
|
||||
$(LTLINK) $(READLINE_FLAGS) $(LIBPTHREAD) \
|
||||
-o $@ $(TOP)/src/shell.c libsqlite3.la \
|
||||
$(LIBREADLINE) $(TLIBS)
|
||||
|
||||
-sqlite3$(EXE): $(TOP)/src/shell.c sqlite3.c sqlite3.h
|
||||
- $(LTLINK) $(READLINE_FLAGS) -o $@ \
|
||||
- -DSQLITE_MAX_SQL_LENGTH=1000000000 \
|
||||
- -USQLITE_THREADSAFE -DSQLITE_THREADSAFE=0 \
|
||||
- $(TOP)/src/shell.c sqlite3.c \
|
||||
- $(LIBREADLINE) $(TLIBS) $(THREADLIB)
|
||||
-
|
||||
# This target creates a directory named "tsrc" and fills it with
|
||||
# copies of all of the C source code and header files needed to
|
||||
# build on the target system. Some of the C source code and header
|
@ -1,2 +1,2 @@
|
||||
3c575cf89a6d3d8ab6063c2f60bd5b25 sshfs-fuse-1.8.tar.gz
|
||||
05c3da4fa0f673f7ce5f480b3023af61 sshfs-fuse-1.9.tar.gz
|
||||
7e8e223b792d4fcdbf39a045f0e022dd sshfs.1
|
||||
|
@ -5,7 +5,7 @@
|
||||
# Depends on: fuse, glib
|
||||
|
||||
name=sshfs-fuse
|
||||
version=1.8
|
||||
version=1.9
|
||||
release=1
|
||||
source=(http://dl.sourceforge.net/sourceforge/fuse/$name-$version.tar.gz \
|
||||
sshfs.1)
|
||||
|
Loading…
x
Reference in New Issue
Block a user