Merge branch '3.1' into 3.2
This commit is contained in:
commit
3bd503ad06
@ -1 +1 @@
|
|||||||
cf598a23ded85cb3c8a9bf6de73af23b flash-plugin-11.2.202.468-release.x86_64.rpm
|
1c76ee9403bbfe9282ace337ea1cecce flash-plugin-11.2.202.481-release.x86_64.rpm
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
# Depends on:
|
# Depends on:
|
||||||
|
|
||||||
name=flash-player-plugin
|
name=flash-player-plugin
|
||||||
version=11.2.202.468
|
version=11.2.202.481
|
||||||
release=1
|
release=1
|
||||||
source=(http://fpdownload.macromedia.com/get/flashplayer/pdc/$version/flash-plugin-$version-release.x86_64.rpm)
|
source=(http://fpdownload.macromedia.com/get/flashplayer/pdc/$version/flash-plugin-$version-release.x86_64.rpm)
|
||||||
|
|
||||||
|
@ -432,13 +432,13 @@ lrwxrwxrwx root/root usr/lib/libgailutil-3.so -> libgailutil-3.so.0.0.0
|
|||||||
lrwxrwxrwx root/root usr/lib/libgailutil-3.so.0 -> libgailutil-3.so.0.0.0
|
lrwxrwxrwx root/root usr/lib/libgailutil-3.so.0 -> libgailutil-3.so.0.0.0
|
||||||
-rwxr-xr-x root/root usr/lib/libgailutil-3.so.0.0.0
|
-rwxr-xr-x root/root usr/lib/libgailutil-3.so.0.0.0
|
||||||
-rw-r--r-- root/root usr/lib/libgdk-3.la
|
-rw-r--r-- root/root usr/lib/libgdk-3.la
|
||||||
lrwxrwxrwx root/root usr/lib/libgdk-3.so -> libgdk-3.so.0.1600.4
|
lrwxrwxrwx root/root usr/lib/libgdk-3.so -> libgdk-3.so.0.1600.5
|
||||||
lrwxrwxrwx root/root usr/lib/libgdk-3.so.0 -> libgdk-3.so.0.1600.4
|
lrwxrwxrwx root/root usr/lib/libgdk-3.so.0 -> libgdk-3.so.0.1600.5
|
||||||
-rwxr-xr-x root/root usr/lib/libgdk-3.so.0.1600.4
|
-rwxr-xr-x root/root usr/lib/libgdk-3.so.0.1600.5
|
||||||
-rw-r--r-- root/root usr/lib/libgtk-3.la
|
-rw-r--r-- root/root usr/lib/libgtk-3.la
|
||||||
lrwxrwxrwx root/root usr/lib/libgtk-3.so -> libgtk-3.so.0.1600.4
|
lrwxrwxrwx root/root usr/lib/libgtk-3.so -> libgtk-3.so.0.1600.5
|
||||||
lrwxrwxrwx root/root usr/lib/libgtk-3.so.0 -> libgtk-3.so.0.1600.4
|
lrwxrwxrwx root/root usr/lib/libgtk-3.so.0 -> libgtk-3.so.0.1600.5
|
||||||
-rwxr-xr-x root/root usr/lib/libgtk-3.so.0.1600.4
|
-rwxr-xr-x root/root usr/lib/libgtk-3.so.0.1600.5
|
||||||
drwxr-xr-x root/root usr/lib/pkgconfig/
|
drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||||
-rw-r--r-- root/root usr/lib/pkgconfig/gail-3.0.pc
|
-rw-r--r-- root/root usr/lib/pkgconfig/gail-3.0.pc
|
||||||
-rw-r--r-- root/root usr/lib/pkgconfig/gdk-3.0.pc
|
-rw-r--r-- root/root usr/lib/pkgconfig/gdk-3.0.pc
|
||||||
|
@ -1 +1 @@
|
|||||||
c7497aaf6730524a127597b768a73bd7 gtk+-3.16.4.tar.xz
|
6d2c59c2b3b557d8ae9ac83a69b070fe gtk+-3.16.5.tar.xz
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
# Depends on: gdk-pixbuf, pango, at-spi2-atk, libepoxy
|
# Depends on: gdk-pixbuf, pango, at-spi2-atk, libepoxy
|
||||||
|
|
||||||
name=gtk3
|
name=gtk3
|
||||||
version=3.16.4
|
version=3.16.5
|
||||||
release=1
|
release=1
|
||||||
source=(http://download.gnome.org/sources/gtk+/${version:0:4}/gtk+-$version.tar.xz)
|
source=(http://download.gnome.org/sources/gtk+/${version:0:4}/gtk+-$version.tar.xz)
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
da8d81a6a2ea235025795d9e001a6ae3 LVM2.2.02.124.tgz
|
2d24ba982c8a85e8c837210f087a6a51 LVM2.2.02.125.tgz
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
# Depends on: libdevmapper
|
# Depends on: libdevmapper
|
||||||
|
|
||||||
name=lvm2
|
name=lvm2
|
||||||
version=2.02.124
|
version=2.02.125
|
||||||
release=1
|
release=1
|
||||||
source=(http://mirrors.kernel.org/sources.redhat.com/lvm2/LVM2.$version.tgz)
|
source=(http://mirrors.kernel.org/sources.redhat.com/lvm2/LVM2.$version.tgz)
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
a3de70d115b8580e50c433f83691cfaf php-5.5.26.tar.xz
|
2efe7c087d7073bffa64e5d538f22711 php-5.5.27.tar.xz
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
# Depends on: xz apache libxml2
|
# Depends on: xz apache libxml2
|
||||||
|
|
||||||
name=mod_php
|
name=mod_php
|
||||||
version=5.5.26
|
version=5.5.27
|
||||||
release=1
|
release=1
|
||||||
source=(http://php.net/distributions/php-$version.tar.xz)
|
source=(http://php.net/distributions/php-$version.tar.xz)
|
||||||
|
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
a3de70d115b8580e50c433f83691cfaf php-5.5.26.tar.xz
|
2efe7c087d7073bffa64e5d538f22711 php-5.5.27.tar.xz
|
||||||
cdaab91680ba17cbf31b21d1b64dcd6a php-fcgi
|
cdaab91680ba17cbf31b21d1b64dcd6a php-fcgi
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
# Depends on: xz libpcre libxml2
|
# Depends on: xz libpcre libxml2
|
||||||
|
|
||||||
name=php-fcgi
|
name=php-fcgi
|
||||||
version=5.5.26
|
version=5.5.27
|
||||||
release=1
|
release=1
|
||||||
source=(http://php.net/distributions/php-$version.tar.xz
|
source=(http://php.net/distributions/php-$version.tar.xz
|
||||||
php-fcgi)
|
php-fcgi)
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
a3de70d115b8580e50c433f83691cfaf php-5.5.26.tar.xz
|
2efe7c087d7073bffa64e5d538f22711 php-5.5.27.tar.xz
|
||||||
954d95b7f645f3435815195aeeac6949 php-fpm
|
954d95b7f645f3435815195aeeac6949 php-fpm
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
# Depends on: xz libpcre libxml2
|
# Depends on: xz libpcre libxml2
|
||||||
|
|
||||||
name=php-fpm
|
name=php-fpm
|
||||||
version=5.5.26
|
version=5.5.27
|
||||||
release=1
|
release=1
|
||||||
source=(http://php.net/distributions/php-$version.tar.xz
|
source=(http://php.net/distributions/php-$version.tar.xz
|
||||||
php-fpm)
|
php-fpm)
|
||||||
|
@ -1 +1 @@
|
|||||||
a3de70d115b8580e50c433f83691cfaf php-5.5.26.tar.xz
|
2efe7c087d7073bffa64e5d538f22711 php-5.5.27.tar.xz
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
# Depends on: mysql
|
# Depends on: mysql
|
||||||
|
|
||||||
name=php-mysql
|
name=php-mysql
|
||||||
version=5.5.26
|
version=5.5.27
|
||||||
release=1
|
release=1
|
||||||
source=(http://php.net/distributions/php-$version.tar.xz)
|
source=(http://php.net/distributions/php-$version.tar.xz)
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
a3de70d115b8580e50c433f83691cfaf php-5.5.26.tar.xz
|
2efe7c087d7073bffa64e5d538f22711 php-5.5.27.tar.xz
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
# Depends on: sqlite3
|
# Depends on: sqlite3
|
||||||
|
|
||||||
name=php-sqlite3
|
name=php-sqlite3
|
||||||
version=5.5.26
|
version=5.5.27
|
||||||
release=1
|
release=1
|
||||||
source=(http://php.net/distributions/php-$version.tar.xz)
|
source=(http://php.net/distributions/php-$version.tar.xz)
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
a3de70d115b8580e50c433f83691cfaf php-5.5.26.tar.xz
|
2efe7c087d7073bffa64e5d538f22711 php-5.5.27.tar.xz
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
# Depends on: readline libpcre libxml2 curl db gdbm xz
|
# Depends on: readline libpcre libxml2 curl db gdbm xz
|
||||||
|
|
||||||
name=php
|
name=php
|
||||||
version=5.5.26
|
version=5.5.27
|
||||||
release=1
|
release=1
|
||||||
source=(http://php.net/distributions/php-$version.tar.xz)
|
source=(http://php.net/distributions/php-$version.tar.xz)
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
69927d1614d6704021c0b0dd0ee6a852 poppler-0.33.0.tar.xz
|
7d788f85bca1c03d71773af0b902e203 poppler-0.34.0.tar.xz
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
# Depends on: glib poppler
|
# Depends on: glib poppler
|
||||||
|
|
||||||
name=poppler-glib
|
name=poppler-glib
|
||||||
version=0.33.0
|
version=0.34.0
|
||||||
release=1
|
release=1
|
||||||
source=(http://poppler.freedesktop.org/poppler-$version.tar.xz)
|
source=(http://poppler.freedesktop.org/poppler-$version.tar.xz)
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
69927d1614d6704021c0b0dd0ee6a852 poppler-0.33.0.tar.xz
|
7d788f85bca1c03d71773af0b902e203 poppler-0.34.0.tar.xz
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
# Depends on: qt4 poppler
|
# Depends on: qt4 poppler
|
||||||
|
|
||||||
name=poppler-qt4
|
name=poppler-qt4
|
||||||
version=0.33.0
|
version=0.34.0
|
||||||
release=1
|
release=1
|
||||||
source=(http://poppler.freedesktop.org/poppler-$version.tar.xz)
|
source=(http://poppler.freedesktop.org/poppler-$version.tar.xz)
|
||||||
|
|
||||||
|
@ -157,9 +157,9 @@ lrwxrwxrwx root/root usr/lib/libpoppler-cpp.so.0 -> libpoppler-cpp.so.0.2.1
|
|||||||
-rwxr-xr-x root/root usr/lib/libpoppler-cpp.so.0.2.1
|
-rwxr-xr-x root/root usr/lib/libpoppler-cpp.so.0.2.1
|
||||||
-rw-r--r-- root/root usr/lib/libpoppler.a
|
-rw-r--r-- root/root usr/lib/libpoppler.a
|
||||||
-rwxr-xr-x root/root usr/lib/libpoppler.la
|
-rwxr-xr-x root/root usr/lib/libpoppler.la
|
||||||
lrwxrwxrwx root/root usr/lib/libpoppler.so -> libpoppler.so.52.0.0
|
lrwxrwxrwx root/root usr/lib/libpoppler.so -> libpoppler.so.53.0.0
|
||||||
lrwxrwxrwx root/root usr/lib/libpoppler.so.52 -> libpoppler.so.52.0.0
|
lrwxrwxrwx root/root usr/lib/libpoppler.so.53 -> libpoppler.so.53.0.0
|
||||||
-rwxr-xr-x root/root usr/lib/libpoppler.so.52.0.0
|
-rwxr-xr-x root/root usr/lib/libpoppler.so.53.0.0
|
||||||
drwxr-xr-x root/root usr/lib/pkgconfig/
|
drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||||
-rw-r--r-- root/root usr/lib/pkgconfig/poppler-cairo.pc
|
-rw-r--r-- root/root usr/lib/pkgconfig/poppler-cairo.pc
|
||||||
-rw-r--r-- root/root usr/lib/pkgconfig/poppler-cpp.pc
|
-rw-r--r-- root/root usr/lib/pkgconfig/poppler-cpp.pc
|
||||||
|
@ -1 +1 @@
|
|||||||
69927d1614d6704021c0b0dd0ee6a852 poppler-0.33.0.tar.xz
|
7d788f85bca1c03d71773af0b902e203 poppler-0.34.0.tar.xz
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
# Depends on: cairo lcms2
|
# Depends on: cairo lcms2
|
||||||
|
|
||||||
name=poppler
|
name=poppler
|
||||||
version=0.33.0
|
version=0.34.0
|
||||||
release=1
|
release=1
|
||||||
source=(http://poppler.freedesktop.org/$name-$version.tar.xz)
|
source=(http://poppler.freedesktop.org/$name-$version.tar.xz)
|
||||||
|
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
4d5387895f3a162d63a6ed76ebbafae8 stunnel
|
4d5387895f3a162d63a6ed76ebbafae8 stunnel
|
||||||
5642c0feb14f480b8a0739b6eb8b39e5 stunnel-5.19.tar.gz
|
3264375026c2b496b5d258e243222de8 stunnel-5.20.tar.gz
|
||||||
16694d0e035fdd5e908ff42bc44ea805 stunnel.conf
|
16694d0e035fdd5e908ff42bc44ea805 stunnel.conf
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
# Depends on: openssl tcp_wrappers zlib
|
# Depends on: openssl tcp_wrappers zlib
|
||||||
|
|
||||||
name=stunnel
|
name=stunnel
|
||||||
version=5.19
|
version=5.20
|
||||||
release=1
|
release=1
|
||||||
source=(https://www.stunnel.org/downloads/$name-$version.tar.gz \
|
source=(https://www.stunnel.org/downloads/$name-$version.tar.gz \
|
||||||
$name.conf $name)
|
$name.conf $name)
|
||||||
|
@ -1 +1 @@
|
|||||||
d4e53489763ff2cb575ab02890d91dc9 sylpheed-3.4.2.tar.bz2
|
3a7d10b68017988b48e5c2a27e559e98 sylpheed-3.4.3.tar.bz2
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
# Depends on: gtk, openssl
|
# Depends on: gtk, openssl
|
||||||
|
|
||||||
name=sylpheed
|
name=sylpheed
|
||||||
version=3.4.2
|
version=3.4.3
|
||||||
release=1
|
release=1
|
||||||
source=(http://sylpheed.sraoss.jp/sylpheed/v3.4/$name-$version.tar.bz2)
|
source=(http://sylpheed.sraoss.jp/sylpheed/v3.4/$name-$version.tar.bz2)
|
||||||
|
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
4efc120538752183b95d997e92d1795e unbound
|
5bf1cabac23d0c2d89d2696039064d0a unbound
|
||||||
1e95fdcbaaf5dc87432d898006a5eb13 unbound-1.5.3.tar.gz
|
f85854baad15adc7ce8acefe6cda4cf8 unbound-1.5.4.tar.gz
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
# Depends on: openssl expat
|
# Depends on: openssl expat
|
||||||
|
|
||||||
name=unbound
|
name=unbound
|
||||||
version=1.5.3
|
version=1.5.4
|
||||||
release=1
|
release=1
|
||||||
source=(http://www.unbound.net/downloads/$name-$version.tar.gz
|
source=(http://www.unbound.net/downloads/$name-$version.tar.gz
|
||||||
unbound)
|
unbound)
|
||||||
|
@ -22,7 +22,7 @@ restart)
|
|||||||
status)
|
status)
|
||||||
$SSD --status --pidfile $PID
|
$SSD --status --pidfile $PID
|
||||||
case $? in
|
case $? in
|
||||||
0) echo "$PROG is running" ;;
|
0) echo "$PROG is running with pid $(cat $PID)" ;;
|
||||||
1) echo "$PROG is not running but the pid file $PID exists" ;;
|
1) echo "$PROG is not running but the pid file $PID exists" ;;
|
||||||
3) echo "$PROG is not running" ;;
|
3) echo "$PROG is not running" ;;
|
||||||
4) echo "Unable to determine the program status" ;;
|
4) echo "Unable to determine the program status" ;;
|
||||||
|
Loading…
Reference in New Issue
Block a user