October 2014 - crux-commits

ports/contrib (3.1): cdrdao: fixes compile bug FS#1063
by crux＠crux.nu 01 Oct '14

01 Oct '14

commit bcfe24b9a731ca3fc9f2a1aef647d49653bb0506 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Wed Oct 1 22:28:47 2014 +1000 cdrdao: fixes compile bug FS#1063 diff --git a/cdrdao/.md5sum b/cdrdao/.md5sum index a842090..40bcd44 100644 --- a/cdrdao/.md5sum +++ b/cdrdao/.md5sum @@ -1 +1,2 @@ +0fce05542ebad283f36fa1c4d62992a0 cdrdao-1.2.3-stat.patch 8d15ba6280bb7ba2f4d6be31d28b3c0c cdrdao-1.2.3.tar.bz2 diff --git a/cdrdao/Pkgfile b/cdrdao/Pkgfile index d86ed73..0e3b0a5 100644 --- a/cdrdao/Pkgfile +++ b/cdrdao/Pkgfile @@ -5,12 +5,15 @@ name=cdrdao version=1.2.3 -release=1 -source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tar.bz2) +release=2 +source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tar.bz2 + cdrdao-1.2.3-stat.patch) build() { cd $name-$version + patch -p1 -i $SRC/cdrdao-1.2.3-stat.patch + ./configure \ --prefix=/usr \ --without-lame diff --git a/cdrdao/cdrdao-1.2.3-stat.patch b/cdrdao/cdrdao-1.2.3-stat.patch new file mode 100644 index 0000000..5a68e71 --- /dev/null +++ b/cdrdao/cdrdao-1.2.3-stat.patch @@ -0,0 +1,13 @@ +diff -up cdrdao-1.2.3/dao/ScsiIf-linux.cc.stat cdrdao-1.2.3/dao/ScsiIf-linux.cc +--- cdrdao-1.2.3/dao/ScsiIf-linux.cc.stat 2010-01-20 20:11:36.000000000 +0100 ++++ cdrdao-1.2.3/dao/ScsiIf-linux.cc 2010-01-20 20:14:07.000000000 +0100 +@@ -19,6 +19,9 @@ + + #include <config.h> + ++#include <sys/types.h> ++#include <sys/stat.h> ++ + #include <stdio.h> + #include <fcntl.h> + #include <unistd.h>

1 0

ports/core (3.1): make: removed obsolete patches
by crux＠crux.nu 01 Oct '14

01 Oct '14

commit 494713367a2109844f155505a8000bc13cebd8e6 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Wed Oct 1 13:21:29 2014 +0200 make: removed obsolete patches diff --git a/make/make-3.82-bug_30612.patch b/make/make-3.82-bug_30612.patch deleted file mode 100644 index cdba1f4..0000000 --- a/make/make-3.82-bug_30612.patch +++ /dev/null @@ -1,70 +0,0 @@ -commit 2a59dc32aaf0681dec569f32a9d7ab88a379d34f -Author: psmith <psmith> -Date: Sat Aug 14 02:50:14 2010 +0000 - - - Fix the NEWS file to be accurate - - Add oneshell to $(.FEATURES) (forgot that!) - - Fix Savannah bug #30612: handling of archive references with >1 object - -diff --git a/main.c b/main.c -index 9fe8090..782b0de 100644 ---- a/main.c -+++ b/main.c -@@ -1138,7 +1138,7 @@ main (int argc, char **argv, char **envp) - a macro and some compilers (MSVC) don't like conditionals in macros. */ - { - const char *features = "target-specific order-only second-expansion" -- " else-if shortest-stem undefine" -+ " else-if shortest-stem undefine oneshell" - #ifndef NO_ARCHIVES - " archives" - #endif -diff --git a/read.c b/read.c -index a3ad88e..9dfd4ea 100644 ---- a/read.c -+++ b/read.c -@@ -3028,7 +3028,7 @@ parse_file_seq (char **stringp, unsigned int size, int stopchar, - { - /* This looks like the first element in an open archive group. - A valid group MUST have ')' as the last character. */ -- const char *e = p + nlen; -+ const char *e = p; - do - { - e = next_token (e); -@@ -3084,19 +3084,19 @@ parse_file_seq (char **stringp, unsigned int size, int stopchar, - Go to the next item in the string. */ - if (flags & PARSEFS_NOGLOB) - { -- NEWELT (concat (2, prefix, tp)); -+ NEWELT (concat (2, prefix, tmpbuf)); - continue; - } - - /* If we get here we know we're doing glob expansion. - TP is a string in tmpbuf. NLEN is no longer used. - We may need to do more work: after this NAME will be set. */ -- name = tp; -+ name = tmpbuf; - - /* Expand tilde if applicable. */ -- if (tp[0] == '~') -+ if (tmpbuf[0] == '~') - { -- tildep = tilde_expand (tp); -+ tildep = tilde_expand (tmpbuf); - if (tildep != 0) - name = tildep; - } -@@ -3152,7 +3152,10 @@ parse_file_seq (char **stringp, unsigned int size, int stopchar, - else - { - /* We got a chain of items. Attach them. */ -- (*newp)->next = found; -+ if (*newp) -+ (*newp)->next = found; -+ else -+ *newp = found; - - /* Find and set the new end. Massage names if necessary. */ - while (1) diff --git a/make/make-3.82-bug_30653.patch b/make/make-3.82-bug_30653.patch deleted file mode 100644 index fbe2f77..0000000 --- a/make/make-3.82-bug_30653.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit d1ba0ee36b2bdd91434b5df90f0f4cceda7d6979 -Author: psmith <psmith> -Date: Mon Sep 10 02:36:05 2012 +0000 - - Force intermediate targets to be considered if their non-intermediate - parent needs to be remade. Fixes Savannah bug #30653. - -diff --git a/remake.c b/remake.c -index c0bf709..b1ddd23 100644 ---- a/remake.c -+++ b/remake.c -@@ -612,6 +612,10 @@ update_file_1 (struct file *file, unsigned int depth) - d->file->dontcare = file->dontcare; - } - -+ /* We may have already considered this file, when we didn't know -+ we'd need to update it. Force update_file() to consider it and -+ not prune it. */ -+ d->file->considered = !considered; - - dep_status |= update_file (d->file, depth); - diff --git a/make/make-3.82-bug_30723.patch b/make/make-3.82-bug_30723.patch deleted file mode 100644 index dfb0660..0000000 --- a/make/make-3.82-bug_30723.patch +++ /dev/null @@ -1,20 +0,0 @@ -commit a6f280559f34dc805381507e59c9189b7149b853 -Author: psmith <psmith> -Date: Tue Aug 10 07:35:34 2010 +0000 - - Fix Savannah bug #30723: expand MAKEFLAGS before we re-exec after - rebuilding makefiles. - -diff --git a/main.c b/main.c -index c6989e3..9fe8090 100644 ---- a/main.c -+++ b/main.c -@@ -2093,7 +2093,7 @@ main (int argc, char **argv, char **envp) - const char *pv = define_makeflags (1, 1); - char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); - sprintf (p, "MAKEFLAGS=%s", pv); -- putenv (p); -+ putenv (allocated_variable_expand (p)); - } - - if (ISDB (DB_BASIC))

1 0

ports/opt (3.0): spice-protocol: 0.12.6 -> 0.12.7
by crux＠crux.nu 01 Oct '14

01 Oct '14

commit b9af8fb59577738a250bb98bb8b6bb501110f581 Author: Thomas Penteker <tek(a)serverop.de> Date: Wed Oct 1 11:07:30 2014 +0200 spice-protocol: 0.12.6 -> 0.12.7 (cherry picked from commit b3c85ff20b3e448a67e3370610d1f794213acd52) diff --git a/spice-protocol/.md5sum b/spice-protocol/.md5sum index 17033f9..fd6be71 100644 --- a/spice-protocol/.md5sum +++ b/spice-protocol/.md5sum @@ -1 +1 @@ -797d18156ab893e48778cb097b21bb2b spice-protocol-0.12.6.tar.bz2 +799707321e88df4ecd17c4ccb0cc4ffe spice-protocol-0.12.7.tar.bz2 diff --git a/spice-protocol/Pkgfile b/spice-protocol/Pkgfile index 9d34496..522078e 100644 --- a/spice-protocol/Pkgfile +++ b/spice-protocol/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: Thomas Penteker, tek at serverop dot de name=spice-protocol -version=0.12.6 +version=0.12.7 release=1 source=(http://spice-space.org/download/releases/spice-protocol-$version.ta…

1 0

ports/opt (3.1): spice-protocol: 0.12.6 -> 0.12.7
by crux＠crux.nu 01 Oct '14

01 Oct '14

commit b3c85ff20b3e448a67e3370610d1f794213acd52 Author: Thomas Penteker <tek(a)serverop.de> Date: Wed Oct 1 11:07:30 2014 +0200 spice-protocol: 0.12.6 -> 0.12.7 diff --git a/spice-protocol/.md5sum b/spice-protocol/.md5sum index 17033f9..fd6be71 100644 --- a/spice-protocol/.md5sum +++ b/spice-protocol/.md5sum @@ -1 +1 @@ -797d18156ab893e48778cb097b21bb2b spice-protocol-0.12.6.tar.bz2 +799707321e88df4ecd17c4ccb0cc4ffe spice-protocol-0.12.7.tar.bz2 diff --git a/spice-protocol/Pkgfile b/spice-protocol/Pkgfile index 9d34496..522078e 100644 --- a/spice-protocol/Pkgfile +++ b/spice-protocol/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: Thomas Penteker, tek at serverop dot de name=spice-protocol -version=0.12.6 +version=0.12.7 release=1 source=(http://spice-space.org/download/releases/spice-protocol-$version.ta…

1 0

ports/contrib (3.0): spice-gtk: 0.23 -> 0.24
by crux＠crux.nu 01 Oct '14

01 Oct '14

commit b1b65b05486a8913fe9399a425495c38119cc19d Author: Thomas Penteker <tek(a)serverop.de> Date: Tue Sep 30 21:38:48 2014 +0200 spice-gtk: 0.23 -> 0.24 (cherry picked from commit 6ca5d9c05df69cd11fc4320b8e1265ce5baf24d2) diff --git a/spice-gtk/.footprint b/spice-gtk/.footprint index 025e92e..c4bad5d 100644 --- a/spice-gtk/.footprint +++ b/spice-gtk/.footprint @@ -1,5 +1,6 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/chezdav -rwxr-xr-x root/root usr/bin/spicy -rwxr-xr-x root/root usr/bin/spicy-screenshot -rwxr-xr-x root/root usr/bin/spicy-stats @@ -14,6 +15,7 @@ drwxr-xr-x root/root usr/include/spice-client-glib-2.0/ -rw-r--r-- root/root usr/include/spice-client-glib-2.0/channel-record.h -rw-r--r-- root/root usr/include/spice-client-glib-2.0/channel-smartcard.h -rw-r--r-- root/root usr/include/spice-client-glib-2.0/channel-usbredir.h +-rw-r--r-- root/root usr/include/spice-client-glib-2.0/channel-webdav.h -rw-r--r-- root/root usr/include/spice-client-glib-2.0/smartcard-manager.h -rw-r--r-- root/root usr/include/spice-client-glib-2.0/spice-audio.h -rw-r--r-- root/root usr/include/spice-client-glib-2.0/spice-channel-enums.h @@ -23,7 +25,9 @@ drwxr-xr-x root/root usr/include/spice-client-glib-2.0/ -rw-r--r-- root/root usr/include/spice-client-glib-2.0/spice-option.h -rw-r--r-- root/root usr/include/spice-client-glib-2.0/spice-session.h -rw-r--r-- root/root usr/include/spice-client-glib-2.0/spice-types.h +-rw-r--r-- root/root usr/include/spice-client-glib-2.0/spice-uri.h -rw-r--r-- root/root usr/include/spice-client-glib-2.0/spice-util.h +-rw-r--r-- root/root usr/include/spice-client-glib-2.0/spice-version.h -rw-r--r-- root/root usr/include/spice-client-glib-2.0/usb-device-manager.h drwxr-xr-x root/root usr/include/spice-client-gtk-3.0/ -rw-r--r-- root/root usr/include/spice-client-gtk-3.0/spice-grabsequence.h @@ -34,6 +38,12 @@ drwxr-xr-x root/root usr/include/spice-client-gtk-3.0/ drwxr-xr-x root/root usr/include/spice-controller/ -rw-r--r-- root/root usr/include/spice-controller/spice-controller.h drwxr-xr-x root/root usr/lib/ +drwxr-xr-x root/root usr/lib/gir-1.0/ +-rw-r--r-- root/root usr/lib/gir-1.0/SpiceClientGLib-2.0.gir +-rw-r--r-- root/root usr/lib/gir-1.0/SpiceClientGtk-3.0.gir +drwxr-xr-x root/root usr/lib/girepository-1.0/ +-rw-r--r-- root/root usr/lib/girepository-1.0/SpiceClientGLib-2.0.typelib +-rw-r--r-- root/root usr/lib/girepository-1.0/SpiceClientGtk-3.0.typelib -rw-r--r-- root/root usr/lib/libspice-client-glib-2.0.a -rwxr-xr-x root/root usr/lib/libspice-client-glib-2.0.la lrwxrwxrwx root/root usr/lib/libspice-client-glib-2.0.so -> libspice-client-glib-2.0.so.8.5.0 @@ -53,6 +63,11 @@ drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/spice-client-glib-2.0.pc -rw-r--r-- root/root usr/lib/pkgconfig/spice-client-gtk-3.0.pc -rw-r--r-- root/root usr/lib/pkgconfig/spice-controller.pc +drwxr-xr-x root/root usr/lib/udev/ +drwxr-xr-x root/root usr/lib/udev/rules.d/ +-rw-r--r-- root/root usr/lib/udev/rules.d/70-spice-webdavd.rules drwxr-xr-x root/root usr/lib/vala/ drwxr-xr-x root/root usr/lib/vala/vapi/ -rw-r--r-- root/root usr/lib/vala/vapi/spice-protocol.vapi +drwxr-xr-x root/root usr/sbin/ +-rwxr-xr-x root/root usr/sbin/spice-webdavd diff --git a/spice-gtk/.md5sum b/spice-gtk/.md5sum index 2cf4d4f..d7372f6 100644 --- a/spice-gtk/.md5sum +++ b/spice-gtk/.md5sum @@ -1 +1 @@ -575c6f532067e4003754e9b050a27bec spice-gtk-0.23.tar.bz2 +b1dec0cc3d8253deea70cfcfcce334b6 spice-gtk-0.24.tar.bz2 diff --git a/spice-gtk/Pkgfile b/spice-gtk/Pkgfile index d701cf0..79f0281 100644 --- a/spice-gtk/Pkgfile +++ b/spice-gtk/Pkgfile @@ -4,7 +4,7 @@ # Depends on: gtk3 openssl celt51 cyrus-sasl name=spice-gtk -version=0.23 +version=0.24 release=1 source=(http://spice-space.org/download/gtk/spice-gtk-$version.tar.bz2) @@ -21,6 +21,6 @@ build() { make make DESTDIR=$PKG install - rm -rf $PKG/usr/{lib/gtk-doc/,share} + rm -rf $PKG/usr/{lib/gtk-doc/,lib/systemd,share} }

1 0

ports/contrib (3.0): spice: 0.12.4 -> 0.12.5
by crux＠crux.nu 01 Oct '14

01 Oct '14

commit b953508e1c2be79e1480694ac24cb3b6ae186d01 Author: Thomas Penteker <tek(a)serverop.de> Date: Tue Sep 30 21:41:16 2014 +0200 spice: 0.12.4 -> 0.12.5 (cherry picked from commit c6c48674a21f39b94b87c530993269efa28291e8) diff --git a/spice/.footprint b/spice/.footprint index a88a511..33d5448 100644 --- a/spice/.footprint +++ b/spice/.footprint @@ -6,8 +6,8 @@ drwxr-xr-x root/root usr/include/spice-server/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libspice-server.a -rwxr-xr-x root/root usr/lib/libspice-server.la -lrwxrwxrwx root/root usr/lib/libspice-server.so -> libspice-server.so.1.8.0 -lrwxrwxrwx root/root usr/lib/libspice-server.so.1 -> libspice-server.so.1.8.0 --rwxr-xr-x root/root usr/lib/libspice-server.so.1.8.0 +lrwxrwxrwx root/root usr/lib/libspice-server.so -> libspice-server.so.1.9.0 +lrwxrwxrwx root/root usr/lib/libspice-server.so.1 -> libspice-server.so.1.9.0 +-rwxr-xr-x root/root usr/lib/libspice-server.so.1.9.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/spice-server.pc diff --git a/spice/.md5sum b/spice/.md5sum index 0f55d1d..2e576dc 100644 --- a/spice/.md5sum +++ b/spice/.md5sum @@ -1 +1 @@ -325b1c42ce24e75de45a75876b73a8bd spice-0.12.4.tar.bz2 +1256286214fe402703c0a01bd3a85319 spice-0.12.5.tar.bz2 diff --git a/spice/Pkgfile b/spice/Pkgfile index 4365a00..9432c54 100644 --- a/spice/Pkgfile +++ b/spice/Pkgfile @@ -4,7 +4,7 @@ # Depends on: glib celt51 alsa-lib xorg-libpixman openssl libjpeg-turbo zlib pyparsing cyrus-sasl name=spice -version=0.12.4 +version=0.12.5 release=1 source=(http://spice-space.org/download/releases/spice-$version.tar.bz2)

1 0