May 2009 - openSUSE Commits - openSUSE Mailing Lists

commit nbd for openSUSE:Factory
by root＠Hilbert.suse.de 04 May '09

04 May '09

Hello community, here is the log from the commit of package nbd for openSUSE:Factory checked in at Mon May 4 18:30:32 CEST 2009. -------- --- nbd/nbd.changes 2008-08-20 08:17:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/nbd/nbd.changes 2009-05-04 13:38:00.000000000 +0200 @@ -1,0 +2,12 @@ +Mon May 4 10:40:15 CEST 2009 - ms(a)suse.de + +- Update to nbd-2.9.12: + * use atoll instead of atol ... so that multi-terabyte exports work, too + * Change meaning of -swap option: rather than trying to use a kernel patch + which has been effectively dead since sometime around 2.1.something, do an + mlockall() so that the kernel won't throw us out. The MCL_CURRENT | MCL_FUTURE + bit might prove to be problematic, but if so, we'll deal with it when + we get there + * Use right printf() format string + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- nbd-2.9.11.tar.bz2 nbd-2.9.5-doc.diff nbd-2.9.5-warn.diff New: ---- nbd-2.9.12-doc.diff nbd-2.9.12.tar.bz2 nbd-2.9.12-warn.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nbd.spec ++++++ --- /var/tmp/diff_new_pack.gU4751/_old 2009-05-04 18:29:36.000000000 +0200 +++ /var/tmp/diff_new_pack.gU4751/_new 2009-05-04 18:29:36.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package nbd (Version 2.9.11) +# spec file for package nbd (Version 2.9.12) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,15 +21,15 @@ Name: nbd BuildRequires: doxygen glib2-devel PreReq: %insserv_prereq coreutils -Version: 2.9.11 +Version: 2.9.12 Release: 1 License: GPL v2 or later Group: Productivity/Networking/Other AutoReqProv: on Source: %{name}-%{version}.tar.bz2 Source2: init.nbd-server -Patch2: nbd-2.9.5-warn.diff -Patch3: nbd-2.9.5-doc.diff +Patch2: nbd-2.9.12-warn.diff +Patch3: nbd-2.9.12-doc.diff Summary: Network Block Device Server and Client Utilities Url: http://nbd.sourceforge.net/ Prefix: /usr @@ -166,8 +166,16 @@ %preun %{stop_on_removal nbd-server} - %changelog +* Mon May 04 2009 ms(a)suse.de +- Update to nbd-2.9.12: + * use atoll instead of atol ... so that multi-terabyte exports work, too + * Change meaning of -swap option: rather than trying to use a kernel patch + which has been effectively dead since sometime around 2.1.something, do an + mlockall() so that the kernel won't throw us out. The MCL_CURRENT | MCL_FUTURE + bit might prove to be problematic, but if so, we'll deal with it when + we get there + * Use right printf() format string * Wed Aug 20 2008 garloff(a)suse.de - Update to nbd-2.9.11: * nbd-client: new option -c to check for connection, -d to @@ -178,7 +186,7 @@ - Update to nbd-2.9.9: * Document -C option of nbd-server. * Fix name of /var/run/ file. -* Thu Nov 08 2007 garloff(a)suse.de +* Wed Nov 07 2007 garloff(a)suse.de - Split nbd into nbd and nbd-doc packages. - Update to nbd-2.9.8: * nbd-server can now setuid to specified user and group. @@ -254,7 +262,7 @@ * Tue Dec 20 2005 garloff(a)suse.de - Update to nbd-2.8.2: * Enable LFS by default. -* Thu Nov 03 2005 dmueller(a)suse.de +* Wed Nov 02 2005 dmueller(a)suse.de - don't build as root * Fri Oct 28 2005 garloff(a)suse.de - Update to version 2.8.1. ++++++ nbd-2.9.5-doc.diff -> nbd-2.9.12-doc.diff ++++++ ++++++ nbd-2.9.11.tar.bz2 -> nbd-2.9.12.tar.bz2 ++++++ ++++ 10315 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nbd-2.9.11/cliserv.h new/nbd-2.9.12/cliserv.h --- old/nbd-2.9.11/cliserv.h 2008-05-01 20:56:34.000000000 +0200 +++ new/nbd-2.9.12/cliserv.h 2009-04-30 14:49:38.000000000 +0200 @@ -42,8 +42,13 @@ #include "nbd.h" #endif #ifdef NBD_H_LINUX -#include <linux/types.h> -#include <linux/nbd.h> +# ifdef HAVE_LINUX_TYPES_H +# include <linux/types.h> +# else +# define __be32 u32 +# define __be64 u64 +# endif +# include <linux/nbd.h> #endif #if NBD_LFS==1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nbd-2.9.11/CodingStyle new/nbd-2.9.12/CodingStyle --- old/nbd-2.9.11/CodingStyle 2008-05-01 20:56:34.000000000 +0200 +++ new/nbd-2.9.12/CodingStyle 1970-01-01 01:00:00.000000000 +0100 @@ -1,46 +0,0 @@ -NBD Coding style. -================= - -The following expresses my opinion of what C code should look like. I'm -not as strict as the Kernel maintainers on this one (NBD isn't even -remotely as large anyway), but code that does not follow these rules -needs to be updated so that it does, which is useless time wasted for -me. Therefore, it's appreciated if you would follow these rules. - -Thanks. - -* Use a tab width of 8 characters. You may use tab or 8 spaces as you - please, it doesn't really matter to me. -* opening curly brackets occur on the same line as whatever they're - curly brackets for, _in all cases_. This includes function - definitions, if structures, loops, and so on; every code block appears - like so: - -int foo(int bar) { - ... -} - -* Variable declarations are separated from the rest of a function block - by a line of whitespace. It's okay to assign a value to a variable - when you're declaring it if you can do that on one line of code, but - it must still be in the block of declarations at the top with a - whiteline below. -* Variables are declared one on each line. So no - - int foo, bar; - - use - - int foo; - int bar; - - instead. -* Try to fit everything in 80 columns. This goes especially for comment - lines, but may be relaxed for function calls with 79 arguments, or so, - if that's not feasible. -* If your function block is more than three or so screenfulls, there's a - hint that you should break it up. - -It is true that not all of the code currently follows these rules; but -that should not stop you from following them for new code, or from -cleaning up if you can (i.e., you have commit rights). diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nbd-2.9.11/config.h.in new/nbd-2.9.12/config.h.in --- old/nbd-2.9.11/config.h.in 2008-05-01 21:09:04.000000000 +0200 +++ new/nbd-2.9.12/config.h.in 2009-04-30 15:06:07.000000000 +0200 @@ -1,5 +1,8 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* Define if building universal (internal helper macro) */ +#undef AC_APPLE_UNIVERSAL_BUILD + /* Define if you want a debugging version of nbd-server (lots of copious output) */ #undef DODBG @@ -25,6 +28,9 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H +/* Define to 1 if you have the <linux/types.h> header file. */ +#undef HAVE_LINUX_TYPES_H + /* Define to 1 if you have the `llseek' function. */ #undef HAVE_LLSEEK @@ -131,14 +137,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Define to 1 if the C compiler supports function prototypes. */ -#undef PROTOTYPES - -/* Define to 1 if the `setvbuf' function takes the buffering type as its - second argument and the buffer pointer as the third, as on System V before - release 3. */ -#undef SETVBUF_REVERSED - /* The size of `unsigned int', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_INT @@ -160,12 +158,17 @@ /* Define to 1 if you have and want support for the Socket Direct Protocol */ #undef WITH_SDP -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ -#undef WORDS_BIGENDIAN - -/* Define like PROTOTYPES; this can be used by system headers. */ -#undef __PROTOTYPES +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +# undef WORDS_BIGENDIAN +# endif +#endif /* Define to empty if `const' does not conform to ANSI C. */ #undef const diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nbd-2.9.11/configure.ac new/nbd-2.9.12/configure.ac --- old/nbd-2.9.11/configure.ac 2008-05-01 21:06:14.000000000 +0200 +++ new/nbd-2.9.12/configure.ac 2009-04-30 15:04:43.000000000 +0200 @@ -1,7 +1,7 @@ dnl Configure script for NBD system dnl (c) 1998 Martin Mares <mj(a)ucw.cz>, (c) 2000 Pavel Machek <pavel(a)ucw.cz>, dnl (c) 2003-2006 Wouter Verhelst <wouter(a)debian.org> -AC_INIT([nbd],[2.9.11],[wouter(a)debian.org]) +AC_INIT([nbd],[2.9.12],[wouter(a)debian.org]) AM_INIT_AUTOMAKE(foreign dist-bzip2) AM_MAINTAINER_MODE @@ -82,40 +82,6 @@ ] ) -AC_MSG_CHECKING(for klcc) -AC_ARG_WITH( - klcc, - AC_HELP_STRING(--with-klcc,[Build a version of nbd-client against klibc (for initramfs uses). Specify the path to 'klcc' (default autodetected)]), - [ - if test "x$withval" != "x"; then - if test -x "$withval"; then - KLCC="$withval" - sbin_PROGRAMS=knbd-client - AC_MSG_RESULT($KLCC) - else - AC_MSG_ERROR("specified klcc is not executable or does not exist.") - fi - else - if test -x /usr/bin/klcc; then - KLCC=/usr/bin/klcc - sbin_PROGRAMS=knbd-client - AC_MSG_RESULT($KLCC) - else - AC_MSG_ERROR("klcc not found! Please specify it as a parameter to the --with-klcc option"); - fi - fi - ], - [ if test -x /usr/bin/klcc; then - sbin_PROGRAMS=knbd-client - KLCC=/usr/bin/klcc - AC_MSG_RESULT($KLCC) - else - AC_MSG_RESULT(not found) - fi - ] -) -AC_SUBST(KLCC) - AC_PROG_CC AC_PROG_CPP AC_PROG_INSTALL @@ -194,7 +160,7 @@ AC_CHECK_HEADERS([sys/mount.h],,, [[#include <sys/param.h> ]]) -AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h sys/ioctl.h sys/socket.h syslog.h]) +AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h sys/ioctl.h sys/socket.h syslog.h linux/types.h]) AM_PATH_GLIB_2_0(2.6.0, [HAVE_GLIB=yes], AC_MSG_ERROR([Missing glib])) AC_HEADER_SYS_WAIT AC_TYPE_OFF_T @@ -203,6 +169,6 @@ nbd_server_CPPFLAGS=$nbd_server_CPPFLAGS" -DSYSCONFDIR='\"$sysconfdir\"'" AC_SUBST(nbd_server_CPPFLAGS) AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_FILES([Makefile Doxyfile nbd-server.1 nbd-server.5]) +AC_CONFIG_FILES([Makefile Doxyfile nbd-server.1 nbd-server.5 nbd-client.8]) AC_OUTPUT diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nbd-2.9.11/gznbd/.gitignore new/nbd-2.9.12/gznbd/.gitignore --- old/nbd-2.9.11/gznbd/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/nbd-2.9.12/gznbd/.gitignore 2009-01-03 13:59:46.000000000 +0100 @@ -0,0 +1 @@ +gznbd diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nbd-2.9.11/Makefile.am new/nbd-2.9.12/Makefile.am --- old/nbd-2.9.11/Makefile.am 2008-05-01 20:56:34.000000000 +0200 +++ new/nbd-2.9.12/Makefile.am 2009-04-30 14:49:38.000000000 +0200 @@ -1,31 +1,30 @@ bin_PROGRAMS = nbd-server EXTRA_PROGRAMS = nbd-client knbd-client -TESTS = $(srcdir)/simple_test +TESTS_ENVIRONMENT=$(srcdir)/simple_test +TESTS = cmd cfg1 cfgmulti check_PROGRAMS = nbd-tester-client knbd_client_SOURCES = nbd-client.c cliserv.h nbd_client_SOURCES = nbd-client.c cliserv.h -nbd_server_SOURCES = nbd-server.c cliserv.h +nbd_server_SOURCES = nbd-server.c cliserv.h lfs.h nbd_tester_client_SOURCES = nbd-tester-client.c cliserv.h nbd_server_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@ nbd_tester_client_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@ nbd_server_LDADD = @GLIB_LIBS@ nbd_tester_client_LDADD = @GLIB_LIBS@ man_MANS = nbd-server.1 nbd-server.5 nbd-client.8 -EXTRA_DIST = nbd-client.8.sgml nbd-server.1.sgml nbd-server.5.sgml gznbd winnbd lfs.h nbd-client.8 CodingStyle simple_test INSTALL -MAINTAINERCLEANFILES = nbd-client.8 nbd-server.1 -nbd-server.1.in: nbd-server.1.sgml - docbook2man nbd-server.1.sgml +EXTRA_DIST = nbd-client.8.sgml nbd-server.1.sgml nbd-server.5.sgml gznbd simple_test +MAINTAINERCLEANFILES = nbd-client.8 nbd-server.1 nbd-server.5 +nbd-server.1.in: $(srcdir)/nbd-server.1.sgml + LC_ALL=C docbook2man nbd-server.1.sgml mv NBD-SERVER.1 nbd-server.1.in -nbd-client.8: nbd-client.8.sgml - docbook2man nbd-client.8.sgml - mv NBD-CLIENT.8 nbd-client.8 -nbd-server.5.in: nbd-server.5.sgml - docbook2man nbd-server.5.sgml +nbd-client.8.in: $(srcdir)/nbd-client.8.sgml + LC_ALL=C docbook2man nbd-client.8.sgml + mv NBD-CLIENT.8 nbd-client.8.in +nbd-server.5.in: $(srcdir)/nbd-server.5.sgml + LC_ALL=C docbook2man nbd-server.5.sgml mv NBD-SERVER.5 nbd-server.5.in dist-hook: rm -Rf `find $(distdir) -name '.svn' -type d -print` -knbd_client-nbd-client.o: nbd-client.c - $(KLCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(knbd_client_CPPFLAGS) $(CPPFLAGS) $(knbd_client_CFLAGS) $(CFLAGS) -c -o knbd_client-nbd-client.o nbd-client.c -knbd-client$(EXEEXT): knbd_client-nbd-client.o $(knbd_client_DEPENDENCIES) - @rm -f knbd-client$(EXEEXT) - $(LINK) $(knbd_client_LDFLAGS) knbd_client-nbd-client.o $(knbd_client_LDADD) $(LIBS) +cmd: +cfg1: +cfgmulti: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nbd-2.9.11/nbd-client.8 new/nbd-2.9.12/nbd-client.8 --- old/nbd-2.9.11/nbd-client.8 2008-05-01 21:07:08.000000000 +0200 +++ new/nbd-2.9.12/nbd-client.8 1970-01-01 01:00:00.000000000 +0100 @@ -1,135 +0,0 @@ -.\" This manpage has been automatically generated by docbook2man -.\" from a DocBook document. This tool can be found at: -.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> -.\" Please send any bug reports, improvements, comments, patches, -.\" etc. to Steve Cheng <steve(a)ggi-project.org>. -.TH "NBD-CLIENT" "8" "01 mei 2008" "" "" - -.SH NAME -nbd-client \- connect to a server running nbd-server(1), to use its exported block device -.SH SYNOPSIS - -\fBnbd-client\fR [ \fBbs=\fIblocksize\fB\fR ] [ \fBtimeout=\fIseconds\fB\fR ] \fB\fIhost\fB\fR \fB\fIport\fB\fR \fB\fInbd-device\fB\fR [ \fB-sdp\fR ] [ \fB-swap\fR ] [ \fB-persist\fR ] - - -\fBnbd-client\fR \fB-d \fInbd-device\fB\fR - - -\fBnbd-client\fR \fB-c \fInbd-device\fB\fR - -.SH "DESCRIPTION" -.PP -With \fBnbd-client\fR, you can connect to a -server running \fBnbd-server\fR, thus using raw -diskspace from that server as a blockdevice on the local -client. -.PP -To do this, support from the Linux Kernel is necessary, in -the form of the Network Block Device (NBD). When you have that, -either in the kernel, or as a module, you can connect to an NBD -server and use its exported file through a block special file with -major mode 43. -.SH "OPTIONS" -.PP -The following options are supported: -.TP -\fBbs=\fIblocksize\fB\fR -Use a blocksize of "blocksize". Default is 1024; -allowed values are either 512, 1024, 2048 or 4096 -.TP -\fBhost\fR -The hostname of the machine running -\fBnbd-server\fR\&. -.TP -\fBtimeout=\fIseconds\fB\fR -Set the connection timeout to "seconds". For this to -work, you need a kernel with support for the NBD_SET_TIMEOUT -ioctl; this was introduced into Linus' tree on 2007-10-11, -and will be part of kernel 2.6.24. -.TP -\fBport\fR -The TCP port on which \fBnbd-server\fR is -running at the server. -.TP -\fBnbd-device\fR -The block special file this nbd-client should connect -to. -.TP -\fB-c\fR -Check whether the specified nbd device is -connected. - -If the device is connected, nbd-client will exit -with an exit state of 0 and print the PID of the nbd-client -instance that connected it to stdout. - -If the device is not -connected or does not exist (for example because the nbd -module was not loaded), nbd-client will exit with an exit -state of 1 and not print anything on stdout. - -If an error occurred, nbd-client will exit with an exit -state of 2, and not print anything on stdout either. -.TP -\fB-d\fR -Disconnect the specified nbd device from the -server -.TP -\fB-persist\fR -When this option is specified, nbd-client will -immediately try to reconnect an nbd device if the -connection ever drops unexpectedly due to a lost -server or something similar. -.TP -\fB-sdp\fR -Connect to the server using the Socket Direct Protocol -(SDP), rather than IP. See nbd-server(1) for details. -.TP -\fB-swap\fR -Specifies that this NBD device will be used as -swapspace. If you intend to do that, please use this -option to prevent deadlocks. You'll need a special kernel -patch, available at NBD's homepage: -http://atrey.karlin.mff.cuni.cz/~pavel -.SH "EXAMPLES" -.PP -Some examples of nbd-client usage: -.TP 0.2i -\(bu -To connect to a server running on port 2000 at host -"server.domain.com", using the client's block special file -"/dev/nb0": - -\fBnbd-client server.domain.com 2000 -/dev/nb0\fR -.TP 0.2i -\(bu -To connect to a server running on port 2001 at host -"swapserver.domain.com", using the client's block special -file "/dev/nb1", for swap purposes: - -\fBnbd-client swapserver.domain.com 2001 /dev/nb1 --swap\fR -.TP 0.2i -\(bu -To disconnect the above connection again (after making -sure the block special file is not in use anymore): - -\fBnbd-client -d /dev/nb1\fR -.SH "SEE ALSO" -.PP -nbd-server (1). -.SH "AUTHOR" -.PP -The NBD kernel module and the NBD tools have been written by -Pavel Macheck (pavel(a)ucw.cz). -.PP -The kernel module is now maintained by Paul Clements -(Paul.Clements(a)steeleye.com), while the userland tools are maintained by -Wouter Verhelst (wouter(a)debian.org) -.PP -This manual page was written by Wouter Verhelst (<wouter(a)debian.org>) for -the Debian GNU/Linux system (but may be used by others). Permission is -granted to copy, distribute and/or modify this document under the -terms of the GNU General Public License, -version 2, as published by the Free Software Foundation. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nbd-2.9.11/nbd-client.8.in new/nbd-2.9.12/nbd-client.8.in --- old/nbd-2.9.11/nbd-client.8.in 1970-01-01 01:00:00.000000000 +0100 +++ new/nbd-2.9.12/nbd-client.8.in 2009-04-30 14:52:55.000000000 +0200 @@ -0,0 +1,135 @@ +.\" This manpage has been automatically generated by docbook2man +.\" from a DocBook document. This tool can be found at: +.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> +.\" Please send any bug reports, improvements, comments, patches, +.\" etc. to Steve Cheng <steve(a)ggi-project.org>. +.TH "NBD-CLIENT" "8" "30 April 2009" "" "" + +.SH NAME +nbd-client \- connect to a server running nbd-server(1), to use its exported block device +.SH SYNOPSIS + +\fBnbd-client\fR [ \fBbs=\fIblocksize\fB\fR ] [ \fBtimeout=\fIseconds\fB\fR ] \fB\fIhost\fB\fR \fB\fIport\fB\fR \fB\fInbd-device\fB\fR [ \fB-sdp\fR ] [ \fB-swap\fR ] [ \fB-persist\fR ] + + +\fBnbd-client\fR \fB-d \fInbd-device\fB\fR + + +\fBnbd-client\fR \fB-c \fInbd-device\fB\fR + +.SH "DESCRIPTION" +.PP +With \fBnbd-client\fR, you can connect to a +server running \fBnbd-server\fR, thus using raw +diskspace from that server as a blockdevice on the local +client. +.PP +To do this, support from the Linux Kernel is necessary, in +the form of the Network Block Device (NBD). When you have that, +either in the kernel, or as a module, you can connect to an NBD +server and use its exported file through a block special file with +major mode 43. +.SH "OPTIONS" +.PP +The following options are supported: +.TP +\fBbs=\fIblocksize\fB\fR +Use a blocksize of "blocksize". Default is 1024; +allowed values are either 512, 1024, 2048 or 4096 +.TP +\fBhost\fR +The hostname of the machine running +\fBnbd-server\fR\&. +.TP +\fBtimeout=\fIseconds\fB\fR +Set the connection timeout to "seconds". For this to +work, you need a kernel with support for the NBD_SET_TIMEOUT +ioctl; this was introduced into Linus' tree on 2007-10-11, +and will be part of kernel 2.6.24. +.TP +\fBport\fR +The TCP port on which \fBnbd-server\fR is +running at the server. +.TP +\fBnbd-device\fR +The block special file this nbd-client should connect +to. +.TP +\fB-c\fR +Check whether the specified nbd device is +connected. + +If the device is connected, nbd-client will exit +with an exit state of 0 and print the PID of the nbd-client +instance that connected it to stdout. + +If the device is not +connected or does not exist (for example because the nbd +module was not loaded), nbd-client will exit with an exit +state of 1 and not print anything on stdout. + +If an error occurred, nbd-client will exit with an exit +state of 2, and not print anything on stdout either. +.TP +\fB-d\fR +Disconnect the specified nbd device from the +server +.TP +\fB-persist\fR +When this option is specified, nbd-client will +immediately try to reconnect an nbd device if the +connection ever drops unexpectedly due to a lost +server or something similar. +.TP +\fB-sdp\fR +Connect to the server using the Socket Direct Protocol +(SDP), rather than IP. See nbd-server(1) for details. +.TP +\fB-swap\fR +Specifies that this NBD device will be used as +swapspace. If you intend to do that, please use this +option to prevent deadlocks. You'll need a special kernel +patch, available at NBD's homepage: +http://atrey.karlin.mff.cuni.cz/~pavel +.SH "EXAMPLES" +.PP +Some examples of nbd-client usage: +.TP 0.2i +\(bu +To connect to a server running on port 2000 at host +"server.domain.com", using the client's block special file +"/dev/nb0": + +\fBnbd-client server.domain.com 2000 +/dev/nb0\fR +.TP 0.2i +\(bu +To connect to a server running on port 2001 at host +"swapserver.domain.com", using the client's block special +file "/dev/nb1", for swap purposes: + +\fBnbd-client swapserver.domain.com 2001 /dev/nb1 +-swap\fR +.TP 0.2i +\(bu +To disconnect the above connection again (after making +sure the block special file is not in use anymore): + +\fBnbd-client -d /dev/nb1\fR +.SH "SEE ALSO" +.PP +nbd-server (1). +.SH "AUTHOR" +.PP +The NBD kernel module and the NBD tools have been written by +Pavel Macheck (pavel(a)ucw.cz). +.PP +The kernel module is now maintained by Paul Clements +(Paul.Clements(a)steeleye.com), while the userland tools are maintained by +Wouter Verhelst (wouter(a)debian.org) +.PP +This manual page was written by Wouter Verhelst (<wouter(a)debian.org>) for +the Debian GNU/Linux system (but may be used by others). Permission is +granted to copy, distribute and/or modify this document under the +terms of the GNU General Public License, +version 2, as published by the Free Software Foundation. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nbd-2.9.11/nbd-client.8.sgml new/nbd-2.9.12/nbd-client.8.sgml --- old/nbd-2.9.11/nbd-client.8.sgml 2008-05-01 20:56:34.000000000 +0200 +++ new/nbd-2.9.12/nbd-client.8.sgml 2009-04-30 14:49:38.000000000 +0200 @@ -13,7 +13,7 @@ <!ENTITY dhfirstname "<firstname>Wouter</firstname>"> <!ENTITY dhsurname "<surname>Verhelst</surname>">  - <!ENTITY dhdate "<date>$Date: 2008-03-31 10:18:51 +0200 (ma, 31 mrt 2008) $</date>"> + <!ENTITY dhdate "<date>$Date$</date>">  <!ENTITY dhsection "<manvolnum>8</manvolnum>"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nbd-2.9.11/nbd-client.c new/nbd-2.9.12/nbd-client.c --- old/nbd-2.9.11/nbd-client.c 2008-05-01 20:56:34.000000000 +0200 +++ new/nbd-2.9.12/nbd-client.c 2009-04-30 14:49:38.000000000 +0200 @@ -28,6 +28,7 @@ #include <syslog.h> #include <stdlib.h> #include <sys/mount.h> +#include <sys/mman.h> #include <errno.h> #ifndef __GNUC__ @@ -185,6 +186,9 @@ if (ioctl(nbd, NBD_SET_SOCK, sock) < 0) err("Ioctl NBD_SET_SOCK failed: %m\n"); +/* + * If anyone ever forward-patches this patch, I'll happily re-enable + * this code. Until then... #ifndef SO_SWAPPING if (swap) err("You have to compile me on machine with swapping patch enabled in order to use it later."); @@ -193,6 +197,8 @@ if (setsockopt(sock, SOL_SOCKET, SO_SWAPPING, &one, sizeof(int)) < 0) err("Could not enable swapping: %m"); #endif +*/ + mlockall(MCL_CURRENT | MCL_FUTURE); } int main(int argc, char *argv[]) { @@ -222,7 +228,7 @@ } ++argv; --argc; /* skip programname */ - + if (strcmp(argv[0], "-d")==0) { nbd = open(argv[1], O_RDWR); if (nbd < 0) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nbd-2.9.11/nbd-server.1.in new/nbd-2.9.12/nbd-server.1.in --- old/nbd-2.9.11/nbd-server.1.in 2008-05-01 20:57:19.000000000 +0200 +++ new/nbd-2.9.12/nbd-server.1.in 2009-04-30 14:49:38.000000000 +0200 @@ -3,13 +3,13 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve(a)ggi-project.org>. -.TH "NBD-SERVER" "1" "01 mei 2008" "" "" +.TH "NBD-SERVER" "1" "03 January 2009" "" "" .SH NAME nbd-server \- serve a file as a block device to other computers running the GNU/Linux(tm) or GNU/Hurd Operating System .SH SYNOPSIS -\fBnbd-server \fR \fB\fI[ip:]port\fB\fR \fB\fIfilename\fB\fR [ \fB\fIsize\fB\fR ] [ \fB-r\fR ] [ \fB-m\fR ] [ \fB-c\fR ] [ \fB-a \fItimeout\fB\fR ] [ \fB-l \fIhost list\fB\fR ] [ \fB-o \fIsection name\fB\fR ] [ \fB-C \fIconfig file\fB\fR ] +\fBnbd-server \fR \fB\fI[ip:]port\fB\fR \fB\fIfilename\fB\fR [ \fB\fIsize\fB\fR ] [ \fB-r\fR ] [ \fB-m\fR ] [ \fB-c\fR ] [ \fB-a \fItimeout\fB\fR ] [ \fB-l \fIhost list filename\fB\fR ] [ \fB-o \fIsection name\fB\fR ] [ \fB-C \fIconfig file\fB\fR ] .SH "DESCRIPTION" .PP @@ -106,7 +106,7 @@ avoid stale nbd-server processes staying in memory. Use of this option is strongly recommended. .TP -\fBhost list\fR +\fBhost list filename\fR This argument should contain a list of IP-addresses for hosts that may connect to the server. Wildcards are \fBnot\fR allowed. If the file does not diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nbd-2.9.11/nbd-server.1.sgml new/nbd-2.9.12/nbd-server.1.sgml --- old/nbd-2.9.11/nbd-server.1.sgml 2008-05-01 20:56:34.000000000 +0200 +++ new/nbd-2.9.12/nbd-server.1.sgml 2009-04-30 14:49:38.000000000 +0200 @@ -13,7 +13,7 @@ <!ENTITY dhfirstname "<firstname>Wouter</firstname>"> <!ENTITY dhsurname "<surname>Verhelst</surname>">  - <!ENTITY dhdate "<date>$Date: 2007-10-30 11:35:12 +0100 (di, 30 okt 2007) $</date>"> + <!ENTITY dhdate "<date>$Date$</date>">  <!ENTITY dhsection "<manvolnum>1</manvolnum>"> @@ -64,7 +64,7 @@ <arg><option>-m</option></arg> <arg><option>-c</option></arg> <arg><option>-a <replaceable>timeout</replaceable></option></arg> - <arg><option>-l <replaceable>host list</replaceable></option></arg> + <arg><option>-l <replaceable>host list filename</replaceable></option></arg> <arg><option>-o <replaceable>section name</replaceable></option></arg> <arg><option>-C <replaceable>config file</replaceable></option></arg> </cmdsynopsis> @@ -196,7 +196,7 @@ </listitem> </varlistentry> <varlistentry> - <term><option>host list</option></term> + <term><option>host list filename</option></term> <listitem> <para>This argument should contain a list of IP-addresses for hosts that may connect to the server. Wildcards are diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nbd-2.9.11/nbd-server.5.in new/nbd-2.9.12/nbd-server.5.in --- old/nbd-2.9.11/nbd-server.5.in 2008-05-01 20:57:20.000000000 +0200 +++ new/nbd-2.9.12/nbd-server.5.in 2009-04-30 14:49:38.000000000 +0200 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve(a)ggi-project.org>. -.TH "NBD-SERVER" "5" "01 mei 2008" "" "" +.TH "NBD-SERVER" "5" "03 January 2009" "" "" .SH NAME /etc/nbd-server/config \- configuration file for nbd-server diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nbd-2.9.11/nbd-server.c new/nbd-2.9.12/nbd-server.c --- old/nbd-2.9.11/nbd-server.c 2008-05-01 21:04:44.000000000 +0200 +++ new/nbd-2.9.12/nbd-server.c 2009-04-30 14:49:38.000000000 +0200 @@ -367,7 +367,7 @@ printf("\tcopyonwrite = true\n"); } if(serve->expected_size) { - printf("\tfilesize = %Ld\n", (long long int)serve->expected_size); + printf("\tfilesize = %lld\n", (long long int)serve->expected_size); } if(serve->authname) { printf("\tauthfile = %s\n", serve->authname); @@ -442,7 +442,7 @@ if (suffix == 'k' || suffix == 'K' || suffix == 'm' || suffix == 'M') optarg[last] = '\0'; - es = (off_t)atol(optarg); + es = (off_t)atoll(optarg); switch (suffix) { case 'm': case 'M': es <<= 10; @@ -512,7 +512,9 @@ CFILE_KEY_MISSING, /**< A (required) key is missing */ CFILE_VALUE_INVALID, /**< A value is syntactically invalid */ CFILE_VALUE_UNSUPPORTED,/**< A value is not supported in this build */ - CFILE_PROGERR /**< Programmer error */ + CFILE_PROGERR, /**< Programmer error */ + CFILE_NO_EXPORTS /**< A config file was specified that does not + define any exports */ } CFILE_ERRORS; /** @@ -573,6 +575,7 @@ GArray *retval=NULL; gchar **groups; gboolean value; + gchar* startgroup; gint i; gint j; @@ -585,7 +588,8 @@ g_key_file_free(cfile); return retval; } - if(strcmp(g_key_file_get_start_group(cfile), "generic")) { + startgroup = g_key_file_get_start_group(cfile); + if(!startgroup || strcmp(startgroup, "generic")) { g_set_error(e, errdomain, CFILE_MISSING_GENERIC, "Config file does not contain the [generic] group!"); g_key_file_free(cfile); return NULL; @@ -703,6 +707,10 @@ } #endif } + if(i==1) { + g_set_error(e, errdomain, CFILE_NO_EXPORTS, "The config file does not specify any exports"); + } + g_key_file_free(cfile); return retval; } @@ -892,7 +900,7 @@ if(maxbytes && len > maxbytes) len = maxbytes; - DEBUG4("(WRITE to fd %d offset %Lu len %u), ", fhandle, foffset, len); + DEBUG4("(WRITE to fd %d offset %llu len %u), ", fhandle, foffset, len); myseek(fhandle, foffset); return write(fhandle, buf, len); @@ -934,7 +942,7 @@ if(maxbytes && len > maxbytes) len = maxbytes; - DEBUG4("(READ from fd %d offset %Lu len %u), ", fhandle, foffset, len); + DEBUG4("(READ from fd %d offset %llu len %u), ", fhandle, foffset, len); myseek(fhandle, foffset); return read(fhandle, buf, len); @@ -971,7 +979,7 @@ if (!(client->server->flags & F_COPYONWRITE)) return(rawexpread_fully(a, buf, len, client)); - DEBUG3("Asked to read %d bytes at %Lu.\n", len, (unsigned long long)a); + DEBUG3("Asked to read %d bytes at %llu.\n", len, (unsigned long long)a); mapl=a/DIFFPAGESIZE; maph=(a+len-1)/DIFFPAGESIZE; @@ -981,12 +989,12 @@ rdlen=(0<DIFFPAGESIZE-offset && len<(size_t)(DIFFPAGESIZE-offset)) ? len : (size_t)DIFFPAGESIZE-offset; if (client->difmap[mapcnt]!=(u32)(-1)) { /* the block is already there */ - DEBUG3("Page %Lu is at %lu\n", (unsigned long long)mapcnt, + DEBUG3("Page %llu is at %lu\n", (unsigned long long)mapcnt, (unsigned long)(client->difmap[mapcnt])); myseek(client->difffile, client->difmap[mapcnt]*DIFFPAGESIZE+offset); if (read(client->difffile, buf, rdlen) != rdlen) return -1; } else { /* the block is not there */ - DEBUG2("Page %Lu is not here, we read the original one\n", + DEBUG2("Page %llu is not here, we read the original one\n", (unsigned long long)mapcnt); if(rawexpread_fully(a, buf, rdlen, client)) return -1; } @@ -1015,7 +1023,7 @@ if (!(client->server->flags & F_COPYONWRITE)) return(rawexpwrite_fully(a, buf, len, client)); - DEBUG3("Asked to write %d bytes at %Lu.\n", len, (unsigned long long)a); + DEBUG3("Asked to write %d bytes at %llu.\n", len, (unsigned long long)a); mapl=a/DIFFPAGESIZE ; maph=(a+len-1)/DIFFPAGESIZE ; @@ -1026,7 +1034,7 @@ len : (size_t)DIFFPAGESIZE-offset; if (client->difmap[mapcnt]!=(u32)(-1)) { /* the block is already there */ - DEBUG3("Page %Lu is at %lu\n", (unsigned long long)mapcnt, + DEBUG3("Page %llu is at %lu\n", (unsigned long long)mapcnt, (unsigned long)(client->difmap[mapcnt])) ; myseek(client->difffile, client->difmap[mapcnt]*DIFFPAGESIZE+offset); @@ -1034,7 +1042,7 @@ } else { /* the block is not there */ myseek(client->difffile,client->difffilelen*DIFFPAGESIZE) ; client->difmap[mapcnt]=(client->server->flags&F_SPARSE)?mapcnt:client->difffilelen++; - DEBUG3("Page %Lu is not here, we put it at %lu\n", + DEBUG3("Page %llu is not here, we put it at %lu\n", (unsigned long long)mapcnt, (unsigned long)(client->difmap[mapcnt])); rdlen=DIFFPAGESIZE ; @@ -1134,7 +1142,7 @@ if (len > BUFSIZE + sizeof(struct nbd_reply)) err("Request too big!"); #ifdef DODBG - printf("%s from %Lu (%Lu) len %d, ", request.type ? "WRITE" : + printf("%s from %llu (%llu) len %d, ", request.type ? "WRITE" : "READ", (unsigned long long)request.from, (unsigned long long)request.from / 512, len); #endif @@ -1257,7 +1265,7 @@ client->exportsize = client->server->expected_size; } - msg3(LOG_INFO, "Size of exported file/device is %Lu", (unsigned long long)client->exportsize); + msg3(LOG_INFO, "Size of exported file/device is %llu", (unsigned long long)client->exportsize); if(multifile) { msg3(LOG_INFO, "Total number of files: %d", i); } @@ -1421,9 +1429,16 @@ for(i=0;i<servers->len;i++) { serve=&(g_array_index(servers, SERVER, i)); if(FD_ISSET(serve->socket, &rset)) { + int sock_flags; if ((net=accept(serve->socket, (struct sockaddr *) &addrin, &addrinlen)) < 0) err("accept: %m"); + if((sock_flags = fcntl(net, F_GETFL, 0))==-1) { + err("fcntl F_GETFL"); + } + if(fcntl(net, F_SETFL, sock_flags &~O_NONBLOCK)==-1) { + err("fcntl F_SETFL ~O_NONBLOCK"); + } client = g_malloc(sizeof(CLIENT)); client->server=serve; client->exportsize=OFFT_MAX; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nbd-2.9.11/README new/nbd-2.9.12/README --- old/nbd-2.9.11/README 2008-05-01 20:56:34.000000000 +0200 +++ new/nbd-2.9.12/README 2009-04-30 14:49:38.000000000 +0200 @@ -109,13 +109,6 @@ If you're packaging NBD for a different operating system that isn't in the above list, I'd like to know about it. -Thanks, and have fun, - -Wouter Verhelst - - - - [1] When you write something to a block device, the kernel will not immediately write that to the physical block device; instead, your changes are written to a cache, which is periodically flushed by a @@ -127,6 +120,26 @@ decides that the cache of the block device your nbd-server is writing to needs to be emptied, then you've got a deadlock. -A kernel patch exists[2] to create a separate kernel thread for NBD -writes which woul fix this problem; however, it has not made it into -mainline yet. +A kernel patch exists to create a separate kernel thread for NBD writes +which woul fix this problem; however, it has not made it into mainline +yet. + +BUILDING THE SERVER FOR NON-LINUX OPERATING SYSTEMS +=================================================== + +Since the client requires kernel-side support, you can't just compile +nbd-client on a non-Linux kernel and hope it'll work; you'd have to +write a kernel-space driver before that would be possible. + +However, nbd-server assumes nothing more than POSIX and one headerfile +from the Linux kernel. Compiling it can be done as follows: +- Fetch the nbd userland sources, and unpack them. Since you're reading + this README file, you have already done this step. +- Fetch the "nbd.h" file from /usr/include/linux on a Linux system, or + from include/linux in the Linux source tree, and store it in the + toplevel directory of the nbd userland sources +- Edit the headerfile, and remove the line that says '#include + <linux/types.h>' (on non-Linux systems, the userland source is smart + enough to figure out how this works by itself) +- now it's just a regular './configure && make && sudo make install' + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nbd-2.9.11/simple_test new/nbd-2.9.12/simple_test --- old/nbd-2.9.11/simple_test 2008-05-01 20:56:34.000000000 +0200 +++ new/nbd-2.9.12/simple_test 2009-04-30 14:49:38.000000000 +0200 @@ -6,43 +6,83 @@ # Create a one-meg device dd if=/dev/zero of=$tmpnam bs=1024 count=1024 -./nbd-server -C /dev/null -p `pwd`/nbd-server.pid 11111 $tmpnam & -# -p only works if nbd-server wasn't compiled with -DNOFORK or -DNODAEMON, -# which I sometimes do for testing and debugging. -PID=$! -sleep 1 -./nbd-tester-client localhost 11111 -retval=$? -if [ -f nbd-server.pid ] -then - kill `cat nbd-server.pid` -else - kill $PID -fi -rm -f nbd-server.pid -if [ $retval -ne 0 ] -then - rm -f $tmpnam - exit $retval -fi -cat > nbd-server.conf <<EOF +echo $1 + +case $1 in + */cmd) + # Test with export specified on command line + ./nbd-server -C /dev/null -p `pwd`/nbd-server.pid 11111 $tmpnam & + # -p only works if nbd-server wasn't compiled with -DNOFORK or + # -DNODAEMON, which I sometimes do for testing and debugging. + PID=$! + sleep 1 + ./nbd-tester-client localhost 11111 + retval=$? + ;; + + */cfg1) + # Test with export specified in config file + cat > nbd-server.conf <<EOF [generic] [export] exportname = $tmpnam port = 11111 EOF -./nbd-server -C nbd-server.conf -p `pwd`/nbd-server.pid & -PID=$! -sleep 1 -./nbd-tester-client localhost 11111 -retval=$? + ./nbd-server -C nbd-server.conf -p `pwd`/nbd-server.pid & + PID=$! + sleep 1 + ./nbd-tester-client localhost 11111 + retval=$? + ;; + */cfgmulti) + # Test with multiple exports specified in config file, and + # testing more options too + cat >nbd-server.conf <<EOF +[generic] +[export1] + exportname = $tmpnam + port = 11111 + copyonwrite = true + listenaddr = 127.0.0.1 +[export2] + exportname = $tmpnam + port = 11112 + readonly = true +EOF + ./nbd-server -C nbd-server.conf -p `pwd`/nbd-server.pid & + PID=$! + sleep 1 + ./nbd-tester-client localhost 11111 + retval=$? + if [ $retval -ne 0 ] + then + if [ -f nbd-server.pid ] + then + kill `cat nbd-server.pid` + rm -f nbd-server.pid + else + kill $PID + fi + rm -f $tmpnam nbd-server.conf + exit $retval + fi + ./nbd-tester-client localhost 11112 + retval=$? + ;; + *) + echo "E: unknown test $1" + exit 1 + ;; +esac if [ -f nbd-server.pid ] then kill `cat nbd-server.pid` + rm -f nbd-server.pid else kill $PID fi -rm -f nbd-server.pid -rm -f nbd-server.conf -rm -f $tmpnam -exit $retval +if [ $retval -ne 0 ] +then + exit $retval +fi +rm -f $tmpnam nbd-server.conf diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nbd-2.9.11/winnbd/license.txt new/nbd-2.9.12/winnbd/license.txt --- old/nbd-2.9.11/winnbd/license.txt 2007-01-30 14:00:59.000000000 +0100 +++ new/nbd-2.9.12/winnbd/license.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -The license of this program can be obtained from: http://www.vanheusden.com/license.txt -It is actually the GNU Public License. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nbd-2.9.11/winnbd/nbdsrvr.cpp new/nbd-2.9.12/winnbd/nbdsrvr.cpp --- old/nbd-2.9.11/winnbd/nbdsrvr.cpp 2007-01-30 14:00:59.000000000 +0100 +++ new/nbd-2.9.12/winnbd/nbdsrvr.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,359 +0,0 @@ -#include <windows.h> -#include <stdio.h> - -int portnr; -char *filename; - -int READ(SOCKET sh, UCHAR *whereto, int howmuch) -{ - int pnt = 0; - -#ifdef _DEBUG - printf("read: %d bytes requested\n", howmuch); -#endif - - while(howmuch > 0) - { - int nread = recv(sh, (char *)&whereto[pnt], howmuch, 0); - if (nread == 0) - break; - if (nread == SOCKET_ERROR) - { - fprintf(stderr, "Connection dropped. Error: %d\n", WSAGetLastError()); - break; - } - - pnt += nread; - howmuch -= nread; - } - - return pnt; -} - -int WRITE(SOCKET sh, UCHAR *wherefrom, int howmuch) -{ - int pnt = 0; - - while(howmuch > 0) - { - int nwritten = send(sh, (char *)&wherefrom[pnt], howmuch, 0); - if (nwritten == 0) - break; - if (nwritten == SOCKET_ERROR) - { - fprintf(stderr, "Connection dropped. Error: %d\n", WSAGetLastError()); - break; - } - - pnt += nwritten; - howmuch -= nwritten; - } - - return pnt; -} - -BOOL getu32(SOCKET sh, ULONG *val) -{ - UCHAR buffer[4]; - - if (READ(sh, buffer, 4) != 4) - return FALSE; - - *val = (buffer[0] << 24) + (buffer[1] << 16) + (buffer[2] << 8) + (buffer[3]); - - return TRUE; -} - -BOOL putu32(SOCKET sh, ULONG value) -{ - UCHAR buffer[4]; - - buffer[0] = (value >> 24) & 255; - buffer[1] = (value >> 16) & 255; - buffer[2] = (value >> 8) & 255; - buffer[3] = (value ) & 255; - - if (WRITE(sh, buffer, 4) != 4) - return FALSE; - else - return TRUE; -} - -DWORD WINAPI draad(LPVOID data) -{ - SOCKET sockh = (SOCKET)data; - HANDLE fh; - char neg = 1; - - // open file 'filename' - fh = CreateFile(filename, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if (fh == INVALID_HANDLE_VALUE) - { - fprintf(stderr, "Error opening file %s: %d\n", filename, GetLastError()); - } - - for(;fh != INVALID_HANDLE_VALUE;) - { - UCHAR handle[9]; - ULONG magic, from, len, type, dummy; - - /* negotiating time? */ - if (neg) - { - printf("Negotiating...\n"); - if (WRITE(sockh, (unsigned char *)"NBDMAGIC", 8) != 8) - { - fprintf(stderr, "Failed to send magic string\n"); - break; - } - - // some other magic value - unsigned char magic[8]; - magic[0] = 0x00; - magic[1] = 0x00; - magic[2] = 0x42; - magic[3] = 0x02; - magic[4] = 0x81; - magic[5] = 0x86; - magic[6] = 0x12; - magic[7] = 0x53; - if (WRITE(sockh, magic, 8) != 8) - { - fprintf(stderr, "Failed to send 2nd magic string\n"); - break; - } - - // send size of file - unsigned char exportsize[8]; - DWORD fsize = GetFileSize(fh, NULL); - if (fsize == 0xFFFFFFFF) - { - fprintf(stderr, "Failed to get filesize. Error: %d\n", GetLastError()); - break; - } - exportsize[7] = (fsize ) & 255; - exportsize[6] = (fsize >> 8) & 255; - exportsize[5] = (fsize >> 16) & 255; - exportsize[4] = (fsize >> 24) & 255; - exportsize[3] = (fsize >> 32) & 255; - exportsize[2] = (fsize >> 40) & 255; - exportsize[1] = (fsize >> 48) & 255; - exportsize[0] = (fsize >> 56) & 255; -#ifdef _DEBUG - printf("File is %ld bytes\n", fsize); -#endif - if (WRITE(sockh, exportsize, 8) != 8) - { - fprintf(stderr, "Failed to send filesize\n"); - break; - } - - // send a couple of zeros */ - unsigned char buffer[128]; - memset(buffer, 0x00, 128); - if (WRITE(sockh, buffer, 128) != 128) - { - fprintf(stderr, "Failed to send a couple of 0x00s\n"); - break; - } - - printf("Started!\n"); - neg = 0; - } - - if (getu32(sockh, &magic) == FALSE || // 0x12560953 - getu32(sockh, &type) == FALSE || // 0=read,1=write - READ(sockh, handle, 8) != 8 || // handle - getu32(sockh, &dummy) == FALSE || // ... high word of offset - getu32(sockh, &from) == FALSE || // offset - getu32(sockh, &len) == FALSE) // length - { - fprintf(stderr, "Failed to read from socket\n"); - break; - } - -#ifdef _DEBUG - handle[8] = 0x00; - printf("Magic: %lx\n", magic); - printf("Offset: %ld\n", from); - printf("Len: %ld\n", len); - printf("Handle: %s\n", handle); - printf("Req.type: %ld (%s)\n\n", type, type?"write":"read"); -#endif - - // verify protocol - if (magic != 0x25609513) - { - fprintf(stderr, "Unexpected protocol version! (got: %lx, expected: 0x25609513)\n", magic); - break; - } - - // seek to 'from' - if (SetFilePointer(fh, from, NULL, FILE_BEGIN) == 0xFFFFFFFF) - { - fprintf(stderr, "Error seeking in file %s to position %d: %d\n", filename, from, GetLastError()); - break; - } - - if (type == 1) // write - { - while(len > 0) - { - DWORD dummy; - UCHAR buffer[32768]; - // read from socket - int nb = recv(sockh, (char *)buffer, min(len, 32768), 0); - if (nb == 0) - break; - - // write to file; - if (WriteFile(fh, buffer, nb, &dummy, NULL) == 0) - { - fprintf(stderr, "Failed to write to %s: %d\n", filename, GetLastError()); - break; - } - if (dummy != nb) - { - fprintf(stderr, "Failed to write to %s: %d (written: %d, requested to write: %d)\n", filename, GetLastError(), dummy, nb); - break; - } - - len -= nb; - } - if (len) // connection was closed - { - fprintf(stderr, "Connection was dropped while receiving data\n"); - break; - } - - // send 'ack' - if (putu32(sockh, 0x67446698) == FALSE || - putu32(sockh, 0) == FALSE || - WRITE(sockh, handle, 8) != 8) - { - fprintf(stderr, "Failed to send through socket\n"); - break; - } - } - else if (type == 0) - { - // send 'ack' - if (putu32(sockh, 0x67446698) == FALSE || - putu32(sockh, 0) == FALSE || - WRITE(sockh, handle, 8) != 8) - { - fprintf(stderr, "Failed to send through socket\n"); - break; - } - - while(len > 0) - { - DWORD dummy; - UCHAR buffer[32768]; - int nb = min(len, 32768); - int pnt = 0; - - // read nb to buffer; - if (ReadFile(fh, buffer, nb, &dummy, NULL) == 0) - { - fprintf(stderr, "Failed to read from %s: %d\n", filename, GetLastError()); - break; - } - if (dummy != nb) - { - fprintf(stderr, "Failed to read from %s: %d\n", filename, GetLastError()); - break; - } - - // send through socket - if (WRITE(sockh, buffer, nb) != nb) // connection was closed - { - fprintf(stderr, "Connection dropped while sending block\n"); - break; - } - - len -= nb; - } - if (len) // connection was closed - break; - } - else - { - printf("Unexpected commandtype: %d\n", type); - break; - } - } - - // close file - if (CloseHandle(fh) == 0) - { - fprintf(stderr, "Failed to close handle: %d\n", GetLastError()); - } - - closesocket(sockh); - - ExitThread(0); - - return 0; -} - -int main(int argc, char *argv[]) -{ - SOCKET newconnh; - WSADATA WSAData; - - printf("nbdsrvr v0.1, (C) 2003 by folkert(a)vanheusden.com\n"); - - if (argc != 3) - { - fprintf(stderr, "Usage: %s file portnr\n", argv[0]); - return 1; - } - filename = argv[1]; - portnr = atoi(argv[2]); - - // initialize WinSock library - (void)WSAStartup(0x101, &WSAData); - - // create listener socket - newconnh= socket(AF_INET, SOCK_STREAM, 0); - if (newconnh == INVALID_SOCKET) - return -1; - - // bind - struct sockaddr_in ServerAddr; - int ServerAddrLen; - ServerAddrLen = sizeof(ServerAddr); - memset((char *)&ServerAddr, '\0', ServerAddrLen); - ServerAddr.sin_family = AF_INET; - ServerAddr.sin_addr.s_addr = htonl(INADDR_ANY); - ServerAddr.sin_port = htons(portnr); - if (bind(newconnh, (struct sockaddr *)&ServerAddr, ServerAddrLen) == -1) - return -1; - - // listen - if (listen(newconnh, 5) == -1) - return -1; - - for(;;) - { - SOCKET clienth; - struct sockaddr_in clientaddr; - int clientaddrlen; - - clientaddrlen = sizeof(clientaddr); - - /* accept a connection */ - clienth = accept(newconnh, (struct sockaddr *)&clientaddr, &clientaddrlen); - - if (clienth != INVALID_SOCKET) - { - printf("Connection made with %s\n", inet_ntoa(clientaddr.sin_addr)); - - DWORD tid; - HANDLE th = CreateThread(NULL, 0, draad, (void *)clienth, 0, &tid); - } - } - - return 0; -} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nbd-2.9.11/winnbd/nbdsrvr.dsp new/nbd-2.9.12/winnbd/nbdsrvr.dsp --- old/nbd-2.9.11/winnbd/nbdsrvr.dsp 2007-01-30 14:00:59.000000000 +0100 +++ new/nbd-2.9.12/winnbd/nbdsrvr.dsp 1970-01-01 01:00:00.000000000 +0100 @@ -1,90 +0,0 @@ -# Microsoft Developer Studio Project File - Name="nbdsrvr" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=nbdsrvr - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "nbdsrvr.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "nbdsrvr.mak" CFG="nbdsrvr - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "nbdsrvr - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "nbdsrvr - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "nbdsrvr - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x413 /d "NDEBUG" -# ADD RSC /l 0x413 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "nbdsrvr - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x413 /d "_DEBUG" -# ADD RSC /l 0x413 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "nbdsrvr - Win32 Release" -# Name "nbdsrvr - Win32 Debug" -# Begin Source File - -SOURCE=.\nbdsrvr.cpp -# End Source File -# End Target -# End Project diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nbd-2.9.11/winnbd/nbdsrvr.dsw new/nbd-2.9.12/winnbd/nbdsrvr.dsw --- old/nbd-2.9.11/winnbd/nbdsrvr.dsw 2007-01-30 14:00:59.000000000 +0100 +++ new/nbd-2.9.12/winnbd/nbdsrvr.dsw 1970-01-01 01:00:00.000000000 +0100 @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "nbdsrvr"=.\nbdsrvr.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - Files old/nbd-2.9.11/winnbd/NBDSvrWin2000.zip and new/nbd-2.9.12/winnbd/NBDSvrWin2000.zip differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nbd-2.9.11/winnbd/README new/nbd-2.9.12/winnbd/README --- old/nbd-2.9.11/winnbd/README 2007-01-30 14:00:59.000000000 +0100 +++ new/nbd-2.9.12/winnbd/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -nbd server for windows 2000 - -This is a runnable version of nbd server for windows 2000. -The client used for test is nbd-2.0. - -usage example: -if Partition if defined -mynbdserverwin 3456 \\.\A: -if not -mynbdserverwin 3456 c:\testfile \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nbd-2.9.11/winnbd/readme.txt new/nbd-2.9.12/winnbd/readme.txt --- old/nbd-2.9.11/winnbd/readme.txt 2007-01-30 14:00:59.000000000 +0100 +++ new/nbd-2.9.12/winnbd/readme.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,31 +0,0 @@ -nbdsrvr is (C) 2003 by folkert(a)vanheusden.com -New versions can be obtained from: -http://www.vanheusden.com/ (browse to the -"microsoft windows software" section). - -Usage: - -nbdsrvr filename portnumber - -filename must be an image of a filesystem or -whatever kind of device you whish to use. Can -also be an empty file. -For example, create an empty file of 10MB -called "image.dat" -Then: -nbdsrvr image.dat 9000 -On your linux-box: -nbd-client hostname 9000 /dev/ndX -hostname is the hostname of your windows-box, -/dev/ndX is the device you want to couple the -image to. -After that, you could create a filesystem on -this image: on your Linux-box, type: -mke2fs /dev/ndX -and then mount it: -mount /dev/ndX /mnt - -Good luck! - - --- Folkert van Heusden, 2003/07/13, 21:59 ++++++ nbd-2.9.5-warn.diff -> nbd-2.9.12-warn.diff ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nemiver for openSUSE:Factory
by root＠Hilbert.suse.de 04 May '09

04 May '09

Hello community, here is the log from the commit of package nemiver for openSUSE:Factory checked in at Mon May 4 18:30:30 CEST 2009. -------- --- GNOME/nemiver/nemiver.changes 2009-04-05 14:16:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/nemiver/nemiver.changes 2009-05-01 00:58:50.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 1 00:58:33 CEST 2009 - vuntz(a)novell.com + +- Add missing posttrans for gconf schemas. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nemiver.spec ++++++ --- /var/tmp/diff_new_pack.Rf5335/_old 2009-05-04 18:29:43.000000000 +0200 +++ /var/tmp/diff_new_pack.Rf5335/_new 2009-05-04 18:29:43.000000000 +0200 @@ -20,7 +20,7 @@ Name: nemiver Version: 0.6.6 -Release: 1 +Release: 2 License: GPL v2 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: boost-devel @@ -108,6 +108,7 @@ %fdupes $RPM_BUILD_ROOT %pre -f %{name}.schemas_pre +%posttrans -f %{name}.schemas_posttrans %preun -f %{name}.schemas_preun @@ -134,6 +135,8 @@ %files lang -f %{name}.lang %changelog +* Fri May 01 2009 vuntz(a)novell.com +- Add missing posttrans for gconf schemas. * Sun Apr 05 2009 vuntz(a)novell.com - Update to version 0.6.6: + Update ephy-spinner widget (bgo#574915) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nautilus-cd-burner for openSUSE:Factory
by root＠Hilbert.suse.de 04 May '09

04 May '09

Hello community, here is the log from the commit of package nautilus-cd-burner for openSUSE:Factory checked in at Mon May 4 18:29:31 CEST 2009. -------- --- GNOME/nautilus-cd-burner/nautilus-cd-burner.changes 2009-02-16 18:03:35.000000000 +0100 +++ /mounts/work_src_done/STABLE/nautilus-cd-burner/nautilus-cd-burner.changes 2009-04-26 14:27:54.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Apr 26 14:26:25 CEST 2009 - vuntz(a)novell.com + +- Remove unneeded BuildRequires on notification-daemon. +- Remove AutoReqProv: it's default now. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nautilus-cd-burner.spec ++++++ --- /var/tmp/diff_new_pack.OUq869/_old 2009-05-04 18:28:51.000000000 +0200 +++ /var/tmp/diff_new_pack.OUq869/_new 2009-05-04 18:28:51.000000000 +0200 @@ -34,13 +34,12 @@ BuildRequires: libgnome-devel BuildRequires: libgnomeui-devel BuildRequires: nautilus-devel -BuildRequires: notification-daemon BuildRequires: translation-update-upstream BuildRequires: update-desktop-files License: GPL v2 or later; LGPL v2.1 or later Group: Productivity/Multimedia/CD/Record Version: 2.25.3 -Release: 2 +Release: 3 Summary: CD Burning Extension for Nautilus Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.25/%{name}-%{version}.tar.b… Patch0: nautilus-cd-burner-desktop.patch @@ -49,7 +48,6 @@ Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build DocDir: %{_defaultdocdir} -AutoReqProv: on Requires: %{name}-lang = %{version} Requires: nautilus cdrdao cdrecord dvd+rw-tools gnome-icon-theme gnome-mount # bug437293 @@ -152,6 +150,9 @@ %{_libdir}/pkgconfig/libnautilus-burn.pc %changelog +* Sun Apr 26 2009 vuntz(a)novell.com +- Remove unneeded BuildRequires on notification-daemon. +- Remove AutoReqProv: it's default now. * Mon Feb 16 2009 sbrabec(a)suse.cz - Added support for translation-update-upstream (FATE#301344). * Wed Jan 07 2009 olh(a)suse.de @@ -251,7 +252,7 @@ - Drop locks when re-entering main loop - Remove read_watch before dispatching request - translation updates -* Thu Sep 14 2006 jhargadon(a)suse.de +* Fri Sep 15 2006 jhargadon(a)suse.de - update to version 2.16.0 - translation updates * Fri Aug 25 2006 jhargadon(a)suse.de @@ -300,7 +301,7 @@ - Fix memory corruption (b.g.o#322826) * Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Wed Nov 30 2005 gekker(a)suse.de +* Thu Dec 01 2005 gekker(a)suse.de - Update to version 2.12.2 * Thu Oct 13 2005 gekker(a)suse.de - Update to version 2.12.1 @@ -314,7 +315,7 @@ - Update to version 2.11.6 * Tue Aug 02 2005 gekker(a)suse.de - Update to version 2.11.5 -* Fri Jul 22 2005 gekker(a)suse.de +* Sat Jul 23 2005 gekker(a)suse.de - Update to 2.11.4 - Remove upstreamed HAL API patch * Tue Jun 21 2005 sbrabec(a)suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nautilus-sendto for openSUSE:Factory
by root＠Hilbert.suse.de 04 May '09

04 May '09

Hello community, here is the log from the commit of package nautilus-sendto for openSUSE:Factory checked in at Mon May 4 18:29:14 CEST 2009. -------- --- GNOME/nautilus-sendto/nautilus-sendto.changes 2009-04-21 18:28:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/nautilus-sendto/nautilus-sendto.changes 2009-04-30 11:55:58.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 30 11:55:33 CEST 2009 - vuntz(a)novell.com + +- Do not explicitly package the gconf schemas: it's already + packaged via the file list created with the gconf macros. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nautilus-sendto.spec ++++++ --- /var/tmp/diff_new_pack.av2571/_old 2009-05-04 18:28:58.000000000 +0200 +++ /var/tmp/diff_new_pack.av2571/_new 2009-05-04 18:28:58.000000000 +0200 @@ -30,7 +30,7 @@ Group: Productivity/File utilities Requires: nautilus Version: 1.1.4.1 -Release: 1 +Release: 2 Summary: Integrate Nautilus, Evolution, Empathy and Pidgin Url: http://www.es.gnome.org/~telemaco/ Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.13/%{name}-%{version}.tar.b… @@ -131,7 +131,6 @@ %files -f %{name}.lst %defattr(-, root, root) %doc AUTHORS NEWS COPYING -%config %{_sysconfdir}/gconf/schemas/nst.schemas %{_bindir}/* %{_datadir}/nautilus-sendto %{_libdir}/nautilus/extensions-2.0/*.so @@ -162,6 +161,9 @@ %files lang -f %{name}.lang %changelog +* Thu Apr 30 2009 vuntz(a)novell.com +- Do not explicitly package the gconf schemas: it's already + packaged via the file list created with the gconf macros. * Tue Apr 21 2009 vuntz(a)novell.com - Update to version 1.1.4.1: + Fix infinite loop in the Pidgin plugin ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mozilla-xulrunner191 for openSUSE:Factory
by root＠Hilbert.suse.de 04 May '09

04 May '09

Hello community, here is the log from the commit of package mozilla-xulrunner191 for openSUSE:Factory checked in at Mon May 4 18:29:10 CEST 2009. -------- --- mozilla-xulrunner191/mozilla-xulrunner191.changes 2009-03-24 21:47:19.000000000 +0100 +++ /mounts/work_src_done/STABLE/mozilla-xulrunner191/mozilla-xulrunner191.changes 2009-04-27 10:23:29.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Apr 27 09:08:30 CEST 2009 - wr(a)rosenauer.org + +- update to 1.9.1b4 +- removed obsolete pango and gcc4.4 patches +- added newly supported locales + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- checkout l10n-1.9.1b3.tar.bz2 mozilla-gcc44.patch mozilla-pango_api.patch xulrunner-source-1.9.1b3.tar.bz2 New: ---- l10n-1.9.1b4.tar.bz2 xulrunner-source-1.9.1b4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-xulrunner191.spec ++++++ --- /var/tmp/diff_new_pack.Yue470/_old 2009-05-04 18:28:49.000000000 +0200 +++ /var/tmp/diff_new_pack.Yue470/_new 2009-05-04 18:28:49.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package mozilla-xulrunner191 (Version 1.9.1b3) +# spec file for package mozilla-xulrunner191 (Version 1.9.1b4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -32,9 +32,9 @@ BuildRequires: nss-shared-helper-devel %endif License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) -Version: 1.9.1b3 -Release: 2 -Summary: Mozilla Runtime Environment 1.9 +Version: 1.9.1b4 +Release: 1 +Summary: Mozilla Runtime Environment 1.9.1 Url: http://www.mozilla.org Group: Productivity/Other Provides: gecko191 @@ -47,12 +47,10 @@ Source3: %{name}-rpmlintrc Source4: xulrunner-openSUSE-prefs.js Source5: add-plugins.sh.in -Patch1: mozilla-pango_api.patch Patch2: locale.patch Patch3: mozilla-pkgconfig.patch Patch4: idldir.patch Patch5: mozilla-path_len.patch -Patch6: mozilla-gcc44.patch Patch7: mozilla-nongnome-proxies.patch Patch8: mozilla-helper-app.patch Patch9: mozilla-system-hunspell.patch.bz2 @@ -78,10 +76,10 @@ %if %suse_version > 1100 %define has_system_cairo 1 %endif -%define releasedate 2009031100 -%define version_internal 1.9.1b3 +%define releasedate 2009042600 +%define version_internal 1.9.1b4 %define apiversion 1.9.1 -%define uaweight 190930 +%define uaweight 190940 ### configuration end ### %define _use_internal_dependency_generator 0 %define __find_requires sh %{SOURCE2} @@ -111,7 +109,7 @@ %package devel License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) -Summary: XULRunner/Gecko SDK 1.9 +Summary: XULRunner/Gecko SDK 1.9.1 Group: Development/Libraries/Other %if %has_system_nspr Requires: mozilla-nspr-devel >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr-devel) @@ -128,19 +126,21 @@ %package translations License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) -Summary: XULRunner components depending on gnome-vfs -Group: Productivity/Other +Summary: Translations for XULRunner 1.9.1 +Group: System/Localization PreReq: %{name} = %{version} -Provides: locale(%{name}:af;ar;be;ca;cs;da;de;el;en_GB;es_AR;es_ES;eu;fi;fr;fy_NL;ga_IE;gu_IN;he;hu;id;it;ja;ka;ko;ku;lt;mk;mn;nb_NO;nl;nn_NO;pa_IN;pl;pt_BR;pt_PT;ro;ru;si;sk;sl;sq;sr;sv_SE;tr;uk;zh_CN;zh_TW) +Provides: locale(%{name}:af;ar;as;be;bg;bn_BD;bn_IN;ca;cs;cy;da;de;el;en_GB;es_AR;es_ES;ex_MX;et;eu;fa;fi;fr;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hr;hu;id;is;it;ja;ka;kk;kn;ko;ku;lt;lv;mk;mn;mr;nb_NO;nl;nn_NO;oc;pa_IN;pl;pt_BR;pt_PT;ro;ru;si;sk;sl;sq;sr;sv_SE;ta;te;th;tr;uk;vi;zh_CN;zh_TW) # from OBS and 11.0beta updates Provides: %{name}-lang = %{version} Obsoletes: %{name}-lang < %{version} %description translations -This subpackage contains the Necko Gnome-VFS and Gnome components which -rely on the gnome-vfs subsystem to be installed. They are recommended -for full desktop integration but not mandatory for small disk footprint -KDE installations for example. +XULRunner is a single installable package that can be used to bootstrap +multiple XUL+XPCOM applications that are as rich as Firefox and +Thunderbird. + +This package contains all supported languages but en-US which is +delivered in the main package. @@ -187,15 +187,10 @@ %prep %setup -n mozilla -q -b 1 -%if %suse_version > 1110 -# backwards incompatible api change (bmo#481193) -%patch1 -p1 -%endif %patch2 %patch3 -p1 %patch4 %patch5 -p1 -%patch6 -p1 %patch7 %patch8 pushd extensions @@ -206,7 +201,7 @@ %patch16 -p1 %patch17 %patch18 -p1 -%patch22 +%patch22 -p1 %build MOZ_APP_DIR=%{_libdir}/%{name}-%{version_internal} @@ -485,6 +480,10 @@ %defattr(-,root,root) %endif %changelog +* Mon Apr 27 2009 wr(a)rosenauer.org +- update to 1.9.1b4 +- removed obsolete pango and gcc4.4 patches +- added newly supported locales * Tue Mar 24 2009 wr(a)rosenauer.org - add patch to compile with gcc 4.4 (bmo#483956) * Tue Mar 17 2009 wr(a)rosenauer.org ++++++ l10n-1.9.1b3.tar.bz2 -> l10n-1.9.1b4.tar.bz2 ++++++ mozilla-xulrunner191/l10n-1.9.1b3.tar.bz2 /mounts/work_src_done/STABLE/mozilla-xulrunner191/l10n-1.9.1b4.tar.bz2 differ: byte 11, line 1 ++++++ mozilla-shared-nss-db.patch ++++++ --- /var/tmp/diff_new_pack.Yue470/_old 2009-05-04 18:28:49.000000000 +0200 +++ /var/tmp/diff_new_pack.Yue470/_new 2009-05-04 18:28:49.000000000 +0200 @@ -5,20 +5,29 @@ References: -Index: configure.in -=================================================================== -RCS file: /cvsroot/mozilla/configure.in,v -retrieving revision 1.1999 -diff -u -p -6 -r1.1999 configure.in ---- configure.in 21 Oct 2008 02:09:09 -0000 1.1999 -+++ configure.in 19 Nov 2008 10:12:45 -0000 -@@ -7453,12 +7453,27 @@ fi - - AC_SUBST(MOZ_NATIVE_LCMS) - AC_SUBST(LCMS_CFLAGS) - AC_SUBST(LCMS_LIBS) +diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in +--- a/config/autoconf.mk.in ++++ b/config/autoconf.mk.in +@@ -535,6 +535,10 @@ LIBIDL_LIBS = @LIBIDL_LIBS@ + LIBIDL_LIBS = @LIBIDL_LIBS@ + STATIC_LIBIDL = @STATIC_LIBIDL@ - dnl ======================================================== ++MOZ_ENABLE_NSSHELPER = @MOZ_ENABLE_NSSHELPER@ ++NSSHELPER_CFLAGS = @NSSHELPER_CFLAGS@ ++NSSHELPER_LIBS = @NSSHELPER_LIBS@ ++ + MOZ_NATIVE_MAKEDEPEND = @SYSTEM_MAKEDEPEND@ + + # Used for LD_LIBRARY_PATH +diff --git a/configure.in b/configure.in +--- a/configure.in ++++ b/configure.in +@@ -7613,6 +7613,21 @@ dnl ==================================== + + QCMS_LIBS='$(DEPTH)/gfx/qcms/$(LIB_PREFIX)mozqcms.$(LIB_SUFFIX)' + AC_SUBST(QCMS_LIBS) ++ ++dnl ======================================================== +dnl Check for nss-shared-helper +dnl ======================================================== + @@ -32,49 +41,13 @@ +AC_SUBST(MOZ_ENABLE_NSSHELPER) +AC_SUBST(NSSHELPER_CFLAGS) +AC_SUBST(NSSHELPER_LIBS) -+ -+dnl ======================================================== - dnl disable xul - dnl ======================================================== - MOZ_ARG_DISABLE_BOOL(xul, - [ --disable-xul Disable XUL], - MOZ_XUL= ) - if test "$MOZ_XUL"; then -Index: config/autoconf.mk.in -=================================================================== -RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v -retrieving revision 3.464 -diff -u -p -6 -r3.464 autoconf.mk.in ---- config/autoconf.mk.in 18 Sep 2008 22:00:51 -0000 3.464 -+++ config/autoconf.mk.in 19 Nov 2008 10:12:46 -0000 -@@ -532,12 +532,16 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ - GLIB_LIBS = @GLIB_LIBS@ - GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ - LIBIDL_CFLAGS = @LIBIDL_CFLAGS@ - LIBIDL_LIBS = @LIBIDL_LIBS@ - STATIC_LIBIDL = @STATIC_LIBIDL@ -+MOZ_ENABLE_NSSHELPER = @MOZ_ENABLE_NSSHELPER@ -+NSSHELPER_CFLAGS = @NSSHELPER_CFLAGS@ -+NSSHELPER_LIBS = @NSSHELPER_LIBS@ -+ - MOZ_NATIVE_MAKEDEPEND = @SYSTEM_MAKEDEPEND@ - - # Used for LD_LIBRARY_PATH - LIBS_PATH = @LIBS_PATH@ - - MOZ_AUTO_DEPS = @MOZ_AUTO_DEPS@ -Index: security/manager/ssl/src/Makefile.in -=================================================================== -RCS file: /cvsroot/mozilla/security/manager/ssl/src/Makefile.in,v -retrieving revision 1.93 -diff -u -p -6 -r1.93 Makefile.in ---- security/manager/ssl/src/Makefile.in 16 Sep 2008 20:44:53 -0000 1.93 -+++ security/manager/ssl/src/Makefile.in 19 Nov 2008 10:13:03 -0000 -@@ -136,17 +136,18 @@ REQUIRES = nspr \ - EXTRA_DEPS = $(NSS_DEP_LIBS) - - DEFINES += -DNSS_ENABLE_ECC + dnl ======================================================== + dnl disable xul +diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in +--- a/security/manager/ssl/src/Makefile.in ++++ b/security/manager/ssl/src/Makefile.in +@@ -137,12 +137,13 @@ DEFINES += -DNSS_ENABLE_ECC # Use local includes because they are inserted before INCLUDES # so that Mozilla's nss.h is used, not glibc's @@ -89,39 +62,24 @@ $(NSS_LIBS) \ $(NULL) - include $(topsrcdir)/config/rules.mk - -Index: security/manager/ssl/src/nsNSSComponent.cpp -=================================================================== -RCS file: /cvsroot/mozilla/security/manager/ssl/src/nsNSSComponent.cpp,v -retrieving revision 1.167 -diff -u -p -6 -r1.167 nsNSSComponent.cpp ---- security/manager/ssl/src/nsNSSComponent.cpp 16 Sep 2008 20:44:53 -0000 1.167 -+++ security/manager/ssl/src/nsNSSComponent.cpp 19 Nov 2008 10:13:04 -0000 -@@ -41,12 +41,19 @@ - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under +diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp +--- a/security/manager/ssl/src/nsNSSComponent.cpp ++++ b/security/manager/ssl/src/nsNSSComponent.cpp +@@ -43,6 +43,13 @@ * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ - ++ +#ifdef MOZ_ENABLE_NSSHELPER +#pragma GCC visibility push(default) +#include <nss-shared-helper.h> +#pragma GCC visibility pop +#include "prenv.h" +#endif -+ + #include "nsNSSComponent.h" #include "nsNSSCallbacks.h" - #include "nsNSSIOLayer.h" - #include "nsSSLThread.h" - #include "nsCertVerificationThread.h" - -@@ -1542,13 +1549,27 @@ nsNSSComponent::InitializeNSS(PRBool sho - // If we could assume i18n will not change between profiles, one call per application - // run were sufficient. As I can't predict what happens in the future, let's repeat - // this call for every re-init of NSS. +@@ -1602,7 +1609,21 @@ nsNSSComponent::InitializeNSS(PRBool sho ConfigureInternalPKCS11Token(); @@ -144,20 +102,10 @@ if (init_rv != SECSuccess) { PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS r/w in %s\n", profileStr.get())); - - if (supress_warning_preference) { - which_nss_problem = problem_none; -Index: toolkit/library/Makefile.in -=================================================================== -RCS file: /cvsroot/mozilla/toolkit/library/Makefile.in,v -retrieving revision 1.69 -diff -u -p -6 -r1.69 Makefile.in ---- toolkit/library/Makefile.in 8 May 2008 09:20:45 -0000 1.69 -+++ toolkit/library/Makefile.in 19 Nov 2008 10:13:07 -0000 -@@ -198,13 +198,13 @@ EXTRA_DSO_LDOPTS += \ - $(MOZ_JS_LIBS) \ - $(NULL) - endif +diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in +--- a/toolkit/library/Makefile.in ++++ b/toolkit/library/Makefile.in +@@ -194,7 +194,7 @@ endif DEFINES += -DIMPL_XREAPI @@ -166,6 +114,3 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) CXXFLAGS += $(TK_CFLAGS) - EXTRA_DSO_LDOPTS += \ - -framework QuickTime \ - -framework IOKit \ ++++++ xulrunner-source-1.9.1b3.tar.bz2 -> xulrunner-source-1.9.1b4.tar.bz2 ++++++ mozilla-xulrunner191/xulrunner-source-1.9.1b3.tar.bz2 /mounts/work_src_done/STABLE/mozilla-xulrunner191/xulrunner-source-1.9.1b4.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaFirefox-branding-openSUSE for openSUSE:Factory
by root＠Hilbert.suse.de 04 May '09

04 May '09

Hello community, here is the log from the commit of package MozillaFirefox-branding-openSUSE for openSUSE:Factory checked in at Mon May 4 18:28:43 CEST 2009. -------- --- MozillaFirefox-branding-openSUSE/MozillaFirefox-branding-openSUSE.changes 2008-12-08 17:16:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/MozillaFirefox-branding-openSUSE/MozillaFirefox-branding-openSUSE.changes 2009-05-04 08:42:01.000000000 +0200 @@ -1,0 +2,8 @@ +Mon May 4 08:40:26 CEST 2009 - wr(a)rosenauer.org + +- bumped version to 3.5 to reflect FF version bump +- updated firefox.schemas +- removed spec support for distributions before 10.3 +- removed obsolete prefs + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.B26364/_old 2009-05-04 18:24:52.000000000 +0200 +++ /var/tmp/diff_new_pack.B26364/_new 2009-05-04 18:24:52.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package MozillaFirefox-branding-openSUSE (Version 3.0.3) +# spec file for package MozillaFirefox-branding-openSUSE (Version 3.5) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +17,12 @@ # norootforbuild -BuildRequires: MozillaFirefox MozillaFirefox-branding-upstream +BuildRequires: MozillaFirefox Name: MozillaFirefox-branding-openSUSE License: BSD 3-Clause -Version: 3.0.3 -Release: 4 +Version: 3.5 +Release: 1 Summary: openSUSE branding of MozillaFirefox Group: Productivity/Networking/Web/Browsers Source0: %{name}-COPYING @@ -31,20 +31,15 @@ Source3: firefox-suse-default-prefs.js Source4: firefox.schemas Provides: MozillaFirefox-branding = %{version} +PreReq: MozillaFirefox >= 3.5 Conflicts: otherproviders(MozillaFirefox-branding) -PreReq: MozillaFirefox >= %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' MozillaFirefox) Supplements: packageand(MozillaFirefox:branding-openSUSE) BuildRoot: %{_tmppath}/%{name}-%{version}-build %define default_home_page http://www.opensuse.org/ %define progdir %{_prefix}/%_lib/firefox %define libgssapi libgssapi_krb5.so.2 -%if %suse_version > 1020 %define gnome_confdir %{_sysconfdir} %gconf_schemas_prereq -%else -%define gnome_confdir %{_sysconfdir}/opt/gnome -%define gnome_dir /opt/gnome -%endif %description This package provides openSUSE Look and Feel for MozillaFirefox. @@ -75,11 +70,9 @@ install -d $RPM_BUILD_ROOT/%{progdir}/searchplugins (cd $RPM_BUILD_ROOT%{progdir}/searchplugins ; tar xjf %{SOURCE1}) # browserconfig.properties -sed "s;browser.startup.homepage=.*;browser.startup.homepage=%{default_home_page};g -s;browser.startup.homepage_reset=.*;browser.startup.homepage_reset=%{default_home_page};g" \ - %{progdir}/browserconfig.properties > suse-browserconfig.properties cat << EOF >> suse-browserconfig.properties -startup.homepage_override_url=%{default_home_page} +browser.startup.homepage=%{default_home_page} +browser.startup.homepage_reset=%{default_home_page} EOF install -m0644 suse-browserconfig.properties $RPM_BUILD_ROOT%{progdir}/browserconfig.properties rm suse-browserconfig.properties @@ -87,47 +80,32 @@ mkdir -p $RPM_BUILD_ROOT%{gnome_confdir}/gconf/schemas install -m 644 %{SOURCE4} \ $RPM_BUILD_ROOT/%{gnome_confdir}/gconf/schemas/ -%if %suse_version > 1020 %find_gconf_schemas -%endif %clean rm -rf $RPM_BUILD_ROOT -%if %suse_version > 1020 %pre -f %{name}.schemas_pre %preun -f %{name}.schemas_preun %posttrans -f %{name}.schemas_posttrans -%endif -%if %suse_version <= 1020 - -%post -if [ ! -f /.buildenv ]; then - export GCONF_CONFIG_SOURCE=`%{gnome_dir}/bin/gconftool-2 --get-default-source` - %{gnome_dir}bin/gconftool-2 --makefile-install-rule %{gnome_confdir}/gconf/schemas/firefox.schemas > /dev/null 2>&1 -fi -%endif -%if %suse_version > 1020 %files -f %{name}.schemas_list %defattr(-,root,root) -%else - -%files -%defattr(-,root,root) -%{gnome_confdir}/gconf/schemas/firefox.schemas -%endif %doc COPYING %{progdir}/defaults/preferences/firefox-openSUSE.js %{progdir}/defaults/profile/bookmarks.html %{progdir}/browserconfig.properties %{progdir}/searchplugins/* - %changelog +* Mon May 04 2009 wr(a)rosenauer.org +- bumped version to 3.5 to reflect FF version bump +- updated firefox.schemas +- removed spec support for distributions before 10.3 +- removed obsolete prefs * Mon Dec 08 2008 hfiguiere(a)suse.de - Fix a type in firefox-suse-default-prefs.js -* Thu Nov 20 2008 maw(a)suse.de +* Fri Nov 21 2008 maw(a)suse.de - Review and approve changes. * Fri Nov 14 2008 wr(a)rosenauer.org - Make sure that the base package is installed before installing @@ -135,10 +113,10 @@ (bnc#444682) * Fri Nov 07 2008 maw(a)suse.de - Review and approve changes. -* Tue Nov 04 2008 wr(a)rosenauer.org +* Wed Nov 05 2008 wr(a)rosenauer.org - added the Firefox Gconf schema for system prefs and changed the homepage URL to http://www.opensuse.org/ (bnc#441646) -* Mon Oct 20 2008 maw(a)suse.de +* Tue Oct 21 2008 maw(a)suse.de - Review and approve changes. * Tue Oct 07 2008 wr(a)rosenauer.org - bumped version to 3.0.3 ++++++ firefox.schemas ++++++ --- /var/tmp/diff_new_pack.B26364/_old 2009-05-04 18:24:52.000000000 +0200 +++ /var/tmp/diff_new_pack.B26364/_new 2009-05-04 18:24:52.000000000 +0200 @@ -7,8 +7,8 @@ <type>bool</type> <default>false</default> <locale name="C"> - <short>To disable the History.</short> - <long>To disable the histroy.</long> + <short>Disable the browser history</short> + <long>Prevent the browser from keeping a history of visited sites</long> </locale> </schema> <schema> @@ -18,9 +18,8 @@ <type>bool</type> <default>false</default> <locale name="C"> - <short>Disable toolbar editing.</short> - <long>Disable ToolBar Editing. - </long> + <short>Disable toolbar editing</short> + <long>Prevent the user from editing the toolbar</long> </locale> </schema> <schema> @@ -31,8 +30,7 @@ <default>false</default> <locale name="C"> <short>Disable installing themes</short> - <long>Disable installing theme - </long> + <long>To prevent the user from installing themes</long> </locale> </schema> <schema> @@ -43,20 +41,7 @@ <default>false</default> <locale name="C"> <short>Disable installing extensions</short> - <long>Disable installing extensions - </long> - </locale> - </schema> - <schema> - <key>/schemas/apps/firefox/lockdown/disable_show_passwords</key> - <applyto>/apps/firefox/lockdown/disable_show_passwords</applyto> - <owner>firefox</owner> - <type>bool</type> - <default>false</default> - <locale name="C"> - <short>Disable showing passwords</short> - <long>Disable showing passwords in the password manager. - </long> + <long>Prevent the user from installing extensions</long> </locale> </schema> <schema> @@ -66,9 +51,8 @@ <type>bool</type> <default>false</default> <locale name="C"> - <short>Allow Popups.</short> - <long>Allow Popups. - </long> + <short>Enable popup blocker</short> + <long>Enable popup blocker without warning about blocked popups</long> </locale> </schema> <schema> @@ -78,9 +62,8 @@ <type>bool</type> <default>true</default> <locale name="C"> - <short>Enable java.</short> - <long>Enable java. - </long> + <short>Enable java</short> + <long>Enable java</long> </locale> </schema> <schema> @@ -90,9 +73,8 @@ <type>bool</type> <default>true</default> <locale name="C"> - <short>Enable javascript.</short> - <long>Enable javascript. - </long> + <short>Enable javascript</short> + <long>Enable javascript</long> </locale> </schema> <schema> @@ -102,9 +84,8 @@ <type>bool</type> <default>false</default> <locale name="C"> - <short>Disable URL bar.</short> - <long>Disable URL bar. - </long> + <short>Disable location bar</short> + <long>Prevent the user from entering URLs in the location bar</long> </locale> </schema> <schema> @@ -114,9 +95,8 @@ <type>bool</type> <default>false</default> <locale name="C"> - <short>Disable search bar.</short> - <long>Disable search bar. - </long> + <short>Disable search bar</short> + <long>Prevent the user from using the search bar</long> </locale> </schema> <schema> @@ -126,9 +106,8 @@ <type>bool</type> <default>false</default> <locale name="C"> - <short>Disable Cookies.</short> - <long>Disable Cookies. - </long> + <short>Disable cookies</short> + <long>Prevent the browser from storing cookies</long> </locale> </schema> <schema> @@ -138,9 +117,8 @@ <type>bool</type> <default>false</default> <locale name="C"> - <short>Disable Save Password.</short> - <long>Disable Save Password. - </long> + <short>Disable saved passwords</short> + <long>Prevent the browser from storing saved passwords</long> </locale> </schema> <schema> @@ -150,9 +128,8 @@ <type>int</type> <default>50000</default> <locale name="C"> - <short>Cache Size.</short> - <long>Cache Size. - </long> + <short>Disk cache size in KB</short> + <long>Disk cache size in KB</long> </locale> </schema> <schema> @@ -160,11 +137,10 @@ <applyto>/apps/firefox/general/homepage_url</applyto> <owner>firefox</owner> <type>string</type> - <default>http://www.opensuse.org/</default> + <default>www.novell.com/linux</default> <locale name="C"> - <short>Home Page URL.</short> - <long>Home Page URL. - </long> + <short>Home Page URL</short> + <long>Home Page URL</long> </locale> </schema> <schema> @@ -174,9 +150,8 @@ <type>string</type> <default>Desktop</default> <locale name="C"> - <short>Default downloadfolder location.</short> - <long> This is the default download folder location. - </long> + <short>Default download location</short> + <long>Default download location. Possible values include: "Desktop", "My Downloads", and "Home"</long> </locale> </schema> <schema> @@ -186,9 +161,8 @@ <type>bool</type> <default>false</default> <locale name="C"> - <short>Disable Unsafe Protocol.</short> - <long>Disable Unsafe Protocol. - </long> + <short>Disable unsafe protocols</short> + <long>Disable non-builtin protocols not explicitly enabled</long> </locale> </schema> <schema> @@ -198,9 +172,8 @@ <type>bool</type> <default>false</default> <locale name="C"> - <short>disable_bookmark_editing.</short> - <long>disable_bookmark_editing. - </long> + <short>Disable editing bookmarks</short> + <long>Prevent the user from editing browser bookmarks</long> </locale> </schema> <schema> @@ -210,9 +183,19 @@ <type>bool</type> <default>false</default> <locale name="C"> - <short>Hide Bookmarks</short> - <long>Hide Bookmarks. - </long> + <short>Disable bookmarks feature</short> + <long>Prevent the user from editing or viewing bookmarks</long> + </locale> + </schema> + <schema> + <key>/schemas/apps/firefox/lockdown/disable_show_passwords</key> + <applyto>/apps/firefox/lockdown/disable_show_passwords</applyto> + <owner>firefox</owner> + <type>bool</type> + <default>false</default> + <locale name="C"> + <short>Disable display of stored web passwords</short> + <long>Disable plain text display of stored web passwords in Preferences dialog</long> </locale> </schema> <schema> @@ -222,9 +205,8 @@ <type>bool</type> <default>false</default> <locale name="C"> - <short>Disable Javascript Chrome.</short> - <long>Disable Javascript Chrome. - </long> + <short>Prevent javascript windows from hiding chrome</short> + <long>Prevent windows opened by javascript from hiding window chrome (location bar, status bar, etc.)</long> </locale> </schema> <schema> @@ -234,9 +216,8 @@ <type>int</type> <default>0</default> <locale name="C"> - <short>Setting Cookies.</short> - <long>Setting Cookies. - </long> + <short>Cookie Lifetime Policy</short> + <long>Cookie Lifetime Policy: 0 = Accept cookies normally; 1 = Prompt for each cookie; 2 = Accept for current session only; 3 = Accept for N days</long> </locale> </schema> <schema> @@ -246,12 +227,10 @@ <type>int</type> <default>0</default> <locale name="C"> - <short>Setting Loadimages.</short> - <long>Setting Loadimages. - </long> + <short>Image loading policy</short> + <long>Image loading policy: 0 = load all images; 1 = exclude third-party image loading; 2 = exclude all image loading</long> </locale> </schema> - <schema> <key>/schemas/apps/firefox/lockdown/additional_safe_protocols</key> <applyto>/apps/firefox/lockdown/additional_safe_protocols</applyto> @@ -259,12 +238,10 @@ <type>string</type> <default></default> <locale name="C"> - <short>Additional Safe Protocols.</short> - <long>Additional Safe Protocols. - </long> + <short>Additional Safe Protocols</short> + <long>Additional Safe Protocols</long> </locale> </schema> - <schema> <key>/schemas/apps/firefox/general/trusted_URIs</key> <applyto>/apps/firefox/general/trusted_URIs</applyto> @@ -295,5 +272,18 @@ </long> </locale> </schema> + <schema> + <key>/schemas/apps/firefox/general/allowed_indirect_gnomevfs_loads</key> + <applyto>/apps/firefox/general/allowed_indirect_gnomevfs_loads</applyto> + <owner>firefox</owner> + <type>string</type> + <default>""</default> + <locale name="C"> + <short>A list of protocols, handled by gnome-vfs, that are permitted</short> + <long>A comma-separated list of protocols, handled by + gnome-vfs and of the form [scheme "://"], whose loads are + allowed.</long> + </locale> + </schema> </schemalist> </gconfschemafile> ++++++ firefox-suse-default-prefs.js ++++++ --- /var/tmp/diff_new_pack.B26364/_old 2009-05-04 18:24:52.000000000 +0200 +++ /var/tmp/diff_new_pack.B26364/_new 2009-05-04 18:24:52.000000000 +0200 @@ -1,6 +1,5 @@ pref("browser.display.use_system_colors", true); pref("general.smoothScroll", true); -pref("browser.startup.homepage_override.mstone", "ignore"); pref("font.default", "sans-serif"); pref("font.default.x-western", "sans-serif"); pref("font.name.monospace.x-western", "monospace"); @@ -10,7 +9,6 @@ pref("print.print_edge_left", 16); // 1/100 of an inch pref("print.print_edge_right", 16); // 1/100 of an inch pref("print.print_edge_bottom", 14); // 1/100 of an inch -pref("startup.homepage_override_url", "resource:/browserconfig.properties"); pref("browser.backspace_action", 2); pref("browser.tabs.loadFolderAndReplace", false); pref("browser.identity.ssl_domain_display", 1); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaFirefox for openSUSE:Factory
by root＠Hilbert.suse.de 04 May '09

04 May '09

Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at Mon May 4 18:28:37 CEST 2009. -------- --- MozillaFirefox/MozillaFirefox.changes 2009-04-28 11:06:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/MozillaFirefox/MozillaFirefox.changes 2009-05-04 09:51:38.000000000 +0200 @@ -1,0 +2,14 @@ +Mon May 4 07:57:50 CEST 2009 - wr(a)rosenauer.org + +- update to new major version 3.5b4 + * based on Gecko 1.9.1 (mozilla-xulrunner191) + * Private Browsing Mode + * TraceMonkey JavaScript engine + * Geolocation support + * native JSON and web worker threads support + * speculative parsing for faster content rendering + * Some HTML5 support +- updated firefox.schemas +- improved firefox-no-update.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- firefox-3.0.10-source.tar.bz2 firefox-lockdown.js firefox-ui-lockdown.patch l10n-3.0.10.tar.bz2 New: ---- firefox-3.5b4-source.tar.bz2 firefox.schemas l10n-3.5b4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.T25924/_old 2009-05-04 18:24:47.000000000 +0200 +++ /var/tmp/diff_new_pack.T25924/_new 2009-05-04 18:24:47.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package MozillaFirefox (Version 3.0.10) +# spec file for package MozillaFirefox (Version 3.5b4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,14 +19,14 @@ Name: MozillaFirefox -BuildRequires: gcc-c++ libgnomeui-devel libidl-devel mozilla-xulrunner190-devel orbit-devel python unzip update-desktop-files zip +BuildRequires: autoconf213 gcc-c++ libgnomeui-devel libidl-devel mozilla-xulrunner191-devel orbit-devel python unzip update-desktop-files zip %if %suse_version > 1020 BuildRequires: fdupes %endif License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) Provides: web_browser Provides: firefox -Version: 3.0.10 +Version: 3.5b4 Release: 1 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ @@ -36,7 +36,6 @@ Source2: %{name}-rpmlintrc Source3: mozilla.sh.in Source4: find-external-requires.sh -Source5: firefox-lockdown.js Source7: l10n-%{version}.tar.bz2 Source8: firefox-mimeinfo.xml Source11: firefox48.png @@ -46,21 +45,19 @@ Patch2: firefox-no-update.patch Patch14: credits.patch Patch17: firefox-appname.patch -# PATCH-FEATURE-SLED firefox-ui-lockdown.patch FATE#302023, FATE#302024 - hfiguiere(a)novell.com -Patch20: firefox-ui-lockdown.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: coreutils /bin/sh gconf2 shared-mime-info desktop-file-utils -Requires: mozilla-xulrunner190 >= %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' mozilla-xulrunner190) +Requires: mozilla-xulrunner191 >= %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' mozilla-xulrunner191) %ifarch %ix86 -Requires: mozilla-xulrunner190-32bit >= %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' mozilla-xulrunner190) +Requires: mozilla-xulrunner191-32bit >= %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' mozilla-xulrunner191) %endif -Requires: %{name}-branding >= 3.0 +Requires: %{name}-branding = 3.5 %define _unpackaged_files_terminate_build 0 %define _use_internal_dependency_generator 0 %define __find_requires sh %{SOURCE4} %global provfind sh -c "grep -v '.so' | %__find_provides" %global __find_provides %provfind -%define releasedate 2009042700 +%define releasedate 2009042600 %define progname firefox %define progdir %{_prefix}/%_lib/%{progname} %if %suse_version > 1020 @@ -89,10 +86,10 @@ %package translations Summary: Translations for MozillaFirefox License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) -Provides: locale(%{name}:af;ar;be;bg;bn_IN;ca;cs;cy;da;de;el;en_GB;eo;es_AR;es_ES;et;eu;fi;fr;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hu;id;is;it;ja;ka;kn;ko;ku;lt;lv;mk;mn;mr;nb_NO;nl;nn_NO;oc;pa_IN;pl;pt_BR;pt_PT;ro;ru;si;sk;sl;sq;sr;sv_SE;te;th;tr;uk;zh_CN;zh_TW) +Provides: locale(%{name}:af;ar;as;be;bg;bn_BD;bn_IN;ca;cs;cy;da;de;el;en_GB;es_AR;es_ES;ex_MX;et;eu;fa;fi;fr;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hr;hu;id;is;it;ja;ka;kk;kn;ko;ku;lt;lv;mk;mn;mr;nb_NO;nl;nn_NO;oc;pa_IN;pl;pt_BR;pt_PT;ro;ru;si;sk;sl;sq;sr;sv_SE;ta;te;th;tr;uk;vi;zh_CN;zh_TW) Group: System/Localization PreReq: %{name} = %{version} -Requires: mozilla-xulrunner190-translations +Requires: mozilla-xulrunner191-translations %description translations This package contains several optional languages for the user interface @@ -110,8 +107,8 @@ License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) Summary: Upstream branding for MozillaFirefox Group: Productivity/Networking/Web/Browsers -Provides: %{name}-branding = %{version} -Conflicts: otherproviders(MozillaFirefox-branding) +Provides: %{name}-branding = 3.5 +Conflicts: otherproviders(%{name}-branding) Supplements: packageand(%{name}:branding-upstream) #BRAND: Provide three files - #BRAND: /usr/lib/firefox/browserconfig.properties that contains the @@ -137,11 +134,10 @@ %prep %setup -q -n mozilla -b 7 cd $RPM_BUILD_DIR/mozilla -%patch1 -%patch2 +%patch1 -p1 +%patch2 -p1 %patch14 %patch17 -%patch20 %build export MOZ_BUILD_DATE=%{releasedate} @@ -149,6 +145,12 @@ export BUILD_OFFICIAL=1 export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing" export CXXFLAGS="$CFLAGS" +# 10.3-x86_64 build fails probably because gcc bug +%if %suse_version == 1030 +%ifarch x86_64 +export ac_cv_visibility_hidden="no" +%endif +%endif export MOZCONFIG=$RPM_BUILD_DIR/mozconfig SDKDIR=$(pkg-config --variable=sdkdir libxul) cat << EOF > $MOZCONFIG @@ -164,6 +166,7 @@ ac_add_options --with-system-nspr ac_add_options --with-system-nss ac_add_options --with-libxul-sdk=$SDKDIR +ac_add_options --with-l10n-base=../l10n ac_add_options --with-system-jpeg #ac_add_options --with-system-png # doesn't work because of missing APNG support ac_add_options --with-system-zlib @@ -226,7 +229,6 @@ %{SOURCE17} > suse-default-prefs cp suse-default-prefs $RPM_BUILD_ROOT/%{progdir}/defaults/preferences/firefox-build.js rm suse-default-prefs -cp %{SOURCE5} $RPM_BUILD_ROOT/%{progdir}/defaults/preferences/ # use correct locale for useragent cat > $RPM_BUILD_ROOT%{progdir}/defaults/preferences/firefox-l10n.js << EOF pref("general.useragent.locale", "chrome://global/locale/intl.properties"); @@ -310,8 +312,8 @@ %{progdir}/searchplugins/ %{progdir}/modules/ %attr(755,root,root) %{progdir}/%{progname}.sh +%{progdir}/%{progname} %{progdir}/application.ini -%{progdir}/firefox %{progdir}/blocklist.xml %exclude %{progdir}/updater.ini %exclude %{progdir}/removed-files @@ -319,7 +321,6 @@ %exclude %{progdir}/old-homepage-default.properties %exclude %{progdir}/components/libnkgnomevfs.so %exclude %{progdir}/run-mozilla.sh -%exclude %{progdir}/libjemalloc.so %{_datadir}/applications/%{name}.desktop %{_datadir}/mime/packages/%{progname}.xml %{_datadir}/pixmaps/firefox* @@ -338,8 +339,18 @@ %defattr(-,root,root) %{progdir}/browserconfig.properties %{progdir}/defaults/profile/bookmarks.html - %changelog +* Mon May 04 2009 wr(a)rosenauer.org +- update to new major version 3.5b4 + * based on Gecko 1.9.1 (mozilla-xulrunner191) + * Private Browsing Mode + * TraceMonkey JavaScript engine + * Geolocation support + * native JSON and web worker threads support + * speculative parsing for faster content rendering + * Some HTML5 support +- updated firefox.schemas +- improved firefox-no-update.patch * Tue Apr 28 2009 wr(a)rosenauer.org - security update to 3.0.10 * MFSA 2009-23/CVE-2009-1313 (bmo#489647) ++++++ firefox-libxul-sdk.patch ++++++ --- /var/tmp/diff_new_pack.T25924/_old 2009-05-04 18:24:48.000000000 +0200 +++ /var/tmp/diff_new_pack.T25924/_new 2009-05-04 18:24:48.000000000 +0200 @@ -1,20 +1,22 @@ -Index: browser/locales/Makefile.in -=================================================================== -RCS file: /cvsroot/mozilla/browser/locales/Makefile.in,v -retrieving revision 1.59 -diff -u -r1.59 Makefile.in ---- browser/locales/Makefile.in 10 Feb 2008 06:09:54 -0000 1.59 -+++ browser/locales/Makefile.in 29 Feb 2008 08:48:09 -0000 -@@ -172,9 +172,11 @@ - endif +diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in +--- a/browser/locales/Makefile.in ++++ b/browser/locales/Makefile.in +@@ -188,15 +188,17 @@ endif + + clobber-%: + $(RM) -rf $(DIST)/xpi-stage/locale-$* libs-%: + $(NSINSTALL) -D $(DIST)/install +ifndef LIBXUL_SDK - @$(MAKE) -C ../../toolkit/locales libs-$* -- @$(MAKE) -C ../../extensions/reporter/locales libs AB_CD=$* XPI_NAME=locale-$* - @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* + @$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1 ++ @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 +endif -+ @$(MAKE) -C ../../extensions/reporter/locales libs AB_CD=$* XPI_NAME=locale-$* - @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref + @$(MAKE) -C ../../extensions/reporter/locales libs AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 +- @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 + @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1 ifdef MOZ_BRANDING_DIRECTORY - @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* + @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 + endif + @$(MAKE) tests AB_CD=$* + ++++++ firefox-no-update.patch ++++++ --- /var/tmp/diff_new_pack.T25924/_old 2009-05-04 18:24:48.000000000 +0200 +++ /var/tmp/diff_new_pack.T25924/_new 2009-05-04 18:24:48.000000000 +0200 @@ -1,149 +1,26 @@ -Index: browser/app/profile/firefox.js -=================================================================== -RCS file: /cvsroot/mozilla/browser/app/profile/firefox.js,v -retrieving revision 1.338 -diff -u -p -6 -r1.338 firefox.js ---- browser/app/profile/firefox.js 21 Jul 2008 18:47:20 -0000 1.338 -+++ browser/app/profile/firefox.js 15 Sep 2008 13:50:07 -0000 -@@ -83,72 +83,12 @@ pref("extensions.blocklist.interval", 86 - pref("extensions.blocklist.url", "https://addons.mozilla.org/blocklist/2/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BU…"); - pref("extensions.blocklist.detailsURL", "http://%LOCALE%.www.mozilla.com/%LOCALE%/blocklist/"); +diff --git a/browser/base/content/utilityOverlay.js b/browser/base/content/utilityOverlay.js +--- a/browser/base/content/utilityOverlay.js ++++ b/browser/base/content/utilityOverlay.js +@@ -487,7 +487,11 @@ function buildHelpMenu() + // administrator or if we cannot update for some other reason + var checkForUpdates = document.getElementById("checkForUpdates"); + var canUpdate = updates.canUpdate; ++ var updateEnabled = getBoolPref("app.update.enabled", true); + checkForUpdates.setAttribute("disabled", !canUpdate); ++ checkForUpdates.setAttribute("hidden", !canUpdate || !updateEnabled); ++ var updateSeparator = document.getElementById("updateSeparator"); ++ updateSeparator.setAttribute("hidden", !canUpdate || !updateEnabled); + if (!canUpdate) + return; - // Dictionary download preference - pref("browser.dictionaries.download.url", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/firefox/%VERSION%/dictionaries/"); - --// App-specific update preferences -- --// Whether or not app updates are enabled --pref("app.update.enabled", true); -- --// This preference turns on app.update.mode and allows automatic download and --// install to take place. We use a separate boolean toggle for this to make --// the UI easier to construct. --pref("app.update.auto", true); -- --// Defines how the Application Update Service notifies the user about updates: --// --// AUM Set to: Minor Releases: Major Releases: --// 0 download no prompt download no prompt --// 1 download no prompt download no prompt if no incompatibilities --// 2 download no prompt prompt --// --// See chart in nsUpdateService.js.in for more details --// --pref("app.update.mode", 1); -- --// If set to true, the Update Service will present no UI for any event. --pref("app.update.silent", false); -- --// Update service URL: --pref("app.update.url", "https://aus2.mozilla.org/update/3/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TAR…"); --// app.update.url.manual is in branding section --// app.update.url.details is in branding section -- --// User-settable override to app.update.url for testing purposes. --//pref("app.update.url.override", ""); -- --// Interval: Time between checks for a new version (in seconds) --// default=1 day --pref("app.update.interval", 86400); --// Interval: Time before prompting the user again to restart to install the --// latest download (in seconds) default=1 day --pref("app.update.nagTimer.restart", 86400); --// Interval: When all registered timers should be checked (in milliseconds) --// default=10 minutes --pref("app.update.timer", 600000); --// Give the user x seconds to react before showing the big UI. default=12 hrs --pref("app.update.promptWaitTime", 43200); --// Show the Update Checking/Ready UI when the user was idle for x seconds --pref("app.update.idletime", 60); -- --// Whether or not we show a dialog box informing the user that the update was --// successfully applied. This is off in Firefox by default since we show a --// upgrade start page instead! Other apps may wish to show this UI, and supply --// a whatsNewURL field in their brand.properties that contains a link to a page --// which tells users what's new in this new update. --pref("app.update.showInstalledUI", false); -- --// 0 = suppress prompting for incompatibilities if there are updates available --// to newer versions of installed addons that resolve them. --// 1 = suppress prompting for incompatibilities only if there are VersionInfo --// updates available to installed addons that resolve them, not newer --// versions. --pref("app.update.incompatible.mode", 0); -- - // Symmetric (can be overridden by individual extensions) update preferences. - // e.g. - // extensions.{GUID}.update.enabled - // extensions.{GUID}.update.url - // extensions.{GUID}.update.interval - // .. etc .. -Index: browser/base/content/baseMenuOverlay.xul -=================================================================== -RCS file: /cvsroot/mozilla/browser/base/content/baseMenuOverlay.xul,v -retrieving revision 1.21 -diff -u -p -6 -r1.21 baseMenuOverlay.xul ---- browser/base/content/baseMenuOverlay.xul 6 May 2008 04:07:24 -0000 1.21 -+++ browser/base/content/baseMenuOverlay.xul 15 Sep 2008 13:50:07 -0000 -@@ -94,17 +94,17 @@ - #endif - <menuitem id="releaseNotes" - accesskey="&helpReleaseNotes.accesskey;" - label="&helpReleaseNotes.label;" - oncommand="openReleaseNotes(event)" - onclick="checkForMiddleClick(this, event);"/> -- <menuseparator id="updateSeparator"/> - <menuitem id="checkForUpdates" - accesskey="&updateCmd.accesskey;" - label="&updateCmd.label;" - class="menuitem-iconic" -+ hidden="true" - oncommand="checkForUpdates();"/> - <menuseparator id="aboutSeparator"/> - <menuitem id="aboutName" - accesskey="&aboutCmd.accesskey;" - label="&aboutCmd.label;" - oncommand="openAboutDialog();"/> -Index: browser/components/preferences/advanced.js -=================================================================== -RCS file: /cvsroot/mozilla/browser/components/preferences/advanced.js,v -retrieving revision 1.36 -diff -u -p -6 -r1.36 advanced.js ---- browser/components/preferences/advanced.js 5 Apr 2008 00:18:08 -0000 1.36 -+++ browser/components/preferences/advanced.js 15 Sep 2008 13:50:07 -0000 -@@ -387,12 +387,14 @@ var gAdvancedPane = { - getService(Components.interfaces.nsIApplicationUpdateService); - - var enabledPref = document.getElementById("app.update.enabled"); +diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js +--- a/browser/components/preferences/advanced.js ++++ b/browser/components/preferences/advanced.js +@@ -410,6 +410,7 @@ var gAdvancedPane = { var enableAppUpdate = document.getElementById("enableAppUpdate"); enableAppUpdate.disabled = !aus.canUpdate || enabledPref.locked; -+ enableAppUpdate.disabled = true; -+ enableAppUpdate.hidden = true; ++ enableAppUpdate.hidden = !aus.canUpdate || !enabledPref.value; }, /** - * Enables/disables UI for "when updates are found" based on the values, - * and "locked" states of associated preferences. - */ -Index: browser/components/safebrowsing/content/report-phishing-overlay.xul -=================================================================== -RCS file: /cvsroot/mozilla/browser/components/safebrowsing/content/report-phishing-overlay.xul,v -retrieving revision 1.13 -diff -u -p -6 -r1.13 report-phishing-overlay.xul ---- browser/components/safebrowsing/content/report-phishing-overlay.xul 15 Aug 2008 19:36:20 -0000 1.13 -+++ browser/components/safebrowsing/content/report-phishing-overlay.xul 15 Sep 2008 13:50:07 -0000 -@@ -56,12 +56,12 @@ - observes="reportPhishingBroadcaster" - oncommand="openUILink(safebrowsing.getReportURL('Phish'), event);" - onclick="checkForMiddleClick(this, event);"/> - <menuitem id="menu_HelpPopup_reportPhishingErrortoolmenu" - label="&safeb.palm.notforgery.label2;" - accesskey="&reportPhishSiteMenu.accesskey;" -- insertbefore="updateSeparator" -+ insertbefore="aboutSeparator" - observes="reportPhishingErrorBroadcaster" - oncommand="openUILinkIn(safebrowsing.getReportURL('Error'), 'tab');" - onclick="checkForMiddleClick(this, event);"/> - </menupopup> - </overlay> ++++++ firefox.schemas ++++++ <gconfschemafile> <schemalist> <schema> <key>/schemas/apps/firefox/lockdown/disable_history</key> <applyto>/apps/firefox/lockdown/disable_history</applyto> <owner>firefox</owner> <type>bool</type> <default>false</default> <locale name="C"> <short>Disable the browser history</short> <long>Prevent the browser from keeping a history of visited sites</long> </locale> </schema> <schema> <key>/schemas/apps/firefox/lockdown/disable_toolbar_editing</key> <applyto>/apps/firefox/lockdown/disable_toolbar_editing</applyto> <owner>firefox</owner> <type>bool</type> <default>false</default> <locale name="C"> <short>Disable toolbar editing</short> <long>Prevent the user from editing the toolbar</long> </locale> </schema> <schema> <key>/schemas/apps/firefox/lockdown/disable_themes</key> <applyto>/apps/firefox/lockdown/disable_themes</applyto> <owner>firefox</owner> <type>bool</type> <default>false</default> <locale name="C"> <short>Disable installing themes</short> <long>To prevent the user from installing themes</long> </locale> </schema> <schema> <key>/schemas/apps/firefox/lockdown/disable_extensions</key> <applyto>/apps/firefox/lockdown/disable_extensions</applyto> <owner>firefox</owner> <type>bool</type> <default>false</default> <locale name="C"> <short>Disable installing extensions</short> <long>Prevent the user from installing extensions</long> </locale> </schema> <schema> <key>/schemas/apps/firefox/web/disable_popups</key> <applyto>/apps/firefox/web/disable_popups</applyto> <owner>firefox</owner> <type>bool</type> <default>false</default> <locale name="C"> <short>Enable popup blocker</short> <long>Enable popup blocker without warning about blocked popups</long> </locale> </schema> <schema> <key>/schemas/apps/firefox/web/java_enabled</key> <applyto>/apps/firefox/web/java_enabled</applyto> <owner>firefox</owner> <type>bool</type> <default>true</default> <locale name="C"> <short>Enable java</short> <long>Enable java</long> </locale> </schema> <schema> <key>/schemas/apps/firefox/web/javascript_enabled</key> <applyto>/apps/firefox/web/javascript_enabled</applyto> <owner>firefox</owner> <type>bool</type> <default>true</default> <locale name="C"> <short>Enable javascript</short> <long>Enable javascript</long> </locale> </schema> <schema> <key>/schemas/apps/firefox/lockdown/disable_url_bar</key> <applyto>/apps/firefox/lockdown/disable_url_bar</applyto> <owner>firefox</owner> <type>bool</type> <default>false</default> <locale name="C"> <short>Disable location bar</short> <long>Prevent the user from entering URLs in the location bar</long> </locale> </schema> <schema> <key>/schemas/apps/firefox/lockdown/disable_searchbar</key> <applyto>/apps/firefox/lockdown/disable_searchbar</applyto> <owner>firefox</owner> <type>bool</type> <default>false</default> <locale name="C"> <short>Disable search bar</short> <long>Prevent the user from using the search bar</long> </locale> </schema> <schema> <key>/schemas/apps/firefox/web/disable_cookies</key> <applyto>/apps/firefox/web/disable_cookies</applyto> <owner>firefox</owner> <type>bool</type> <default>false</default> <locale name="C"> <short>Disable cookies</short> <long>Prevent the browser from storing cookies</long> </locale> </schema> <schema> <key>/schemas/apps/firefox/web/disable_save_password</key> <applyto>/apps/firefox/web/disable_save_password</applyto> <owner>firefox</owner> <type>bool</type> <default>false</default> <locale name="C"> <short>Disable saved passwords</short> <long>Prevent the browser from storing saved passwords</long> </locale> </schema> <schema> <key>/schemas/apps/firefox/web/cache_size</key> <applyto>/apps/firefox/web/cache_size</applyto> <owner>firefox</owner> <type>int</type> <default>50000</default> <locale name="C"> <short>Disk cache size in KB</short> <long>Disk cache size in KB</long> </locale> </schema> <schema> <key>/schemas/apps/firefox/general/homepage_url</key> <applyto>/apps/firefox/general/homepage_url</applyto> <owner>firefox</owner> <type>string</type> <default>www.novell.com/linux</default> <locale name="C"> <short>Home Page URL</short> <long>Home Page URL</long> </locale> </schema> <schema> <key>/schemas/apps/firefox/web/download_defaultfolder</key> <applyto>/apps/firefox/web/download_defaultfolder</applyto> <owner>firefox</owner> <type>string</type> <default>Desktop</default> <locale name="C"> <short>Default download location</short> <long>Default download location. Possible values include: "Desktop", "My Downloads", and "Home"</long> </locale> </schema> <schema> <key>/schemas/apps/firefox/lockdown/disable_unsafe_protocol</key> <applyto>/apps/firefox/lockdown/disable_unsafe_protocol</applyto> <owner>firefox</owner> <type>bool</type> <default>false</default> <locale name="C"> <short>Disable unsafe protocols</short> <long>Disable non-builtin protocols not explicitly enabled</long> </locale> </schema> <schema> <key>/schemas/apps/firefox/lockdown/disable_bookmark_editing</key> <applyto>/apps/firefox/lockdown/disable_bookmark_editing</applyto> <owner>firefox</owner> <type>bool</type> <default>false</default> <locale name="C"> <short>Disable editing bookmarks</short> <long>Prevent the user from editing browser bookmarks</long> </locale> </schema> <schema> <key>/schemas/apps/firefox/lockdown/hide_bookmark</key> <applyto>/apps/firefox/lockdown/hide_bookmark</applyto> <owner>firefox</owner> <type>bool</type> <default>false</default> <locale name="C"> <short>Disable bookmarks feature</short> <long>Prevent the user from editing or viewing bookmarks</long> </locale> </schema> <schema> <key>/schemas/apps/firefox/lockdown/disable_show_passwords</key> <applyto>/apps/firefox/lockdown/disable_show_passwords</applyto> <owner>firefox</owner> <type>bool</type> <default>false</default> <locale name="C"> <short>Disable display of stored web passwords</short> <long>Disable plain text display of stored web passwords in Preferences dialog</long> </locale> </schema> <schema> <key>/schemas/apps/firefox/lockdown/disable_javascript_chrome</key> <applyto>/apps/firefox/lockdown/disable_javascript_chrome</applyto> <owner>firefox</owner> <type>bool</type> <default>false</default> <locale name="C"> <short>Prevent javascript windows from hiding chrome</short> <long>Prevent windows opened by javascript from hiding window chrome (location bar, status bar, etc.)</long> </locale> </schema> <schema> <key>/schemas/apps/firefox/web/cookie_accept</key> <applyto>/apps/firefox/web/cookie_accept</applyto> <owner>firefox</owner> <type>int</type> <default>0</default> <locale name="C"> <short>Cookie Lifetime Policy</short> <long>Cookie Lifetime Policy: 0 = Accept cookies normally; 1 = Prompt for each cookie; 2 = Accept for current session only; 3 = Accept for N days</long> </locale> </schema> <schema> <key>/schemas/apps/firefox/web/images_load</key> <applyto>/apps/firefox/web/images_load</applyto> <owner>firefox</owner> <type>int</type> <default>0</default> <locale name="C"> <short>Image loading policy</short> <long>Image loading policy: 0 = load all images; 1 = exclude third-party image loading; 2 = exclude all image loading</long> </locale> </schema> <schema> <key>/schemas/apps/firefox/lockdown/additional_safe_protocols</key> <applyto>/apps/firefox/lockdown/additional_safe_protocols</applyto> <owner>firefox</owner> <type>string</type> <default></default> <locale name="C"> <short>Additional Safe Protocols</short> <long>Additional Safe Protocols</long> </locale> </schema> <schema> <key>/schemas/apps/firefox/general/trusted_URIs</key> <applyto>/apps/firefox/general/trusted_URIs</applyto> <owner>firefox</owner> <type>list</type> <list_type>string</list_type> <default>[]</default> <locale name="C"> <short>List of URIs for which Kerberos/NTLM is enabled</short> <long>A comma-separated list of URI keys, of the form [scheme "://"] [host [":" port]], for which login should be allowed via SPNEGO Kerberos or NTLM authentication. </long> </locale> </schema> <schema> <key>/schemas/apps/firefox/general/delegated_URIs</key> <applyto>/apps/firefox/general/delegated_URIs</applyto> <owner>firefox</owner> <type>list</type> <list_type>string</list_type> <default>[]</default> <locale name="C"> <short>List of URIs for which Kerberos/NTLM delegation is enabled</short> <long>A comma-separated list of URI keys, of the form [scheme "://"] [host [":" port]], for which delegation should be allowed using SPNEGO Kerberos or NTLM authentication. </long> </locale> </schema> <schema> <key>/schemas/apps/firefox/general/allowed_indirect_gnomevfs_loads</key> <applyto>/apps/firefox/general/allowed_indirect_gnomevfs_loads</applyto> <owner>firefox</owner> <type>string</type> <default>""</default> <locale name="C"> <short>A list of protocols, handled by gnome-vfs, that are permitted</short> <long>A comma-separated list of protocols, handled by gnome-vfs and of the form [scheme "://"], whose loads are allowed.</long> </locale> </schema> </schemalist> </gconfschemafile> ++++++ firefox-suse-default-prefs.js ++++++ --- /var/tmp/diff_new_pack.T25924/_old 2009-05-04 18:24:48.000000000 +0200 +++ /var/tmp/diff_new_pack.T25924/_new 2009-05-04 18:24:48.000000000 +0200 @@ -1,2 +1,3 @@ pref("general.useragent.vendor", "SUSE"); pref("general.useragent.vendorSub", "RPM_VERSION"); +pref("app.update.enabled", false); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit metacity for openSUSE:Factory
by root＠Hilbert.suse.de 04 May '09

04 May '09

Hello community, here is the log from the commit of package metacity for openSUSE:Factory checked in at Mon May 4 18:24:41 CEST 2009. -------- --- GNOME/metacity/metacity.changes 2009-03-23 23:54:26.000000000 +0100 +++ /mounts/work_src_done/STABLE/metacity/metacity.changes 2009-04-30 13:08:25.000000000 +0200 @@ -1,0 +2,30 @@ +Wed Apr 29 16:46:34 CEST 2009 - vuntz(a)novell.com + +- Update to version 2.27.0: + + Remove deprecated GTK symbols (bgo#572332) + + fix window properties bug which showed up as ignoring struts + (bgo#572573) + + include "as <username>" in window title (bgo#549389) + + Use zenity for dialogues (bgo#521914) + + Use libcanberra for sound effects (bgo#557921) + + Don't define meta_spew_event unless verbose mode is on + (bgo#571126) + + Fix README to give correct switch names (bgo#571210) + + Windows which couldn't appear in alt-tab don't get there by + being urgent + + Skip the first window in alt-tab only if it's actually current + (bgo#535887) + + Optimise line coordinate storage + + Queue resize on window undecorate + + Fix description of "show desktop" (bgo#569649) + + Wrap g_error calls in braces + + Updated translations +- Add libcanberra-devel, libgtop-devel BuildRequires. +- Remove unneeded libglade2-devel BuildRequires. +- Add zenity Requires. +- Drop metacity-buggy-struts.patch: fixed upstream. +- Do not package .la files. +- Do not package /usr/lib/metacity anymore since the small binary + there has been removed and zenity is now used instead. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- metacity-2.26.0.tar.bz2 metacity-buggy-struts.patch New: ---- metacity-2.27.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ metacity.spec ++++++ --- /var/tmp/diff_new_pack.V22459/_old 2009-05-04 18:23:57.000000000 +0200 +++ /var/tmp/diff_new_pack.V22459/_new 2009-05-04 18:23:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package metacity (Version 2.26.0) +# spec file for package metacity (Version 2.27.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,20 +24,19 @@ BuildRequires: gnome-doc-utils-devel BuildRequires: gtk2-devel BuildRequires: intltool -BuildRequires: libglade2-devel +BuildRequires: libcanberra-devel +BuildRequires: libgtop-devel BuildRequires: startup-notification-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: zenity License: GPL v2 or later Group: System/GUI/GNOME -Version: 2.26.0 +Version: 2.27.0 Release: 1 Summary: A Fast Window Manager for the GNOME 2.x Desktop Source: %{name}-%{version}.tar.bz2 Patch: metacity-ping-timeout.patch -# PATCH-FIX-UPSTREAM metacity-buggy-struts.patch bgo572573 metacity-buggy-struts.patch vuntz(a)novell.com -- Fix metacity not reading struts correctly -Patch1: metacity-buggy-struts.patch # PATCH-FIX-OPENSUSE metacity-bnc385553-buggy-intel-xinerama.diff bnc385553 federico(a)novell.com - Sanitize overlapping (cloned) monitors from Xinerama Patch11: metacity-bnc385553-buggy-intel-xinerama.diff Url: http://www.gnome.org @@ -48,6 +47,7 @@ # BuildRequires: control-center2 # Requires: libgnome control-center2 Requires: libgnome +Requires: zenity Requires: %{name}-lang = %{version} Provides: windowmanager %gconf_schemas_prereq @@ -62,7 +62,7 @@ %package devel License: GPL v2 or later Summary: Include Files and Libraries mandatory for Development -Group: System/GUI/GNOME +Group: Development/Libraries/GNOME Requires: %{name} = %{version} gconf2-devel gtk2-devel orbit2-devel startup-notification-devel %description devel @@ -76,7 +76,6 @@ %setup -q translation-update-upstream %patch -p1 -%patch1 -p1 %patch11 -p1 %build @@ -88,6 +87,7 @@ %install %makeinstall +%{__rm} %{buildroot}/%{_libdir}/*.la %suse_update_desktop_file metacity %find_lang %{name} %find_gconf_schemas @@ -117,7 +117,6 @@ %{_datadir}/metacity %{_datadir}/themes/* %doc %{_mandir}/man*/* -%{_prefix}/lib/metacity # Avoid cyclic dependency on control-center %dir %{_datadir}/gnome-control-center %dir %{_datadir}/gnome-control-center/keybindings @@ -140,11 +139,37 @@ %defattr (-, root, root) %{_includedir}/metacity-1 %{_libdir}/*.so -%{_libdir}/*.*a %{_libdir}/pkgconfig/*.pc %changelog -* Mon Mar 23 2009 vuntz(a)novell.com +* Wed Apr 29 2009 vuntz(a)novell.com +- Update to version 2.27.0: + + Remove deprecated GTK symbols (bgo#572332) + + fix window properties bug which showed up as ignoring struts + (bgo#572573) + + include "as <username>" in window title (bgo#549389) + + Use zenity for dialogues (bgo#521914) + + Use libcanberra for sound effects (bgo#557921) + + Don't define meta_spew_event unless verbose mode is on + (bgo#571126) + + Fix README to give correct switch names (bgo#571210) + + Windows which couldn't appear in alt-tab don't get there by + being urgent + + Skip the first window in alt-tab only if it's actually current + (bgo#535887) + + Optimise line coordinate storage + + Queue resize on window undecorate + + Fix description of "show desktop" (bgo#569649) + + Wrap g_error calls in braces + + Updated translations +- Add libcanberra-devel, libgtop-devel BuildRequires. +- Remove unneeded libglade2-devel BuildRequires. +- Add zenity Requires. +- Drop metacity-buggy-struts.patch: fixed upstream. +- Do not package .la files. +- Do not package /usr/lib/metacity anymore since the small binary + there has been removed and zenity is now used instead. +* Tue Mar 24 2009 vuntz(a)novell.com - Add metacity-buggy-struts.patch to fix metacity not reading struts correctly (ie, windows being put behind the panels). * Mon Mar 16 2009 mboman(a)suse.de @@ -274,7 +299,7 @@ * Fri Mar 14 2008 maw(a)suse.de - Update to version 2.22.0: + Updated translations. -* Tue Mar 04 2008 maw(a)suse.de +* Wed Mar 05 2008 maw(a)suse.de - Update to version 2.21.21: + Allow shaped windows in the preview widget + Updated translations. @@ -301,7 +326,7 @@ + Updated translations - Respin several patches due to changes metacity's source directory layout. -* Wed Dec 19 2007 maw(a)suse.de +* Thu Dec 20 2007 maw(a)suse.de - Update to version 2.21.5: + Add --sync option, like all other gtk+ apps + Bugs (bugzilla.gnome.org) fixed: #461927, #469682, #486445, @@ -388,7 +413,7 @@ - remove metacity-2.12.0-border-effects.patch, which is a useless deviation from upstream to add a gconf option that probably no one even knows exists any more. #203087 -* Wed Sep 13 2006 jhargadon(a)suse.de +* Thu Sep 14 2006 jhargadon(a)suse.de - update to version 2.16.0 - updated translations - Fix the build with c89/gcc 2.95 @@ -455,7 +480,7 @@ - Use translation compendium gnome-patch-translation. * Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Tue Jan 17 2006 dobey(a)suse.de +* Wed Jan 18 2006 dobey(a)suse.de - Use Chlorophyll as the default theme now * Thu Dec 01 2005 gekker(a)suse.de - Update to version 2.12.2 ++++++ metacity-2.26.0.tar.bz2 -> metacity-2.27.0.tar.bz2 ++++++ ++++ 124514 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lxc for openSUSE:Factory
by root＠Hilbert.suse.de 04 May '09

04 May '09

Hello community, here is the log from the commit of package lxc for openSUSE:Factory checked in at Mon May 4 18:23:46 CEST 2009. -------- --- lxc/lxc.changes 2009-04-17 20:09:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/lxc/lxc.changes 2009-05-04 12:16:35.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 4 11:52:14 CEST 2009 - jslaby(a)suse.de + +- update to 0.6.2: fixes creation scripts for several distros, + adds logging, adds lxc-setcap + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- lxc-0.6.0.tar.bz2 New: ---- lxc-0.6.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxc.spec ++++++ --- /var/tmp/diff_new_pack.i21060/_old 2009-05-04 18:23:29.000000000 +0200 +++ /var/tmp/diff_new_pack.i21060/_new 2009-05-04 18:23:29.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package lxc (Version 0.6.0) +# spec file for package lxc (Version 0.6.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,8 +18,8 @@ Name: lxc -Version: 0.6.0 -Release: 2 +Version: 0.6.2 +Release: 1 Url: http://lxc.sourceforge.net/ Summary: Lxc container implementation Group: System/Management @@ -66,7 +66,7 @@ %build # it searches for setcap, sbin is not included in PATH export PATH=$PATH:/sbin -%configure --disable-static --with-pic +%configure --disable-static --with-pic --libexecdir=%{_prefix}/lib/%{name} %{__make} %{?jobs:-j%jobs} %install @@ -86,6 +86,8 @@ %defattr(-,root,root) %config %{_sysconfdir}/%{name} %{_libdir}/liblxc-%{version}.so +%dir %{_prefix}/lib/lxc/ +%{_prefix}/lib/lxc/lxc-init %{_bindir}/%{name}-* %{_mandir}/man[^3]/* @@ -95,6 +97,9 @@ %{_libdir}/liblxc.so %changelog +* Mon May 04 2009 jslaby(a)suse.de +- update to 0.6.2: fixes creation scripts for several distros, + adds logging, adds lxc-setcap * Fri Apr 17 2009 crrodriguez(a)suse.de - remove static libraries * Mon Feb 23 2009 jslaby(a)suse.de ++++++ lxc-0.6.0.tar.bz2 -> lxc-0.6.2.tar.bz2 ++++++ ++++ 26175 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libwebkit for openSUSE:Factory
by root＠Hilbert.suse.de 04 May '09

04 May '09

Hello community, here is the log from the commit of package libwebkit for openSUSE:Factory checked in at Mon May 4 18:23:24 CEST 2009. -------- --- libwebkit/libwebkit.changes 2009-04-17 13:57:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/libwebkit/libwebkit.changes 2009-04-29 16:53:59.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Apr 29 16:45:03 CEST 2009 - vuntz(a)novell.com + +- Update to version 1.1.6 (not everything is listed in ChangeLog: + + Added support for generating API docs in the Qt build using + "make docs" + + Add enchant support for spell-checking-languages property to + work properly. + + [GTK] Error reporting + + Quite some accessibility improvements + + New printing API. +- Add enchant-devel BuildRequires. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- webkit-1.1.5.tar.bz2 New: ---- webkit-1.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libwebkit.spec ++++++ --- /var/tmp/diff_new_pack.T17746/_old 2009-05-04 18:20:56.000000000 +0200 +++ /var/tmp/diff_new_pack.T17746/_new 2009-05-04 18:20:56.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libwebkit (Version 1.1.5) +# spec file for package libwebkit (Version 1.1.6) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,6 +20,7 @@ Name: libwebkit Url: http://webkit.org/ BuildRequires: bison +BuildRequires: enchant-devel BuildRequires: flex BuildRequires: gcc-c++ # Add geoclue-devel when available. @@ -36,7 +37,7 @@ Group: Development/Libraries/C and C++ Summary: Library for rendering web content, GTK+ Port BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 1.1.5 +Version: 1.1.6 Release: 1 Source: webkit-%{version}.tar.bz2 %define debug_package_requires libwebkit-1_0-2 = %{version}-%{release} @@ -192,6 +193,16 @@ %files lang -f webkit.lang %changelog +* Wed Apr 29 2009 vuntz(a)novell.com +- Update to version 1.1.6 (not everything is listed in ChangeLog: + + Added support for generating API docs in the Qt build using + "make docs" + + Add enchant support for spell-checking-languages property to + work properly. + + [GTK] Error reporting + + Quite some accessibility improvements + + New printing API. +- Add enchant-devel BuildRequires. * Fri Apr 17 2009 vuntz(a)novell.com - Make libwebkit-1_0-2 provides libwebkit so that the lang package is installable. ++++++ webkit-1.1.5.tar.bz2 -> webkit-1.1.6.tar.bz2 ++++++ ++++ 45878 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0