July 2008 - openSUSE Commits - openSUSE Mailing Lists

commit PackageKit
by root＠Hilbert.suse.de 25 Jul '08

25 Jul '08

Hello community, here is the log from the commit of package PackageKit checked in at Fri Jul 25 16:58:58 CEST 2008. -------- --- PackageKit/PackageKit.changes 2008-07-03 01:27:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/PackageKit/PackageKit.changes 2008-07-18 17:57:18.552699000 +0200 @@ -1,0 +2,8 @@ +Fri Jul 18 01:18:27 CEST 2008 - sreeves(a)suse.de + +- Move to 0.2.3 + Add PkCatalog for installing catalogs + Add source filter support. + Allow adding and removing multiple packages at one time with pkcon + +------------------------------------------------------------------- Old: ---- PackageKit-0.2.1.tar.bz2 PackageKit-ac.patch PackageKit-bnc389415.patch PackageKit-bnc398367-bnc398380.patch PackageKit-bnc398391-2.patch PackageKit-bnc398391.patch PackageKit_libzypp_api_change.patch PackageKit-openSUSE-branch.patch New: ---- PackageKit-0.2.3.tar.bz2 PackageKit-0.2.3-to-git20080717.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit.spec ++++++ --- /var/tmp/diff_new_pack.R28703/_old 2008-07-25 16:58:42.000000000 +0200 +++ /var/tmp/diff_new_pack.R28703/_new 2008-07-25 16:58:42.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package PackageKit (Version 0.2.1) +# spec file for package PackageKit (Version 0.2.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,8 +11,8 @@ Name: PackageKit -Version: 0.2.1 -Release: 23 +Version: 0.2.3 +Release: 1 License: GPL v2 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: NetworkManager-devel PolicyKit-devel dbus-1-glib-devel fdupes gcc-c++ glib2-devel gtk-doc intltool libzypp-devel perl-XML-Parser python-devel sqlite-devel @@ -21,13 +21,7 @@ Url: http://packagekit.org/ Source: %{name}-%{version}.tar.bz2 Patch: PackageKit_release.patch -Patch1: PackageKit-ac.patch -Patch2: PackageKit-openSUSE-branch.patch -Patch3: PackageKit-bnc398367-bnc398380.patch -Patch4: PackageKit-bnc398391.patch -Patch5: PackageKit-bnc389415.patch -Patch6: PackageKit-bnc398391-2.patch -Patch7: PackageKit_libzypp_api_change.patch +Patch1: PackageKit-0.2.3-to-git20080717.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on Requires: dbus-1 PolicyKit @@ -97,14 +91,8 @@ %prep %setup -q -n %{name}-%{version} -%patch -p1 -%patch1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p0 +%patch -p0 +%patch1 -p1 %build # uncomment out the following line if autotools should be run again (i.e., @@ -147,6 +135,7 @@ %dir %{_libdir}/pm-utils/sleep.d %dir /var/lib/PackageKit %dir /var/run/PackageKit +%dir /lib/udev %dir /usr/share/locale/no_nb %dir /usr/share/locale/no_nb/LC_MESSAGES %dir /usr/share/locale/sr@latin @@ -154,6 +143,7 @@ %{_sysconfdir}/bash_completion.d/pk-completion.bash %{_sysconfdir}/PackageKit/PackageKit.conf %{_sysconfdir}/dbus-1/system.d/org.freedesktop.PackageKit.conf +%{_sysconfdir}/udev/rules.d/51-packagekit-firmware.rules %{_bindir}/packagekit-bugreport.sh %{_bindir}/pkcon %{_bindir}/pkmon @@ -169,6 +159,8 @@ %{_datadir}/PackageKit/helpers/test_spawn/search-name.sh %{_datadir}/PolicyKit/policy/org.freedesktop.packagekit.policy %{_datadir}/dbus-1/system-services/* +%{_datadir}/mime/packages/packagekit-catalog.xml +/lib/udev/packagekit-firmware.sh %verify(not md5 size mtime) /var/lib/PackageKit/transactions.db %verify(not md5 size mtime) /var/run/PackageKit/job_count.dat @@ -183,6 +175,11 @@ %{_libdir}/libpackagekit.so %changelog +* Fri Jul 18 2008 sreeves(a)suse.de +- Move to 0.2.3 + Add PkCatalog for installing catalogs + Add source filter support. + Allow adding and removing multiple packages at one time with pkcon * Thu Jul 03 2008 sreeves(a)suse.de - Match libzypp API change * Wed Jun 25 2008 sreeves(a)suse.de ++++++ PackageKit-0.2.1.tar.bz2 -> PackageKit-0.2.3.tar.bz2 ++++++ ++++ 59817 lines of diff (skipped) ++++++ PackageKit-0.2.3-to-git20080717.patch ++++++ diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp index e666c8e..a1b4051 100644 --- a/backends/zypp/pk-backend-zypp.cpp +++ b/backends/zypp/pk-backend-zypp.cpp @@ -1349,7 +1349,8 @@ backend_get_repo_list (PkBackend *backend, PkFilterEnum filters) std::list <zypp::RepoInfo> repos; try { - repos = manager.knownRepositories(); + //repos = manager.knownRepositories(); + repos = std::list<zypp::RepoInfo>(manager.repoBegin(),manager.repoEnd()); } catch ( const zypp::Exception &e) { diff --git a/backends/zypp/zypp-utils.cpp b/backends/zypp/zypp-utils.cpp index 293dba3..47e4e1e 100644 --- a/backends/zypp/zypp-utils.cpp +++ b/backends/zypp/zypp-utils.cpp @@ -165,7 +165,8 @@ zypp_build_pool (gboolean include_local) zypp::RepoManager manager; std::list<zypp::RepoInfo> repos; try { - repos = manager.knownRepositories (); + //repos = manager.knownRepositories (); + repos = std::list<zypp::RepoInfo>(manager.repoBegin(),manager.repoEnd()); for (std::list<zypp::RepoInfo>::iterator it = repos.begin(); it != repos.end (); it++) { zypp::RepoInfo repo (*it); @@ -861,7 +862,8 @@ zypp_refresh_cache (PkBackend *backend, gboolean force) std::list <zypp::RepoInfo> repos; try { - repos = manager.knownRepositories(); + //repos = manager.knownRepositories(); + repos = std::list<zypp::RepoInfo>(manager.repoBegin(),manager.repoEnd()); } catch ( const zypp::Exception &e) { diff --git a/client/pk-import-desktop.c b/client/pk-import-desktop.c index 20bc866..2e5fb9b 100644 --- a/client/pk-import-desktop.c +++ b/client/pk-import-desktop.c @@ -132,16 +132,6 @@ pk_desktop_process_desktop (const gchar *package_name, const gchar *filename) gsize len; gchar *locale_temp; static GPtrArray *locale_array = NULL; - const gchar *icon_name; - const gchar *summary; - - /* can we optimise for the common case? */ - icon_name = pk_extra_get_icon_name (extra, package_name); - summary = pk_extra_get_summary (extra, package_name); - if (icon_name != NULL || summary != NULL) { - g_print ("PackageName:\t%s\t[skipping]\n", package_name); - return; - } key = g_key_file_new (); ret = g_key_file_load_from_file (key, filename, G_KEY_FILE_KEEP_TRANSLATIONS, NULL); diff --git a/src/pk-backend.c b/src/pk-backend.c index 1853c9b..317716e 100644 --- a/src/pk-backend.c +++ b/src/pk-backend.c @@ -2204,7 +2204,7 @@ libst_backend (LibSelfTest *test) if (text == NULL) { libst_success (test, NULL); } else { - libst_failed (test, "invalid name %s", text); + libst_failed (test, "invalid name %s (test suite needs to unref backend?)", text); } g_free (text); diff --git a/src/pk-transaction-list.c b/src/pk-transaction-list.c index f325f94..ad5b41f 100644 --- a/src/pk-transaction-list.c +++ b/src/pk-transaction-list.c @@ -53,7 +53,6 @@ static void pk_transaction_list_finalize (GObject *object); struct PkTransactionListPrivate { GPtrArray *array; - gchar *current_tid; }; typedef struct { @@ -135,24 +134,18 @@ pk_transaction_list_role_present (PkTransactionList *tlist, PkRoleEnum role) } /** - * pk_transaction_list_remove: + * pk_transaction_list_remove_internal: **/ gboolean -pk_transaction_list_remove (PkTransactionList *tlist, PkTransaction *transaction) +pk_transaction_list_remove_internal (PkTransactionList *tlist, PkTransactionItem *item) { gboolean ret; - PkTransactionItem *item; g_return_val_if_fail (PK_IS_TRANSACTION_LIST (tlist), FALSE); - g_return_val_if_fail (transaction != NULL, FALSE); + g_return_val_if_fail (item != NULL, FALSE); - item = pk_transaction_list_get_from_transaction (tlist, transaction); - if (item == NULL) { - pk_warning ("could not get item"); - return FALSE; - } /* valid item */ - pk_debug ("remove transaction %p, item %p", item->transaction, item); + pk_debug ("remove transaction %s, item %p", item->tid, item); ret = g_ptr_array_remove (tlist->priv->array, item); if (ret == FALSE) { pk_warning ("could not remove %p as not present in list", item); @@ -161,10 +154,34 @@ pk_transaction_list_remove (PkTransactionList *tlist, PkTransaction *transaction g_object_unref (item->transaction); g_free (item->tid); g_free (item); - return TRUE; } +/** + * pk_transaction_list_remove: + **/ +gboolean +pk_transaction_list_remove (PkTransactionList *tlist, PkTransaction *transaction) +{ + PkTransactionItem *item; + gboolean ret; + + g_return_val_if_fail (PK_IS_TRANSACTION_LIST (tlist), FALSE); + g_return_val_if_fail (transaction != NULL, FALSE); + + item = pk_transaction_list_get_from_transaction (tlist, transaction); + if (item == NULL) { + pk_warning ("could not get item"); + return FALSE; + } + if (item->finished) { + pk_warning ("already finished, so waiting to timeout"); + return FALSE; + } + ret = pk_transaction_list_remove_internal (tlist, item); + return ret; +} + /* we need this for the finished data */ typedef struct { PkTransactionList *tlist; @@ -180,7 +197,7 @@ pk_transaction_list_remove_item_timeout (gpointer data) PkTransactionFinished *finished = (PkTransactionFinished *) data; pk_debug ("transaction %s completed, removing", finished->item->tid); - pk_transaction_list_remove (finished->tlist, finished->item->transaction); + pk_transaction_list_remove_internal (finished->tlist, finished->item); g_free (finished); return FALSE; } diff --git a/src/pk-transaction.c b/src/pk-transaction.c index 8e318c7..97875a7 100644 --- a/src/pk-transaction.c +++ b/src/pk-transaction.c @@ -1153,7 +1153,7 @@ pk_transaction_cancel (PkTransaction *transaction, GError **error) g_return_val_if_fail (PK_IS_TRANSACTION (transaction), FALSE); g_return_val_if_fail (transaction->priv->tid != NULL, FALSE); - pk_debug ("Cancel method called"); + pk_debug ("Cancel method called on %s", transaction->priv->tid); /* if it's never been run, just remove this transaction from the list */ if (!transaction->priv->has_been_run) { ++++++ PackageKit_release.patch ++++++ --- /var/tmp/diff_new_pack.R28703/_old 2008-07-25 16:58:45.000000000 +0200 +++ /var/tmp/diff_new_pack.R28703/_new 2008-07-25 16:58:45.000000000 +0200 @@ -1,33 +1,30 @@ -diff --git a/etc/PackageKit.conf.in b/etc/PackageKit.conf.in -index 7d6fca8..3915a5c 100644 ---- a/etc/PackageKit.conf.in -+++ b/etc/PackageKit.conf.in -@@ -9,7 +9,7 @@ TransactionLogging=true - +--- etc/PackageKit.conf.in ++++ etc/PackageKit.conf.in +@@ -23,7 +23,7 @@ # Shut down the daemon after this many seconds idle. 0 means don't shutdown. + # # default=300 -ShutdownTimeout=300 +ShutdownTimeout=15 # Default backend, as chosen in the configure script. This will be used where # no --backend="foo" option is given to the daemon. -diff --git a/data/Makefile.am b/data/Makefile.am -index 65a0200..59ac17f 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -10,21 +10,12 @@ SUBDIRS = \ +--- data/Makefile.am ++++ data/Makefile.am +@@ -10,12 +10,6 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = packagekit.pc -cronfiledir = ${SYSCONFDIR}/cron.daily --cronfile_DATA = packagekit-background.cron +-cronfile_SCRIPTS = packagekit-background.cron - -crondatadir = ${SYSCONFDIR}/sysconfig --crondata_DATA = packagekit-background +-crondata_SCRIPTS = packagekit-background - pmutilsdir = $(libdir)/pm-utils/sleep.d pmutils_DATA = 95packagekit +@@ -27,9 +21,6 @@ dbusdir = ${SYSCONFDIR}/dbus-1/system.d dist_dbus_DATA = \ org.freedesktop.PackageKit.conf \ @@ -37,7 +34,7 @@ $(NULL) servicemaindir = $(DBUS_SERVICES_DIR) -@@ -33,24 +24,6 @@ servicemain_DATA = $(servicemain_in_files:.service.in=.service) +@@ -38,24 +29,6 @@ $(servicemain_DATA): $(servicemain_in_files) Makefile @sed -e "s|\@servicedir\@|$(sbindir)|" -e "s|\@PACKAGEKIT_USER\@|$(PACKAGEKIT_USER)|" $< > $@ @@ -62,7 +59,7 @@ localcachedir = $(localstatedir)/run/PackageKit localcache_DATA = \ job_count.dat \ -@@ -63,17 +36,9 @@ database_DATA = \ +@@ -68,17 +41,9 @@ EXTRA_DIST = \ 95packagekit \ @@ -77,12 +74,12 @@ - $(serviceyum_in_files) \ - $(servicetest_in_files) \ - $(serviceapt_in_files) \ + $(mime_in_files) \ $(localcache_DATA) \ $(database_DATA) \ - $(NULL) -@@ -83,9 +48,6 @@ clean-local: - +@@ -93,9 +58,6 @@ DISTCLEANFILES = \ + $(mime_DATA) \ org.freedesktop.PackageKit.service \ - org.freedesktop.PackageKitTestBackend.service \ - org.freedesktop.PackageKitYumBackend.service \ @@ -90,13 +87,3 @@ $(NULL) MAINTAINERCLEANFILES = \ -diff --git a/contrib/Makefile.am b/contrib/Makefile.am -index acfd88c..a9d1506 100644 ---- a/contrib/Makefile.am -+++ b/contrib/Makefile.am -@@ -1,4 +1,4 @@ --SUBDIRS = udev -+SUBDIRS = - - if BACKEND_TYPE_YUM - SUBDIRS += yum-packagekit ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 open-iscsi
by root＠Hilbert.suse.de 25 Jul '08

25 Jul '08

Hello community, here is the log from the commit of package open-iscsi checked in at Fri Jul 25 16:58:49 CEST 2008. -------- --- open-iscsi/open-iscsi.changes 2008-04-29 12:29:01.000000000 +0200 +++ /mounts/work_src_done/STABLE/open-iscsi/open-iscsi.changes 2008-07-25 11:35:03.945537000 +0200 @@ -1,0 +2,9 @@ +Thu Jul 24 12:04:10 CEST 2008 - hare(a)suse.de + +- Update to 2.0-870-rc1 + * Fix login redirection + * Fix NOP timeout handling + * Various small bugfixes +- Include mkinitrd scriptlets. + +------------------------------------------------------------------- Old: ---- open-iscsi-2.0-865.tar.bz2 open-iscsi-866.diff open-iscsi-backport-fwparam_ibft open-iscsi-fix-suse-build open-iscsi-format-luns open-iscsi-fwparam-scan-in-blocks open-iscsi-git-update open-iscsi-ibft-fill-initiator-values open-iscsi-ibft-print-ifspec open-iscsi-ibft-scan-memory-area open-iscsi-print-ibft-error-to-stderr open-iscsi-teardown-device-stack open-iscsi-update-nodes New: ---- mkinitrd-boot.sh mkinitrd-setup.sh mkinitrd-stop.sh open-iscsi-2.0-870-rc1.tar.bz2 open-iscsi-start-target-before-initiator open-iscsi-suse-build-fixes open-iscsi-update-init-script ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-iscsi.spec ++++++ --- /var/tmp/diff_new_pack.Z28212/_old 2008-07-25 16:58:36.000000000 +0200 +++ /var/tmp/diff_new_pack.Z28212/_new 2008-07-25 16:58:36.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package open-iscsi (Version 2.0.869) +# spec file for package open-iscsi (Version 2.0.870) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -18,27 +18,21 @@ Group: Productivity/Networking/Other PreReq: %fillup_prereq %insserv_prereq AutoReqProv: on -Version: 2.0.869 +Version: 2.0.870 Release: 1 Provides: linux-iscsi Obsoletes: linux-iscsi %define iscsi_release 865 Summary: Linux* Open-iSCSI Software Initiator -Source: %{name}-2.0-865.tar.bz2 +Source: %{name}-2.0-870-rc1.tar.bz2 +Source5: mkinitrd-setup.sh +Source6: mkinitrd-boot.sh +Source7: mkinitrd-stop.sh Source11: iscsi-gen-initiatorname.sh -Patch1: %{name}-866.diff -Patch2: %{name}-git-update -Patch5: %{name}-format-luns -Patch22: %{name}-fwparam-scan-in-blocks -Patch24: %{name}-update-nodes -Patch30: %{name}-backport-fwparam_ibft -Patch31: %{name}-fix-suse-build -Patch32: %{name}-ibft-fill-initiator-values -Patch33: %{name}-ibft-print-ifspec -Patch37: %{name}-print-ibft-error-to-stderr -Patch38: %{name}-teardown-device-stack -Patch39: %{name}-fwparam_ppc-string-overflow -Patch40: %{name}-ibft-scan-memory-area +Patch1: %{name}-start-target-before-initiator +Patch2: %{name}-suse-build-fixes +Patch3: %{name}-fwparam_ppc-string-overflow +Patch4: %{name}-update-init-script BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -67,21 +61,11 @@ open-iscsi(a)googlegroups.com %prep -%setup -n %{name}-2.0-865 -%patch1 +%setup -n %{name}-2.0-870-rc1 +%patch1 -p1 %patch2 -p1 -%patch5 -p1 -%patch22 -p1 -%patch24 -p1 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch37 -p1 -%patch38 -p1 -%patch39 -p1 -%patch40 -p1 -cp etc/iface.example . +%patch3 -p1 +%patch4 -p1 %build %{__make} OPTFLAGS="${RPM_OPT_FLAGS}" @@ -90,6 +74,10 @@ make DESTDIR=${RPM_BUILD_ROOT} install make DESTDIR=${RPM_BUILD_ROOT} install_initd_suse install -D -m 755 %{S:11} ${RPM_BUILD_ROOT}/sbin/iscsi-gen-initiatorname +install -d $RPM_BUILD_ROOT/lib/mkinitrd/scripts +install -m 755 %{S:5} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/setup-iscsi.sh +install -m 755 %{S:6} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-iscsi.sh +install -m 755 %{S:7} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-killiscsi.sh (cd ${RPM_BUILD_ROOT}/sbin; ln -sf /etc/init.d/open-iscsi rcopen-iscsi) (cd ${RPM_BUILD_ROOT}/etc; ln -sf iscsi/iscsid.conf iscsid.conf) @@ -110,17 +98,29 @@ %files %defattr(-,root,root) +%dir /etc/iscsi %attr(0600,root,root) %config(noreplace) /etc/iscsi/iscsid.conf +%dir /etc/iscsi/ifaces +/etc/iscsi/ifaces/iface.example /etc/iscsid.conf %config /etc/init.d/open-iscsi %config /etc/init.d/boot.open-iscsi /sbin/* -%dir /etc/iscsi -%doc iface.example +%dir /lib/mkinitrd +%dir /lib/mkinitrd/scripts +/lib/mkinitrd/scripts/setup-iscsi.sh +/lib/mkinitrd/scripts/boot-iscsi.sh +/lib/mkinitrd/scripts/boot-killiscsi.sh %doc COPYING README %doc %{_mandir}/man8/* %changelog +* Thu Jul 24 2008 hare(a)suse.de +- Update to 2.0-870-rc1 + * Fix login redirection + * Fix NOP timeout handling + * Various small bugfixes +- Include mkinitrd scriptlets. * Tue Apr 29 2008 hare(a)suse.de - Pull in fixes from upstream git repository * Mon Apr 21 2008 hare(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 obexfs
by root＠Hilbert.suse.de 25 Jul '08

25 Jul '08

Hello community, here is the log from the commit of package obexfs checked in at Fri Jul 25 16:58:33 CEST 2008. -------- --- obexfs/obexfs.changes 2007-08-10 20:20:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/obexfs/obexfs.changes 2008-07-25 13:25:09.544165000 +0200 @@ -1,0 +2,7 @@ +Fri Jul 25 13:23:39 CEST 2008 - mszeredi(a)suse.de + +- updated to version 0.11 + * Added automatic bt channel selection + * Added USB discovery + +------------------------------------------------------------------- Old: ---- obexfs-0.10.tar.bz2 obexfs-optflags.patch New: ---- obexfs-0.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ obexfs.spec ++++++ --- /var/tmp/diff_new_pack.o26294/_old 2008-07-25 16:58:04.000000000 +0200 +++ /var/tmp/diff_new_pack.o26294/_new 2008-07-25 16:58:04.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package obexfs (Version 0.10) +# spec file for package obexfs (Version 0.11) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,17 +10,17 @@ # norootforbuild + Name: obexfs BuildRequires: fuse-devel glib2-devel libusb-devel licenses obexftp-devel openobex-devel Requires: fuse licenses Summary: FUSE based filesystem using ObexFTP -Version: 0.10 -Release: 82 +Version: 0.11 +Release: 1 License: GPL v2 or later Group: System/Filesystems Source: %{name}-%{version}.tar.bz2 -Patch: obexfs-optflags.patch -URL: http://openobex.triq.net/obexfs +Url: http://openobex.triq.net/obexfs BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -35,7 +35,6 @@ %prep %setup -q -%patch0 %build autoreconf -fi @@ -56,18 +55,22 @@ %{_bindir}/* %changelog -* Fri Aug 10 2007 - bk(a)suse.de +* Fri Jul 25 2008 mszeredi(a)suse.de +- updated to version 0.11 + * Added automatic bt channel selection + * Added USB discovery +* Fri Aug 10 2007 bk(a)suse.de - Add "Requires: fuse" to ensure that fuse is present (285101#c29) - Remove nicely empty TODO :-) and symlink COPYING from licenses -* Tue May 22 2007 - mszeredi(a)suse.de +* Tue May 22 2007 mszeredi(a)suse.de - added libusb-devel build dependency -* Sun Oct 29 2006 - meissner(a)suse.de +* Sun Oct 29 2006 meissner(a)suse.de - use RPM_OPT_FLAGS -* Fri Aug 04 2006 - cthiel(a)suse.de +* Fri Aug 04 2006 cthiel(a)suse.de - update to version 0.10 * Removed statfs (caused problems on all but Siemens) * 64-bit safe printf format * added usb support * device/channel code cleanup -* Sun Apr 23 2006 - cthiel(a)suse.de +* Mon Apr 24 2006 cthiel(a)suse.de - initial package (version 0.8) ++++++ obexfs-0.10.tar.bz2 -> obexfs-0.11.tar.bz2 ++++++ ++++ 10200 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/obexfs-0.10/ChangeLog new/obexfs-0.11/ChangeLog --- old/obexfs-0.10/ChangeLog 2006-07-04 19:23:12.000000000 +0200 +++ new/obexfs-0.11/ChangeLog 2008-06-15 22:12:16.000000000 +0200 @@ -1,7 +1,39 @@ +ObexFS 0.11 (released 2008-06-15) +--------------------------------- + +2007-09-05 Christian W. Zuckschwerdt <zany(a)triq.net> + + * Removing Bluez dependency + * Switching ObexFTP to pkg-config + +2007-07-12 Christian W. Zuckschwerdt <zany(a)triq.net> + + * Switching FUSE to pkg-config + +2007-05-30 Christian W. Zuckschwerdt <zany(a)triq.net> + + * Added USB discovery + +2007-05-29 Christian W. Zuckschwerdt <zany(a)triq.net> + + * Keep users CFLAGS by Ville Skyttäon + +2007-05-27 Christian W. Zuckschwerdt <zany(a)triq.net> + + * Added automatic bt channel selection + + +ObexFS 0.10 (released 2006-07-04) +--------------------------------- + 2006-07-03 Christian W. Zuckschwerdt <zany(a)triq.net> * Removed statfs (caused problems on all but Siemens) + +ObexFS 0.9 (released 2006-06-29) +-------------------------------- + 2006-06-12 Christian W. Zuckschwerdt <zany(a)triq.net> * 64-bit safe printf format (Roberto Pariset) @@ -11,19 +43,51 @@ * added usb support (Stanislav Nikolov) * device/channel code cleanup + +ObexFS 0.8 (released 2006-02-08) +-------------------------------- + + +ObexFS 0.7 (released 2006-01-18) +-------------------------------- + + +ObexFS 0.6 (released 2005-12-15) +-------------------------------- + + +ObexFS 0.5 (released 2005-09-23) +-------------------------------- + 2005-09-23 Christian W. Zuckschwerdt <zany(a)triq.net> * rewrite for multiple devices auto scanning + +ObexFS 0.4 (released 2005-09-16) +-------------------------------- + 2005-09-15 Christian W. Zuckschwerdt <zany(a)triq.net> * read/write flag for data buffer * nonblocking mode flag, blocking mode default now * updated to obexftp 0.10.8 and fuse 2.3 + +ObexFS 0.3 (released 2005-06-19) +-------------------------------- + 2005-06-13 Christian W. Zuckschwerdt <zany(a)triq.net> * removed caching * implemented file writing support * updated to obexftp 0.10.3 and fuse 2.2 + +ObexFS 0.2 (released 2004-01-15) +-------------------------------- + + +ObexFS 0.1 (released 2003-01-05) +-------------------------------- + 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/obexfs-0.10/configure.in new/obexfs-0.11/configure.in --- old/obexfs-0.10/configure.in 2006-07-04 19:21:20.000000000 +0200 +++ new/obexfs-0.11/configure.in 2008-06-15 22:12:16.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT(ObexFS, 0.10, zany(a)triq.net) +AC_INIT(ObexFS, 0.11, zany(a)triq.net) #AC_CONFIG_SRCDIR(src/foo.c) AM_INIT_AUTOMAKE AM_CONFIG_HEADER(config.h) @@ -7,11 +7,8 @@ AC_PROG_RANLIB AC_PROG_INSTALL -PKG_CHECK_MODULES(OPENOBEX,openobex) -# PKG_CHECK_MODULES(OBEXFTP,obexftp) - -CFLAGS="-Wall -W -Wmissing-declarations -Wmissing-prototypes" -CFLAGS="$CFLAGS -O2 -D_FILE_OFFSET_BITS=64" +PKG_CHECK_MODULES(FUSE,fuse) +#PKG_CHECK_MODULES(OPENOBEX,openobex) +PKG_CHECK_MODULES(OBEXFTP,obexftp) AC_OUTPUT([Makefile fuse/Makefile]) - 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/obexfs-0.10/COPYING new/obexfs-0.11/COPYING --- old/obexfs-0.10/COPYING 2001-11-21 10:14:02.000000000 +0100 +++ new/obexfs-0.11/COPYING 2008-06-15 22:12:48.000000000 +0200 @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -305,7 +305,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. 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/obexfs-0.10/fuse/Makefile.am new/obexfs-0.11/fuse/Makefile.am --- old/obexfs-0.10/fuse/Makefile.am 2005-12-09 19:58:52.000000000 +0100 +++ new/obexfs-0.11/fuse/Makefile.am 2008-06-15 22:12:16.000000000 +0200 @@ -1,9 +1,10 @@ ## Process this file with automake to produce Makefile.in -LDADD = -lfuse -lpthread \ - @OPENOBEX_LIBS@ \ - -lbluetooth \ - -lobexftp -lmulticobex -lbfb +AM_CFLAGS = -Wall -W -Wmissing-declarations -Wmissing-prototypes \ + -O2 @FUSE_CFLAGS@ @OBEXFTP_CFLAGS@ + +LDADD = @FUSE_LIBS@ \ + @OBEXFTP_LIBS@ obexfs_SOURCES = obexfs.c 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/obexfs-0.10/fuse/obexautofs.c new/obexfs-0.11/fuse/obexautofs.c --- old/obexfs-0.10/fuse/obexautofs.c 2006-07-04 19:21:11.000000000 +0200 +++ new/obexfs-0.11/fuse/obexautofs.c 2008-06-15 22:12:16.000000000 +0200 @@ -46,13 +46,6 @@ #include <sys/types.h> #include <sys/socket.h> -#include <bluetooth/bluetooth.h> -#include <bluetooth/hci.h> -#include <bluetooth/hci_lib.h> - -#include <bluetooth/sdp.h> -#include <bluetooth/sdp_lib.h> - #include <obexftp/obexftp.h> #include <obexftp/client.h> #include <obexftp/uuid.h> @@ -93,75 +86,90 @@ static int discover_irda(void) { return -1; } -static int discover_usb(void) { return -1; } +static int discover_usb(void) { + char **devices, **dev; + char name[25], *p; + connection_t *conn; + + DEBUG("Scanning USB...\n"); + devices = obexftp_discover(OBEX_TRANS_USB); + + for(dev = devices; *dev; dev++) { + strcpy(name, "usb"); + strncpy(&name[3], *dev, sizeof(name)-4); + p = strchr(name, ' '); + if (p) + *p = '\0'; + DEBUG("Found %s (%d), %s\n", name, atoi(*dev), *dev); + + for (conn = connections; conn; conn = conn->next) { + if (!strcmp(conn->addr, name)) { + conn->recent++; + break; + } + } + + if (!conn) { + DEBUG("Adding %s\n", name); + conn = calloc(1, sizeof(connection_t)); + if (!conn) + return -1; + conn->alias = NULL; + conn->transport = OBEX_TRANS_USB; + conn->addr = strdup(name); + conn->channel = atoi(*dev); + //conn->cli = cli_open(OBEX_TRANS_USB, NULL, conn->channel); + conn->recent++; + conn->next = connections; + connections = conn; + } + } + return 0; +} static int discover_tty(char *UNUSED(port)) { return -1; } static int discover_bt(void) { - inquiry_info *info = NULL; - bdaddr_t bdswap; - char name[248], *bastr; - int dev_id = 0; - int num_rsp = 10; - int flags = 0; - int length = 8; - int dd, i; + char *hci = NULL; + char **devs, **dev, *name; connection_t *conn; DEBUG("Scanning ...\n"); - num_rsp = hci_inquiry(dev_id, length, num_rsp, NULL, &info, flags); + devs = obexftp_discover_bt_src(hci); - if(num_rsp < 0) { + if(!devs) { perror("Inquiry failed."); return -1; } - - if ((dd = hci_open_dev(dev_id)) < 0) { - perror("HCI device open failed"); - free(info); - return -1; - } - for(i = 0; i < num_rsp; i++) { - memset(name, 0, sizeof(name)); - - baswap(&bdswap, &(info+i)->bdaddr); - bastr = batostr(&bdswap); - - if(hci_read_remote_name(dd, &(info+i)->bdaddr, sizeof(name), name, 10000) < 0) { - strcpy(name, bastr); - } - + for(dev = devs; dev && *dev; dev++) { for (conn = connections; conn; conn = conn->next) { - if (!strcmp(conn->addr, bastr)) { + if (!strcmp(conn->addr, *dev)) { conn->recent++; break; } } if (!conn) { - DEBUG("Adding\t%s\t%s\n", bastr, name); + name = obexftp_bt_name_src(*dev, hci); + DEBUG("Adding\t%s\t%s\n", *dev, name); conn = calloc(1, sizeof(connection_t)); if (!conn) return -1; - conn->alias = strdup(name); + conn->alias = name; conn->transport = OBEX_TRANS_BLUETOOTH; - conn->addr = bastr; - conn->channel = 5; // Siemens - conn->channel = 10; // Nokia - conn->channel = 6; // Sony-Ericsson - //conn->cli = cli_open(OBEX_TRANS_BLUETOOTH, batostr(&bdswap), 5); + conn->addr = *dev; + conn->channel = obexftp_browse_bt_ftp(conn->addr); + //conn->cli = cli_open(OBEX_TRANS_BLUETOOTH, conn->addr, conn->channel); conn->recent++; conn->next = connections; connections = conn; } else - free(bastr); + free(*dev); } - close(dd); - free(info); - + free(devs); return 0; } @@ -185,12 +193,13 @@ /* remove from head */ while (connections && connections->recent == 0) { - fprintf(stderr, "Deleting %s\n", connections->alias); + DEBUG("Deleting %s\n", connections->addr); conn = connections; connections = conn->next; cli_close(conn->cli); - free(conn->alias); + if (conn->alias) + free(conn->alias); free(conn->addr); free(conn); } @@ -198,12 +207,13 @@ /* remove from body */ for (prev = connections; prev; prev = prev->next) if(prev->next && prev->next->recent == 0) { - fprintf(stderr, "Deleting2 %s\n", prev->next->alias); + DEBUG("Deleting2 %s\n", prev->next->addr); conn = prev->next; prev->next = conn->next; cli_close(conn->cli); - free(conn->alias); + if (conn->alias) + free(conn->alias); free(conn->addr); free(conn); } @@ -304,7 +314,7 @@ namelen = strlen(path); for (conn = connections; conn; conn = conn->next) { - if (!strncmp(conn->addr, path, namelen) || !strncmp(conn->alias, path, namelen)) { + if (!strncmp(conn->addr, path, namelen) || (conn->alias && !strncmp(conn->alias, path, namelen))) { if (!conn->cli) conn->cli = cli_open(conn->transport, conn->addr, conn->channel); return conn; @@ -358,7 +368,7 @@ if(!filepath) { /* the device entry itself */ - if (strchr(path, ':')) + if (!strcmp(path + 1, conn->addr)) stbuf->st_mode = S_IFDIR | 0755; else stbuf->st_mode = S_IFLNK | 0777; @@ -401,7 +411,7 @@ connection_t *conn; for (conn = connections; conn; conn = conn->next) { - if(!strcmp(conn->alias, path + 1)) { + if(conn->alias && !strcmp(conn->alias, path + 1)) { strcpy(link, conn->addr); return 0; } @@ -431,7 +441,8 @@ res = filler(h, "..", DT_DIR, 0); for (conn = connections; conn; conn = conn->next) { stat.st_mode = DT_DIR; - res = filler(h, conn->alias, DT_LNK, 0); + if (conn->alias) + res = filler(h, conn->alias, DT_LNK, 0); res = filler(h, conn->addr, DT_DIR, 0); if(res != 0) break; @@ -742,7 +753,8 @@ /* Close connection */ for (conn = connections; conn; conn = conn->next) { cli_close(conn->cli); - free(conn->alias); + if (conn->alias) + free(conn->alias); free(conn->addr); free(conn); } 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/obexfs-0.10/fuse/obexfs.c new/obexfs-0.11/fuse/obexfs.c --- old/obexfs-0.10/fuse/obexfs.c 2006-07-04 19:20:34.000000000 +0200 +++ new/obexfs-0.11/fuse/obexfs.c 2008-06-15 22:12:16.000000000 +0200 @@ -66,7 +66,7 @@ static obexftp_client_t *cli = NULL; static int transport = 0; static char *device = NULL; // "00:11:22:33:44:55"; "/dev/ttyS0"; -static int channel = 6; // 10; +static int channel = -1; static int nonblock = 0; @@ -89,6 +89,10 @@ return -1; } + if (channel < 0) { + channel = obexftp_browse_bt_ftp(device); + } + for (retry = 0; retry < 3; retry++) { /* Connect */ @@ -522,17 +526,14 @@ case 'i': transport = OBEX_TRANS_IRDA; - if (device != NULL) - free(device); device = NULL; channel = 0; break; case 'b': transport = OBEX_TRANS_BLUETOOTH; - if (device != NULL) - free (device); - device = optarg; + device = optarg; + channel = -1; break; case 'B': @@ -543,27 +544,18 @@ if (geteuid() != 0) fprintf(stderr, "If USB doesn't work setup permissions in udev or run as superuser.\n"); transport = OBEX_TRANS_USB; - if (device != NULL) - free(device); device = NULL; channel = atoi(optarg); break; case 't': transport = OBEX_TRANS_CUSTOM; - if (device != NULL) - free(device); - device = NULL; + device = optarg; channel = 0; - - if (strcasecmp(optarg, "irda")) - device = optarg; break; case 'n': transport = OBEX_TRANS_INET; - if (device != NULL) - free(device); device = optarg; channel = 650; { 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/obexfs-0.10/INSTALL new/obexfs-0.11/INSTALL --- old/obexfs-0.10/INSTALL 2001-11-21 10:14:02.000000000 +0100 +++ new/obexfs-0.11/INSTALL 2008-06-15 22:12:48.000000000 +0200 @@ -1,27 +1,43 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free +Software Foundation, Inc. + +This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + Basic Installation ================== - These are generic installation instructions. +These are generic installation instructions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses those values to create a `Makefile' in each directory of the package. It may also create one or more `.h' files containing system-dependent definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, a file -`config.cache' that saves the results of its tests to speed up -reconfiguring, and a file `config.log' containing compiler output -(useful mainly for debugging `configure'). +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. (Caching is +disabled by default to prevent problems with accidental use of stale +cache files.) If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail diffs or instructions to the address given in the `README' so they can -be considered for the next release. If at some point `config.cache' -contains results you don't want to keep, you may remove or edit it. - - The file `configure.in' is used to create `configure' by a program -called `autoconf'. You only need `configure.in' if you want to change -it or regenerate `configure' using a newer version of `autoconf'. +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You only need +`configure.ac' if you want to change it or regenerate `configure' using +a newer version of `autoconf'. The simplest way to compile this package is: @@ -54,20 +70,22 @@ Compilers and Options ===================== - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. You can give `configure' -initial values for variables by setting them in the environment. Using -a Bourne-compatible shell, you can do that on the command line like -this: - CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure +Some systems require unusual options for compilation or linking that the +`configure' script does not know about. Run `./configure --help' for +details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix -Or on systems that have the `env' program, you can do it like this: - env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure + *Note Defining Variables::, for more details. Compiling For Multiple Architectures ==================================== - You can compile the package for more than one kind of computer at the +You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their own directory. To do this, you must use a version of `make' that supports the `VPATH' variable, such as GNU `make'. `cd' to the @@ -75,28 +93,28 @@ the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. - If you have to use a `make' that does not supports the `VPATH' -variable, you have to compile the package for one architecture at a time -in the source code directory. After you have installed the package for -one architecture, use `make distclean' before reconfiguring for another -architecture. + If you have to use a `make' that does not support the `VPATH' +variable, you have to compile the package for one architecture at a +time in the source code directory. After you have installed the +package for one architecture, use `make distclean' before reconfiguring +for another architecture. Installation Names ================== - By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. +By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular +options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories you can set and what kinds of files go in them. @@ -107,7 +125,7 @@ Optional Features ================= - Some packages pay attention to `--enable-FEATURE' options to +Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -122,48 +140,86 @@ Specifying the System Type ========================== - There may be some features `configure' can not figure out -automatically, but needs to determine by the type of host the package -will run on. Usually `configure' can figure that out, but if it prints -a message saying it can not guess the host type, give it the -`--host=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name with three fields: +There may be some features `configure' cannot figure out automatically, +but needs to determine by the type of machine the package will run on. +Usually, assuming the package is built to be run on the _same_ +architectures, `configure' can figure that out, but if it prints a +message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + CPU-COMPANY-SYSTEM -See the file `config.sub' for the possible values of each field. If +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't -need to know the host type. +need to know the machine type. - If you are building compiler tools for cross-compiling, you can also -use the `--target=TYPE' option to select the type of system they will -produce code for and the `--build=TYPE' option to select the type of -system on which you are compiling the package. + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. +If you want to set default values for `configure' scripts to share, you +can create a site shell script called `config.site' that gives default +values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. A warning: not all `configure' scripts look for a site script. -Operation Controls +Defining Variables ================== - `configure' recognizes the following options to control how it -operates. +Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: -`--cache-file=FILE' - Use and save the results of the tests in FILE instead of - `./config.cache'. Set FILE to `/dev/null' to disable caching, for - debugging `configure'. + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). Here is a another example: + + /bin/bash ./configure CONFIG_SHELL=/bin/bash + +Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent +configuration-related scripts to be executed by `/bin/bash'. + +`configure' Invocation +====================== + +`configure' recognizes the following options to control how it operates. `--help' +`-h' Print a summary of the options to `configure', and exit. +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + `--quiet' `--silent' `-q' @@ -175,8 +231,6 @@ Look for the package's source code in directory DIR. Usually `configure' can determine that directory automatically. -`--version' - Print the version of Autoconf used to generate the `configure' - script, and exit. +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. -`configure' also accepts some other, not widely useful, options. 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/obexfs-0.10/missing new/obexfs-0.11/missing --- old/obexfs-0.10/missing 2001-11-21 10:14:02.000000000 +0100 +++ new/obexfs-0.11/missing 2008-06-15 22:12:47.000000000 +0200 @@ -1,7 +1,11 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997 Free Software Foundation, Inc. -# Franc,ois Pinard <pinard(a)iro.umontreal.ca>, 1996. + +scriptversion=2005-06-08.21 + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,15 +19,47 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. if test $# -eq 0; then echo 1>&2 "Try \`$0 --help' for more information" exit 1 fi +run=: + +# In the cases where this matters, `missing' is being run in the +# srcdir already. +if test -f configure.ac; then + configure_ac=configure.ac +else + configure_ac=configure.in +fi + +msg="missing on your system" + case "$1" in +--run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi + ;; -h|--h|--he|--hel|--help) echo "\ @@ -35,6 +71,7 @@ Options: -h, --help display this help and exit -v, --version output version information and exit + --run try to run the given command, and emulate it if it fails Supported PROGRAM values: aclocal touch file \`aclocal.m4' @@ -43,13 +80,19 @@ automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c + help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file - yacc create \`y.tab.[ch]', if possible, from existing .[ch]" + tar try tar, gnutar, gtar, then tar without non-portable flags + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + +Send bug reports to <bug-automake(a)gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing - GNU libit 0.0" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -58,10 +101,45 @@ exit 1 ;; - aclocal) +esac + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). +case "$1" in + lex|yacc) + # Not GNU programs, they don't have --version. + ;; + + tar) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 + fi + ;; +esac + +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case "$1" in + aclocal*) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`acinclude.m4' or \`configure.in'. You might want +WARNING: \`$1' is $msg. You should only need it if + you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 @@ -69,8 +147,8 @@ autoconf) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`configure.in'. You might want to install the +WARNING: \`$1' is $msg. You should only need it if + you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." touch configure @@ -78,11 +156,11 @@ autoheader) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`acconfig.h' or \`configure.in'. You might want +WARNING: \`$1' is $msg. You should only need it if + you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER($[^)]*$).*/\1/p' configure.in` + files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER($[^)]*$).*/\1/p' ${configure_ac}` test -z "$files" && files="config.h" touch_files= for f in $files; do @@ -95,10 +173,10 @@ touch $touch_files ;; - automake) + automake*) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'. +WARNING: \`$1' is $msg. You should only need it if + you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." find . -type f -name Makefile.am -print | @@ -106,9 +184,32 @@ while read f; do touch "$f"; done ;; + autom4te) + echo 1>&2 "\ +WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the + proper tools for further handling them. + You can get \`$1' as part of \`Autoconf' from any GNU + archive site." + + file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` + test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo "#! /bin/sh" + echo "# Created by GNU Automake missing as a replacement of" + echo "# $ $@" + echo "exit 0" + chmod +x $file + exit 1 + fi + ;; + bison|yacc) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." @@ -138,7 +239,7 @@ lex|flex) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." @@ -159,28 +260,90 @@ fi ;; + help2man) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a dependency of a manual page. You may need the + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + + file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + if test -z "$file"; then + file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'` + fi + if [ -f "$file" ]; then + touch $file + else + test -z "$file" || exec >$file + echo ".ab help2man is required to generate this page" + exit 1 + fi + ;; + makeinfo) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy \`make' (AIX, DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." + # The file to touch is that specified with -o ... file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` if test -z "$file"; then - file=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $file` + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` + file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; + tar) + shift + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error + # messages. + if (gnutar --version > /dev/null 2>&1); then + gnutar "$@" && exit 0 + fi + if (gtar --version > /dev/null 2>&1); then + gtar "$@" && exit 0 + fi + firstarg="$1" + if shift; then + case "$firstarg" in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + case "$firstarg" in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + fi + + echo 1>&2 "\ +WARNING: I can't seem to be able to run \`tar' with the given arguments. + You may want to install GNU tar or Free paxutils, or check the + command line arguments." + exit 1 + ;; + *) echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequirements for installing + it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case some other package would contain this missing \`$1' program." exit 1 @@ -188,3 +351,10 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: 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/obexfs-0.10/NEWS new/obexfs-0.11/NEWS --- old/obexfs-0.10/NEWS 2005-09-23 19:18:25.000000000 +0200 +++ new/obexfs-0.11/NEWS 2008-06-15 22:12:16.000000000 +0200 @@ -1 +1,4 @@ +ObexFS recent NEWS +================== + Be sure to try the new auto scanning obexautofs. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 NX
by root＠Hilbert.suse.de 25 Jul '08

25 Jul '08

Hello community, here is the log from the commit of package NX checked in at Fri Jul 25 16:58:17 CEST 2008. -------- --- NX/NX.changes 2008-04-26 12:31:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/NX/NX.changes 2008-07-21 00:52:31.954434000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 21 00:38:03 CEST 2008 - sndirsch(a)suse.de + +- update NX to release 3.2.0 (bnc #61220) + +------------------------------------------------------------------- Old: ---- CVE-2007-6427-xinput.diff CVE-2007-6428-TOG-cup.diff CVE-2007-6429-shm_evi.diff CVE-2008-0006-pcf_font.diff nxagent-2.1.0-20.tar.gz nxagent-stringcompare.diff NX-bufferoverflow.diff nxcomp-2.1.0-8.tar.gz nxcompext-2.1.0-5.tar.gz nxcomp-gcc43.patch NX-data-range.patch nxdesktop-2.1.0-10.tar.gz nxproxy-2.1.0-3.tar.gz nxscripts-2.1.0-5.tar.gz nxviewer-2.1.0-12.tar.gz nx-X11-2.1.0-3.diff nx-X11-2.1.0-3.tar.gz ppc-no-signed-char.diff p_XFree86-4.3-ppc64.diff xorg-CAN-2005-2495.patch New: ---- nxagent-3.2.0-8.tar.gz nxcomp-3.2.0-7.tar.gz nxcompext-3.2.0-1.tar.gz nxcompshad-3.2.0-3.tar.gz nxproxy-3.2.0-1.tar.gz nxscripts-3.2.0-1.tar.gz nx-X11-3.2.0-2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NX.spec ++++++ --- /var/tmp/diff_new_pack.k25201/_old 2008-07-25 16:57:28.000000000 +0200 +++ /var/tmp/diff_new_pack.k25201/_new 2008-07-25 16:57:28.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package NX (Version 2.1.0) +# spec file for package NX (Version 3.2.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,48 +21,33 @@ BuildRequires: XFree86-devel gcc-c++ libjpeg-devel libpng-devel openssl-devel %endif %endif -ExcludeArch: ia64 ppc64 s390x x86_64 License: LGPL v2.1 or later; Other uncritical OpenSource License Url: http://www.nomachine.com/sources.php Group: System/X11/Servers/XF86_4 -Version: 2.1.0 -Release: 77 +Version: 3.2.0 +Release: 1 Summary: Proxy System for X11 +Requires: tightvnc rdesktop #Compression Libraries and Proxy Sources -Source: nxproxy-%{version}-3.tar.gz -Source1: nxcomp-%{version}-8.tar.gz -Source2: nxcompext-%{version}-5.tar.gz +Source: nxproxy-%{version}-1.tar.gz +Source1: nxcomp-%{version}-7.tar.gz +Source2: nxcompext-%{version}-1.tar.gz +Source3: nxcompshad-%{version}-3.tar.gz #X11 Support Libraries and Agent Sources -Source5: nx-X11-%{version}-3.tar.gz -Source6: nxagent-%{version}-20.tar.gz -#RFB Agent Sources -Source10: nxviewer-%{version}-12.tar.gz -#RDP Agent Sources -Source11: nxdesktop-%{version}-10.tar.gz +Source5: nx-X11-%{version}-2.tar.gz +Source6: nxagent-%{version}-8.tar.gz #NX Example Scripts -Source14: nxscripts-%{version}-5.tar.gz +Source14: nxscripts-%{version}-1.tar.gz Source15: nxagent Source16: docs.tar.bz2 Patch: NX.diff Patch1: NX-noansi.diff -Patch2: p_XFree86-4.3-ppc64.diff Patch3: NX-1.5.diff -Patch4: NX-bufferoverflow.diff -Patch5: NX-data-range.patch Patch6: gcc4-friends.patch -Patch7: ppc-no-signed-char.diff -Patch8: xorg-CAN-2005-2495.patch Patch9: xorg7.diff -Patch10: nxagent-stringcompare.diff Patch11: bugzilla-154928-integer-overflows.patch Patch12: bugzilla-190902-handle-malformed-pcf-files.patch -Patch13: nxcomp-gcc43.patch -Patch15: CVE-2007-6427-xinput.diff -Patch16: CVE-2007-6428-TOG-cup.diff -Patch17: CVE-2007-6429-shm_evi.diff -Patch18: CVE-2008-0006-pcf_font.diff Patch19: nxproxy.diff -Patch20: nx-X11-2.1.0-3.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define my_provides /tmp/my-provides %define my_requires /tmp/my-requires @@ -77,7 +62,7 @@ Nomachine <www.nomachine.com> %prep -%setup -n nxproxy -b1 -b2 -b5 -b6 -b10 -b11 -b14 +%setup -n nxproxy -b1 -b2 -b3 -b5 -b6 -b14 cd $RPM_BUILD_DIR %patch %ifarch ia64 @@ -85,21 +70,8 @@ %patch1 popd %endif -%ifarch ppc64 -pushd nx-X11 -%patch2 -p1 -popd -%endif %patch3 -%patch4 -%patch5 -p1 %patch6 -%patch7 -pushd nx-X11 -%patch8 -%patch10 -%patch20 -popd %if %{suse_version} > 1010 %patch9 %endif @@ -107,19 +79,9 @@ %patch11 -p1 %patch12 -p1 popd -pushd nxcomp -%patch13 -popd -pushd nx-X11/programs/Xserver -%patch15 -p4 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -popd pushd nxproxy %patch19 popd -ln -s rdesktop.1 nxdesktop/doc/nxdesktop.1 cat >> nx-X11/config/cf/host.def << EOF #ifdef i386Architecture #undef DefaultGcc2i386Opt @@ -158,24 +120,13 @@ popd # build X11 Support Libraries and Agents pushd nx-X11 - make World + ( make World ); rm ../nxcompshad/Logger.o; make -C ../nxcompshad + make popd # build Extended Compression Library pushd nxcompext ./configure; make popd -# build RFB Agent -if ls /usr/X11R6/%_lib/libXp.so*; then - cp -a /usr/X11R6/%_lib/libXp.so* nx-X11/exports/lib/ -fi -for dir in nxviewer/libvncauth nxviewer/nxviewer; do - pushd $dir; xmkmf -a; make 2> /dev/null; popd -done -# build RDP Agent -pushd nxdesktop - ./configure --prefix=/usr --sharedir=/usr/share/NX - make -popd %install cd $RPM_BUILD_DIR @@ -193,29 +144,9 @@ # install Compression Libraries and Proxy cp -a nxcomp/libXcomp.so.* $RPM_BUILD_ROOT/usr/lib/NX/lib cp -a nxcompext/libXcompext.so.* $RPM_BUILD_ROOT/usr/lib/NX/lib +cp -a nxcompshad/libXcompshad.so.* $RPM_BUILD_ROOT/usr/lib/NX/lib install -m 755 nxproxy/nxproxy $RPM_BUILD_ROOT/usr/lib/NX ln -snf nxagent $RPM_BUILD_ROOT/usr/bin/nxproxy -# install RFB Agent -for dir in nxviewer/nxviewer; do - pushd $dir; make install DESTDIR=$RPM_BUILD_ROOT; popd -done -if ls $RPM_BUILD_ROOT/usr/bin/nxviewer; then - mv $RPM_BUILD_ROOT/usr/bin/nxviewer $RPM_BUILD_ROOT/usr/lib/NX -else - mv $RPM_BUILD_ROOT/usr/X11R6/bin/nxviewer $RPM_BUILD_ROOT/usr/lib/NX -fi -ln -snf nxagent $RPM_BUILD_ROOT/usr/bin/nxviewer -chmod 755 $RPM_BUILD_ROOT/usr/bin/nxviewer -# install RDP Agent -pushd nxdesktop - make install DESTDIR=$RPM_BUILD_ROOT - mv $RPM_BUILD_ROOT/usr/bin/nxdesktop $RPM_BUILD_ROOT/usr/lib/NX - ln -snf nxagent $RPM_BUILD_ROOT/usr/bin/nxdesktop - chmod 755 $RPM_BUILD_ROOT/usr/bin/nxdesktop - mv $RPM_BUILD_ROOT/usr/man/man1/nxdesktop.1 \ - $RPM_BUILD_ROOT/usr/share/man/man1/nxdesktop.1 - rm -rf $RPM_BUILD_ROOT/usr/man -popd # install scripts mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages/NX/examples # Bug #156308 @@ -224,14 +155,10 @@ # documentation and license tar xjf $RPM_SOURCE_DIR/docs.tar.bz2 -C $RPM_BUILD_ROOT/usr/share/doc/packages/NX install -m 644 nxcomp/LICENSE $RPM_BUILD_ROOT/usr/share/doc/packages/NX -for i in nxcomp nxdesktop; do +for i in nxcomp; do mkdir $RPM_BUILD_ROOT/usr/share/doc/packages/NX/$i done install -m 644 nxcomp/README $RPM_BUILD_ROOT/usr/share/doc/packages/NX/nxcomp -install -m 644 nxdesktop/README $RPM_BUILD_ROOT/usr/share/doc/packages/NX/nxdesktop -rm -rf nxdesktop/doc/CVS -chmod 644 nxdesktop/doc/keymap-names.txt -cp -r nxdesktop/doc $RPM_BUILD_ROOT/usr/share/doc/packages/NX/nxdesktop # avoid bogus dependencies - Bug #212276 cat << EOF > %{my_provides} #!/bin/sh @@ -259,25 +186,21 @@ %defattr(-,root,root) %doc /usr/share/doc/packages/NX /usr/bin/nxagent -/usr/bin/nxdesktop /usr/bin/nxproxy -/usr/bin/nxviewer %dir /usr/lib/NX /usr/lib/NX/nxagent -/usr/lib/NX/nxdesktop /usr/lib/NX/nxproxy -/usr/lib/NX/nxviewer %dir /usr/lib/NX/lib /usr/lib/NX/lib/libX11.so.* /usr/lib/NX/lib/libXcomp.so.* /usr/lib/NX/lib/libXcompext.so.* +/usr/lib/NX/lib/libXcompshad.so.* /usr/lib/NX/lib/libXext.so.* /usr/lib/NX/lib/libXrender.so.* -%dir /usr/share/NX -/usr/share/man/man1/nxdesktop.1.gz -/usr/share/NX/keymaps-windows/ %changelog +* Mon Jul 21 2008 sndirsch(a)suse.de +- update NX to release 3.2.0 (bnc #61220) * Sat Apr 26 2008 coolo(a)suse.de - fix build * Wed Apr 09 2008 sndirsch(a)suse.de ++++++ bugzilla-190902-handle-malformed-pcf-files.patch ++++++ --- /var/tmp/diff_new_pack.k25201/_old 2008-07-25 16:57:28.000000000 +0200 +++ /var/tmp/diff_new_pack.k25201/_new 2008-07-25 16:57:28.000000000 +0200 @@ -41,8 +41,8 @@ goto Exit; } diff -ru freetype-2.1.7.orig/src/pcf/pcfread.c freetype-2.1.7/src/pcf/pcfread.c ---- freetype-2.1.7.orig/src/pcf/pcfread.c 2003-08-28 12:57:05.000000000 +0200 -+++ freetype-2.1.7/src/pcf/pcfread.c 2006-07-25 13:24:53.000000000 +0200 +--- freetype2/src/pcf/pcfread.c.orig 2005-03-07 19:00:14.000000000 +0000 ++++ freetype2/src/pcf/pcfread.c 2007-12-17 18:07:39.000000000 +0000 @@ -101,7 +101,8 @@ FT_STREAM_READ_FIELDS ( pcf_toc_header, toc ) ) return PCF_Err_Cannot_Open_Resource; @@ -95,7 +95,7 @@ #if defined( FT_DEBUG_LEVEL_TRACE ) { -@@ -126,7 +162,8 @@ +@@ -129,7 +165,8 @@ tables = face->toc.tables; for ( i = 0; i < toc->count; i++ ) { @@ -105,7 +105,7 @@ if ( tables[i].type == (FT_UInt)( 1 << j ) ) name = tableNames[j]; -@@ -149,13 +186,15 @@ +@@ -152,13 +189,15 @@ } @@ -122,7 +122,7 @@ FT_FRAME_SHORT_LE( leftSideBearing ), FT_FRAME_SHORT_LE( rightSideBearing ), FT_FRAME_SHORT_LE( characterWidth ), -@@ -172,7 +211,7 @@ +@@ -175,7 +214,7 @@ #undef FT_STRUCTURE #define FT_STRUCTURE PCF_MetricRec @@ -131,7 +131,7 @@ FT_FRAME_SHORT( leftSideBearing ), FT_FRAME_SHORT( rightSideBearing ), FT_FRAME_SHORT( characterWidth ), -@@ -183,13 +222,15 @@ +@@ -186,13 +225,15 @@ }; @@ -148,7 +148,7 @@ FT_FRAME_BYTE( leftSideBearing ), FT_FRAME_BYTE( rightSideBearing ), FT_FRAME_BYTE( characterWidth ), -@@ -217,7 +258,7 @@ +@@ -220,7 +261,7 @@ ? pcf_metric_msb_header : pcf_metric_header; @@ -157,7 +157,7 @@ (void)FT_STREAM_READ_FIELDS( fields, metric ); } else -@@ -294,13 +337,15 @@ +@@ -297,13 +338,15 @@ } @@ -174,7 +174,7 @@ FT_FRAME_LONG_LE( name ), FT_FRAME_BYTE ( isString ), FT_FRAME_LONG_LE( value ), -@@ -314,7 +359,7 @@ +@@ -317,7 +360,7 @@ #undef FT_STRUCTURE #define FT_STRUCTURE PCF_ParsePropertyRec @@ -183,7 +183,7 @@ FT_FRAME_LONG( name ), FT_FRAME_BYTE( isString ), FT_FRAME_LONG( value ), -@@ -349,8 +394,8 @@ +@@ -352,8 +395,8 @@ PCF_Face face ) { PCF_ParseProperty props = 0; @@ -194,9 +194,9 @@ FT_ULong format, size; FT_Error error; FT_Memory memory = FT_FACE(face)->memory; -@@ -384,6 +429,15 @@ +@@ -389,6 +432,15 @@ - FT_TRACE4(( "get_prop: nprop = %d\n", nprops )); + FT_TRACE4(( " nprop = %d\n", nprops )); + /* rough estimate */ + if ( nprops > size / PCF_PROPERTY_SIZE ) @@ -210,9 +210,9 @@ if ( FT_NEW_ARRAY( props, nprops ) ) goto Bail; -@@ -421,6 +475,13 @@ +@@ -426,6 +478,13 @@ - FT_TRACE4(( "get_prop: string_size = %ld\n", string_size )); + FT_TRACE4(( " string_size = %ld\n", string_size )); + /* rough estimate */ + if ( string_size > size - nprops * PCF_PROPERTY_SIZE ) @@ -224,7 +224,7 @@ if ( FT_NEW_ARRAY( strings, string_size ) ) goto Bail; -@@ -431,20 +492,41 @@ +@@ -436,13 +495,23 @@ if ( FT_NEW_ARRAY( properties, nprops ) ) goto Bail; @@ -235,7 +235,6 @@ - /* XXX: make atom */ + FT_Long name_offset = props[i].name; + -+ + if ( ( name_offset < 0 ) || + ( (FT_ULong)name_offset > string_size ) ) + { @@ -247,16 +246,17 @@ - ft_strlen( strings + props[i].name ) + 1 ) ) + ft_strlen( strings + name_offset ) + 1 ) ) goto Bail; -- ft_strcpy( properties[i].name,strings + props[i].name ); -+ ft_strcpy( properties[i].name,strings + name_offset ); +- ft_strcpy( properties[i].name, strings + props[i].name ); ++ ft_strcpy( properties[i].name, strings + name_offset ); + + FT_TRACE4(( " %s:", properties[i].name )); - properties[i].isString = props[i].isString; +@@ -450,8 +519,17 @@ if ( props[i].isString ) { + FT_Long value_offset = props[i].value; + -+ + if ( ( value_offset < 0 ) || + ( (FT_ULong)value_offset > string_size ) ) + { @@ -269,9 +269,9 @@ + ft_strlen( strings + value_offset ) + 1 ) ) goto Bail; ft_strcpy( properties[i].value.atom, strings + props[i].value ); + +@@ -465,14 +543,8 @@ } -@@ -452,14 +534,8 @@ - properties[i].value.integer = props[i].value; } - face->properties = properties; @@ -287,7 +287,7 @@ Bail: FT_FREE( props ); FT_FREE( strings ); -@@ -474,11 +550,9 @@ +@@ -487,11 +559,9 @@ { FT_Error error = PCF_Err_Ok; FT_Memory memory = FT_FACE(face)->memory; @@ -301,7 +301,7 @@ error = pcf_seek_to_table_type( stream, -@@ -490,7 +564,8 @@ +@@ -503,7 +573,8 @@ if ( error ) return error; @@ -311,7 +311,7 @@ if ( !PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) && !PCF_FORMAT_MATCH( format, PCF_COMPRESSED_METRICS ) ) -@@ -510,11 +585,27 @@ +@@ -523,11 +594,27 @@ else (void)FT_READ_USHORT_LE( nmetrics ); } @@ -340,7 +340,7 @@ if ( FT_NEW_ARRAY( face->metrics, nmetrics ) ) return PCF_Err_Out_Of_Memory; -@@ -541,6 +632,8 @@ +@@ -556,6 +643,8 @@ if ( error ) FT_FREE( face->metrics ); @@ -349,7 +349,7 @@ return error; } -@@ -555,8 +648,6 @@ +@@ -570,8 +659,6 @@ FT_Long bitmapSizes[GLYPHPADOPTIONS]; FT_ULong format, size; int nbitmaps, i, sizebitmaps = 0; @@ -358,7 +358,7 @@ error = pcf_seek_to_table_type( stream, face->toc.tables, -@@ -622,16 +713,22 @@ +@@ -640,16 +727,22 @@ FT_UNUSED( sizebitmaps ); /* only used for debugging */ for ( i = 0; i < nbitmaps; i++ ) @@ -386,7 +386,7 @@ return error; } -@@ -807,7 +904,8 @@ +@@ -829,7 +922,8 @@ if ( error ) goto Bail; @@ -396,7 +396,7 @@ if ( !PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) && !PCF_FORMAT_MATCH( format, PCF_ACCEL_W_INKBOUNDS ) ) -@@ -855,7 +953,6 @@ +@@ -877,7 +971,6 @@ accel->ink_minbounds = accel->minbounds; /* I'm not sure about this */ accel->ink_maxbounds = accel->maxbounds; } @@ -404,7 +404,7 @@ Bail: return error; -@@ -1055,7 +1153,7 @@ +@@ -1163,7 +1256,7 @@ Exit: if ( error ) { ++++++ NX-1.5.diff ++++++ --- /var/tmp/diff_new_pack.k25201/_old 2008-07-25 16:57:28.000000000 +0200 +++ /var/tmp/diff_new_pack.k25201/_new 2008-07-25 16:57:28.000000000 +0200 @@ -31,14 +31,23 @@ action.sa_restorer = NULL; ---- nxdesktop/printer.c.orig 2007-01-25 18:32:56.971590702 +0100 -+++ nxdesktop/printer.c 2007-01-25 18:33:43.912193898 +0100 -@@ -108,7 +108,7 @@ - pprinter_data = (PRINTER *) g_rdpdr_device[device_id].pdevice_data; - - /* default printer name use default printer queue as well in unix */ -- if (pprinter_data->printer == "mydeskjet") -+ if (!strcmp(pprinter_data->printer,"mydeskjet")) - { - pprinter_data->printer_fp = popen("lpr", "w"); - } +--- nxcompshad/Makefile.in.orig 2007-11-12 15:10:10.256482000 +0100 ++++ nxcompshad/Makefile.in 2007-11-12 15:11:05.715948000 +0100 +@@ -32,7 +32,7 @@ + + CXX = @CXX@ + CXXFLAGS = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \ +- -Wall -Wpointer-arith ++ -Wall -Wpointer-arith -fPIC + CXXINCLUDES = + CXXDEFINES = + +@@ -43,7 +43,7 @@ + + CC = @CC@ + CCFLAGS = @X_CFLAGS@ @DEFS@ \ +- -Wall -Wpointer-arith ++ -Wall -Wpointer-arith -fPIC + CCINCLUDES = + CCDEFINES = + ++++++ nxagent-2.1.0-20.tar.gz -> nxagent-3.2.0-8.tar.gz ++++++ ++++ 131793 lines of diff (skipped) ++++++ nxcomp-2.1.0-8.tar.gz -> nxcomp-3.2.0-7.tar.gz ++++++ ++++ 33300 lines of diff (skipped) ++++++ nxcompext-2.1.0-5.tar.gz -> nxcompext-3.2.0-1.tar.gz ++++++ ++++ 5642 lines of diff (skipped) ++++++ NX.diff ++++++ --- /var/tmp/diff_new_pack.k25201/_old 2008-07-25 16:57:32.000000000 +0200 +++ /var/tmp/diff_new_pack.k25201/_new 2008-07-25 16:57:32.000000000 +0200 @@ -13,31 +13,6 @@ dnl Reset default linking directives. ---- nx-X11/lib/X11/XlcDL.c.old 2004-05-17 15:01:39.385673123 +0000 -+++ nx-X11/lib/X11/XlcDL.c 2004-05-17 15:02:15.963136940 +0000 -@@ -58,10 +58,8 @@ - #ifdef _LP64 - # if defined(__sparcv9) - # define _MACH64_NAME "sparcv9" --# elif defined(__ia64__) --# undef MACH64_NAME - # else --# error "Unknown architecture" -+# undef MACH64_NAME - # endif /* defined(__sparcv9) */ - # ifdef _MACH64_NAME - # define _MACH64_NAME_LEN (sizeof (_MACH64_NAME) - 1) ---- nxviewer/nxviewer/Imakefile.old 2004-05-31 15:33:45.000000000 +0000 -+++ nxviewer/nxviewer/Imakefile 2004-05-31 15:35:06.000000000 +0000 -@@ -44,6 +44,8 @@ - - USRLIBDIR = ../../nx-X11/exports/lib - -+XPLIB = -+ - #ifdef SunArchitecture - USRLIBDIR = /usr/NX/lib - SUN_LIB = -lX11 -lXext -L/usr/openwin/lib --- nx-X11/programs/Imakefile.old 2004-09-11 03:30:15.738465241 +0200 +++ nx-X11/programs/Imakefile 2004-09-11 03:30:39.661194763 +0200 @@ -125,7 +125,7 @@ ++++++ NX-noansi.diff ++++++ --- /var/tmp/diff_new_pack.k25201/_old 2008-07-25 16:57:32.000000000 +0200 +++ /var/tmp/diff_new_pack.k25201/_new 2008-07-25 16:57:32.000000000 +0200 @@ -34,26 +34,3 @@ #include <Library.tmpl> #if DoSharedLib && SharedDataSeparation ---- programs/xedit/lisp/Imakefile.orig 2004-04-19 21:52:42.000000000 +0000 -+++ programs/xedit/lisp/Imakefile 2004-04-19 21:53:11.000000000 +0000 -@@ -98,6 +98,9 @@ - write.o \ - xedit.o - -+#undef DefaultCCOptions -+#define DefaultCCOptions GccWarningOptions -+ - #include <Library.tmpl> - - AllTarget(ProgramTargetName($(SAMP))) ---- programs/Xserver/hw/xfree86/fbdevhw/Imakefile.orig 2004-04-20 02:04:59.000000000 +0000 -+++ programs/Xserver/hw/xfree86/fbdevhw/Imakefile 2004-04-20 02:06:13.000000000 +0000 -@@ -1,6 +1,8 @@ - XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/Imakefile,v 1.11tsi Exp $ - - #define IHaveModules -+#undef DefaultCCOptions -+#define DefaultCCOptions GccWarningOptions - #include <Server.tmpl> - - #if defined(LinuxArchitecture) && LinuxFBDevSupport ++++++ nxproxy-2.1.0-3.tar.gz -> nxproxy-3.2.0-1.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxproxy/CHANGELOG new/nxproxy/CHANGELOG --- old/nxproxy/CHANGELOG 2007-02-01 15:24:05.000000000 +0100 +++ new/nxproxy/CHANGELOG 2008-04-07 12:19:44.000000000 +0200 @@ -1,19 +1,35 @@ ChangeLog: -nxproxy-2.1.0-3 +nxproxy-3.2.0-1 + +- Opened the 3.2.0 branch based on nxproxy-3.1.0-2. + +nxproxy-3.1.0-2 + +- Updated version number. + +nxproxy-3.1.0-1 + +- Opened the 3.1.0 branch based on nxproxy-3.0.0-4. + +nxproxy-3.0.0-4 + +- Added file COPYING. - Changed the LICENSE file to state that the software is only made available under the version 2 of the GPL. -- Added file COPYING. +nxproxy-3.0.0-3 + +- Updated the copyright notices to year 2007. -nxproxy-2.1.0-2 +nxproxy-3.0.0-2 -- Updated file VERSION. +- Updated the file VERSION. -nxproxy-2.1.0-1 +nxproxy-3.0.0-1 -- Opened the 2.1.0 branch based on nxproxy-2.0.0-2. +- Opened the 3.0.0 branch based on nxproxy-2.0.0-2. nxproxy-2.0.0-2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxproxy/LICENSE new/nxproxy/LICENSE --- old/nxproxy/LICENSE 2007-02-01 15:23:04.000000000 +0100 +++ new/nxproxy/LICENSE 2007-05-15 16:56:11.000000000 +0200 @@ -1,7 +1,6 @@ -Copyright (C) 2001, 2006 NoMachine - http://www.nomachine.com/. - -NXPROXY and NX extensions to X are copyright of NoMachine. +Copyright (C) 2001, 2007 NoMachine - http://www.nomachine.com/. +NXPROXY and NX extensions to this software are copyright of NoMachine. Redistribution and use of this software is allowed according to the following terms: @@ -9,22 +8,21 @@ it under the terms of the GNU General Public License Version 2, and not any other version, as published by the Free Software Foundation. -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTA- -BILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -Public License for more details. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program; if not, you can request a copy to NoMachine -or write to the Free Software Foundation, Inc., 59 Temple Place, Suite -330, Boston, MA 02111-1307 USA +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Parts of this software are derived from DXPC project. These copyright notices apply to original DXPC code: -Redistribution and use in source and binary forms are permitted provi- -ded that the above copyright notice and this paragraph are duplicated -in all such forms. +Redistribution and use in source and binary forms are permitted provided +that the above copyright notice and this paragraph are duplicated in all +such forms. THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF @@ -33,6 +31,6 @@ Copyright (c) 1995,1996 Brian Pane Copyright (c) 1996,1997 Zachary Vonler and Brian Pane Copyright (c) 1999 Kevin Vigor and Brian Pane -Copyright (c) 2000,2006 Gian Filippo Pinzari and Brian Pane +Copyright (c) 2000,2001 Gian Filippo Pinzari and Brian Pane All rights reserved. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxproxy/Main.c new/nxproxy/Main.c --- old/nxproxy/Main.c 2006-06-20 17:08:31.000000000 +0200 +++ new/nxproxy/Main.c 2007-01-19 17:34:34.000000000 +0100 @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ /* */ /* NXPROXY, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxproxy/VERSION new/nxproxy/VERSION --- old/nxproxy/VERSION 2006-08-02 19:14:58.000000000 +0200 +++ new/nxproxy/VERSION 2008-04-07 12:20:01.000000000 +0200 @@ -1 +1 @@ -2.1.0 +3.2.0 ++++++ nxscripts-2.1.0-5.tar.gz -> nxscripts-3.2.0-1.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/CHANGELOG new/nxscripts/CHANGELOG --- old/nxscripts/CHANGELOG 2007-02-01 15:07:47.000000000 +0100 +++ new/nxscripts/CHANGELOG 2008-04-07 11:52:55.000000000 +0200 @@ -1,29 +1,66 @@ ChangeLog: -nxscripts-2.1.0-5 +nxscripts-3.2.0-1 + +- Opened the 3.2.0 branch based on nxscripts-3.1.0-1. + +nxscripts-3.1.0-1 + +- Opened the 3.1.0 branch based on nxscripts-3.0.0-8. + +nxscripts-3.0.0-8 + +- Modified tar-nxclient script by updating the package for Windows. + +nxscripts-3.0.0-7 + +- Added scripts run-nxagent-shadow, tar-nxkill, tar-nxuexec. + +- Fixed run-nxagent script: added nxcompshad dir to the library path. + +- Removed tar-nxshadow script. + +nxscripts-3.0.0-6 + +- Added scripts run-nxagent-windows and run-nxproxy-connect. + +nxscripts-3.0.0-5 + +- Fixed an error in nxreplace. + +- Added script tar-nxshadow. + +nxscripts-3.0.0-4 - Changed the LICENSE file to state that the software is only made available under the version 2 of the GPL. - Added file COPYING. -nxscripts-2.1.0-4 +- Small changes to nxreplace to check exit value of sed. -- Added the tar-nxservice script. +- Addedd nxshadow library to LD_LIBRARY_PATH in run-nxagent. + +nxscripts-3.0.0-3 -nxscripts-2.1.0-3 +- Imported changes up to nxscripts-2.1.0-4. + +- Added the tar-nxservice script. - The tar-nxclient script now correctly rename the tar package using also the CHANGELOG version. -nxscripts-2.1.0-2 - - Reviewed the tar-nxclient script to fetch the nxclient version from the nxclient/VERSION file and consequently update the package. -nxscripts-2.1.0-1 +nxscripts-3.0.0-2 + +- Added the nxagent-service script for running nxagent as NT service + by mean of Cygwin utilities. -- Opened the 2.1.0 branch based on the 2.0.0-2. +nxscripts-3.0.0-1 + +- Opened the 3.0.0 branch based on nxscripts-2.0.0-2. nxscripts-2.0.0-2 @@ -68,7 +105,7 @@ - Added the new nxreplace script. It is a simple script that is used to replace all the occurences of one string with another in a list - of files. + of files. Some examples include: @@ -111,7 +148,7 @@ - Opened 1.4.1 branch. -- New tar-nxspool script. +- New tar-nxspool script. nxscripts-1.4.0-3 @@ -125,7 +162,7 @@ - Note that only the run-nxproxy, run-nxagent and run-nxproxy- reversed have been tested in this release. Others might work with slight changes. - + nxscripts-1.4.0-2 - Added tar-nxcompsh script. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/LICENSE new/nxscripts/LICENSE --- old/nxscripts/LICENSE 2007-02-01 15:05:43.000000000 +0100 +++ new/nxscripts/LICENSE 2007-02-08 16:18:33.000000000 +0100 @@ -1,4 +1,4 @@ -Copyright (C) 2001, 2006 NoMachine - http://www.nomachine.com/. +Copyright (C) 2001, 2007 NoMachine - http://www.nomachine.com/. NXSCRIPTS and NX extensions to X are copyright of NoMachine. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/nxagent-service new/nxscripts/nxagent-service --- old/nxscripts/nxagent-service 1970-01-01 01:00:00.000000000 +0100 +++ new/nxscripts/nxagent-service 2006-10-20 12:12:09.000000000 +0200 @@ -0,0 +1,37 @@ +#!/bin/bash + +#set -x + +NX_COOKIE=123efa980d2cba234ef6f73deac810ff + +NX_PORT=9 + +XAUTH=`which xauth` + +${XAUTH} -f /.Xauthority add ${HOSTNAME}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} +${XAUTH} -f /.Xauthority add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} + +chown SYSTEM:root /.Xauthority + +PATH=${HOME}/NX/nx-X11/exports/bin:${HOME}/NX/nxcomp:${HOME}/NX/nxcompext:${HOME}/NX/nxaccess:$PATH + +DISPLAY=nx/nx,link=lan,cookie=${NX_COOKIE},cache=0:${NX_PORT} + +case "$1" in + install) + cygrunsrv -I "NX Agent" -p ${HOME}/NX/nx-X11/programs/Xserver/nxagent.exe \ + -a "-nopersistent -keyboard pc105/it -M :9" -2 ${HOME}/.nx/C-${NX_PORT}/session \ + -i -e "DISPLAY=nx/nx,link=lan,cookie=$NX_COOKIE,errors=${HOME}/errors,cache=0:3" \ + -e "PATH=${PATH}" -e "NX_HOME=${HOME}/.nx" -e "XAUTHORITY=/.Xauthority" + ;; + remove) + cygrunsrv -R "NX Agent" + ;; + start) + rm -f ${HOME}/.nx/C-${NX_PORT}/session >&1 + cygrunsrv -S "NX Agent" + ;; + stop) + cygrunsrv -E "NX Agent" + ;; +esac diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/nxreplace new/nxscripts/nxreplace --- old/nxscripts/nxreplace 2007-02-01 14:49:25.000000000 +0100 +++ new/nxscripts/nxreplace 2007-02-15 18:59:43.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ @@ -33,7 +33,7 @@ if [ -n "$TEMP" ]; then echo "Using temp dir '$TEMP'"; else - TEMP="/tmp/" + TEMP="/tmp" echo "Using temp dir '$TEMP'"; fi @@ -59,8 +59,14 @@ # this is not needed but will prevent sed error if [ -f "$i" ]; then echo "Patching $i"; - sed 's/"$STR1"/"$STR2"/g' $i > "$TEMP/"$i - mv "$TEMP/"$i $i + TEMPFILE=`mktemp` + if sed "s/$STR1/$STR2/g" $i > $TEMPFILE ; then + chmod --reference=$i $TEMPFILE + mv $TEMPFILE $i + else + echo "Errors occured while patching file $i"; + rm -f $TEMPFILE + fi else echo "Cannot find file $i"; fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxagent new/nxscripts/run-nxagent --- old/nxscripts/run-nxagent 2007-02-01 15:02:19.000000000 +0100 +++ new/nxscripts/run-nxagent 2007-05-17 13:31:53.000000000 +0200 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ @@ -53,7 +53,9 @@ # Set the path to libraries and NX executables. # -LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${HOME}/NX/nxcomp:${HOME}/NX/nxcompext:${HOME}/NX/nx-X11/exports/lib" +LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${HOME}/NX/nxcomp:${HOME}/NX/nxcompext:\ +${HOME}/NX/nxcompshad:${HOME}/NX/nx-X11/exports/lib" + export LD_LIBRARY_PATH PATH="${PATH}:${HOME}/NX/nxclient/nxclient:${HOME}/NX/nx-X11/programs/Xserver/" @@ -79,7 +81,7 @@ # media=1:1098 # -NX_HOST=nx/nx,cache=8192k,link=modem,keybd=1,samba=1,cups=1,limit=0,\ +NX_HOST=nx/nx,cache=8192k,link=modem,menu=1,keybd=1,samba=1,cups=1,limit=0,\ accept=127.0.0.1,cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/C-${NX_PORT}/options @@ -100,7 +102,7 @@ #valgrind -v --num-callers=8 --error-limit=no --trace-children=no \ #valgrind --num-callers=8 --tool=memcheck --leak-check=yes --show-reachable=yes --track-fds=yes \ -nx-X11/programs/Xserver/nxagent -name 'NX' -geometry 800x600+100+100 -fp unix/:7100 \ +nx-X11/programs/Xserver/nxagent -name 'NX' -geometry 800x600+100+100 "$@" \ ${NX_AGENT} 2>>${NX_ROOT}/C-${NX_PORT}/session & # diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxagent-client new/nxscripts/run-nxagent-client --- old/nxscripts/run-nxagent-client 2007-02-01 14:49:53.000000000 +0100 +++ new/nxscripts/run-nxagent-client 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxagent-full new/nxscripts/run-nxagent-full --- old/nxscripts/run-nxagent-full 2007-02-01 14:49:57.000000000 +0100 +++ new/nxscripts/run-nxagent-full 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxagent-nxfs new/nxscripts/run-nxagent-nxfs --- old/nxscripts/run-nxagent-nxfs 2007-02-01 14:50:02.000000000 +0100 +++ new/nxscripts/run-nxagent-nxfs 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxagent-server new/nxscripts/run-nxagent-server --- old/nxscripts/run-nxagent-server 2007-02-01 14:50:06.000000000 +0100 +++ new/nxscripts/run-nxagent-server 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxagent-shadow new/nxscripts/run-nxagent-shadow --- old/nxscripts/run-nxagent-shadow 1970-01-01 01:00:00.000000000 +0100 +++ new/nxscripts/run-nxagent-shadow 2007-04-30 16:13:41.000000000 +0200 @@ -0,0 +1,107 @@ +#!/bin/sh + +#/**************************************************************************/ +#/* */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ +#/* */ +#/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ +#/* are copyright of NoMachine. Redistribution and use of the present */ +#/* software is allowed according to terms specified in the file LICENSE */ +#/* which comes in the source distribution. */ +#/* */ +#/* Check http://www.nomachine.com/licensing.html for applicability. */ +#/* */ +#/* NX and NoMachine are trademarks of Medialogic S.p.A. */ +#/* */ +#/* All rights reserved. */ +#/* */ +#/**************************************************************************/ + +# +# Uncomment this to enable echo. +# +#set -x +# + +ulimit -c unlimited + +cd ${HOME}/NX + +NX_PORT=9 + +NX_SYSTEM=${HOME}/.nx + +NX_ROOT=${HOME}/.nx + +# +# This should be randlomly generated. +# +#NX_COOKIE=`xauth list |grep "${HOSTNAME}/unix:\<${NX_PORT}\>" | grep MIT | cut -f 5 -d ' '` +NX_COOKIE=123efa980d2cba234ef6f73deac810ff + +# +# Create the directories for the NX session. +# + +rm -rf ${NX_ROOT}/C-${NX_PORT} || exit +mkdir -p ${NX_ROOT}/C-${NX_PORT} || exit + +rm -rf ${HOME}/.nx/S-${NX_PORT} || exit +mkdir -p ${HOME}/.nx/S-${NX_PORT} || exit + +# +# Set the path to libraries and NX executables. +# + +LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${HOME}/NX/nxcomp:${HOME}/NX/nxcompext:\ +${HOME}/NX/nxcompshad:${HOME}/NX/nx-X11/exports/lib" + +export LD_LIBRARY_PATH + +PATH="${PATH}:${HOME}/NX/nxclient/nxclient:${HOME}/NX/nx-X11/programs/Xserver/" +export PATH + +# +# Create the fake cookie for this display. +# + +echo -ne "Creating the X authorization cookie.\n" + +xauth add ${HOSTNAME}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} +xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} + +# +# Options are written in a file 'options' in the session +# directory. The agent will use the DISPLAY settings, so +# we pass in the DISPLAY the name of the options file. +# +# cache=8M,images=32M,link=modem,type=unix-kde,cleanup=0, +# accept=62.98.198.1,cookie=$NX_COOKIE, +# id=giulietta.nomachine.com-1098-6A4649FD0FCA57FAC275AF3F1C45B10F, +# media=1:1098 +# + +NX_HOST=nx/nx,cache=8192k,link=modem,shadow=$1,\ +accept=127.0.0.1,cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session + +echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/C-${NX_PORT}/options + +# +# Run the agent. if you don't have a font server running, +# remove the argument "-fp unix/:7100" +# + +NX_AGENT=:${NX_PORT} + +echo -ne "Running the X client side NX agent.\n" + +# SAVED_DISPLAY=$DISPLAY +# +# DISPLAY=nxdev120:0 +# export DISPLAY + +#valgrind -v --num-callers=8 --error-limit=no --trace-children=no \ +#valgrind --num-callers=8 --tool=memcheck --leak-check=no --show-reachable=yes --track-fds=no \ +nx-X11/programs/Xserver/nxagent -S -options ${NX_ROOT}/C-${NX_PORT}/options \ +-nopersistent -name 'NX' \ +${NX_AGENT} 2>>${NX_ROOT}/C-${NX_PORT}/session & diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxagent-solaris new/nxscripts/run-nxagent-solaris --- old/nxscripts/run-nxagent-solaris 2007-02-01 14:50:51.000000000 +0100 +++ new/nxscripts/run-nxagent-solaris 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxagent-windows new/nxscripts/run-nxagent-windows --- old/nxscripts/run-nxagent-windows 1970-01-01 01:00:00.000000000 +0100 +++ new/nxscripts/run-nxagent-windows 2007-04-11 19:28:54.000000000 +0200 @@ -0,0 +1,54 @@ +#!/bin/bash + +#/**************************************************************************/ +#/* */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ +#/* */ +#/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ +#/* are copyright of NoMachine. Redistribution and use of the present */ +#/* software is allowed according to terms specified in the file LICENSE */ +#/* which comes in the source distribution. */ +#/* */ +#/* Check http://www.nomachine.com/licensing.html for applicability. */ +#/* */ +#/* NX and NoMachine are trademarks of Medialogic S.p.A. */ +#/* */ +#/* All rights reserved. */ +#/* */ +#/**************************************************************************/ + +NX_PROJECT_ROOT=${HOME}/NX + +NX_ROOT=${HOME}/.nx + +NX_PORT=3 + +NX_COOKIE=123efa980d2cba234ef6f73deac810ff + +PATH=${NX_PROJECT_ROOT}/nxcomp:${NX_PROJECT_ROOT}/nxcompext:\ +${NX_PROJECT_ROOT}/nxcompshad:${NX_PROJECT_ROOT}/nx-X11/exports/bin:$PATH + +export PATH + +rm -rf ${NX_ROOT}/C-${NX_PORT} + +mkdir -p ${NX_ROOT}/C-${NX_PORT} + +NX_HOST=nx/nx,cache=8M,images=32M,link=modem,\ +cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session + +echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/C-${NX_PORT}/options + +DISPLAY=nx/nx,options=${NX_ROOT}/C-${NX_PORT}/options:${NX_PORT} + +export DISPLAY + +echo -ne "Creating the X authorization cookie.\n" + +xauth add ${HOSTNAME}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} +xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} + +echo -ne "Running X agent on display :${NX_PORT}.\n" + +${NX_PROJECT_ROOT}/nx-X11/programs/Xserver/nxagent \ +-S -geometry 800x600 -nopersistent :${NX_PORT} 2> ${NX_ROOT}/C-${NX_PORT}/session & diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxdesktop new/nxscripts/run-nxdesktop --- old/nxscripts/run-nxdesktop 2007-02-01 14:50:36.000000000 +0100 +++ new/nxscripts/run-nxdesktop 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxdesktop-client new/nxscripts/run-nxdesktop-client --- old/nxscripts/run-nxdesktop-client 2007-02-01 14:51:05.000000000 +0100 +++ new/nxscripts/run-nxdesktop-client 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxdesktop-server new/nxscripts/run-nxdesktop-server --- old/nxscripts/run-nxdesktop-server 2007-02-01 14:51:21.000000000 +0100 +++ new/nxscripts/run-nxdesktop-server 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxproxy new/nxscripts/run-nxproxy --- old/nxscripts/run-nxproxy 2007-02-01 14:51:31.000000000 +0100 +++ new/nxscripts/run-nxproxy 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxproxy-client new/nxscripts/run-nxproxy-client --- old/nxscripts/run-nxproxy-client 2007-02-01 14:51:38.000000000 +0100 +++ new/nxscripts/run-nxproxy-client 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxproxy-connect new/nxscripts/run-nxproxy-connect --- old/nxscripts/run-nxproxy-connect 1970-01-01 01:00:00.000000000 +0100 +++ new/nxscripts/run-nxproxy-connect 2007-04-11 20:11:21.000000000 +0200 @@ -0,0 +1,34 @@ +#!/bin/bash + +NX_PROJECT_ROOT=${HOME}/NX + +NX_ROOT=${HOME}/.nx + +NX_PORT=3 + +NX_COOKIE=123efa980d2cba234ef6f73deac810ff + +# Change this into the host to connect to. + +REMOTE_HOST=nxtest04 + +NX_HOST=nx/nx,keybd=1,samba=1,cups=1,connect=${REMOTE_HOST},cookie=$NX_COOKIE,errors=${NX_ROOT}/S-${NX_PORT}/session + +cd ${NX_PROJECT_ROOT} + +rm -rf ${NX_ROOT}/S-${NX_PORT} +mkdir -p ${NX_ROOT}/S-${NX_PORT} + +echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/S-${NX_PORT}/options + +echo -ne "Running the X server side NX proxy.\n" + +LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${NX_PROJECT_ROOT}/nxcomp:${NX_PROJECT_ROOT}/nxcompext:\ +${NX_PROJECT_ROOT}/NX/nxcompshad:${NX_PROJECT_ROOT}/NX/nx-X11/exports/lib" + +export LD_LIBRARY_PATH + +nxproxy/nxproxy -S nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT} 2> ${HOME}/.nx/S-${NX_PORT}/session & + +echo -ne "Session running on display :$NX_PORT.\n" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxproxy-reversed new/nxscripts/run-nxproxy-reversed --- old/nxscripts/run-nxproxy-reversed 2007-02-01 14:51:43.000000000 +0100 +++ new/nxscripts/run-nxproxy-reversed 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxproxy-server new/nxscripts/run-nxproxy-server --- old/nxscripts/run-nxproxy-server 2007-02-01 14:51:46.000000000 +0100 +++ new/nxscripts/run-nxproxy-server 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxproxy-thread new/nxscripts/run-nxproxy-thread --- old/nxscripts/run-nxproxy-thread 2007-02-01 14:51:55.000000000 +0100 +++ new/nxscripts/run-nxproxy-thread 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxviewer new/nxscripts/run-nxviewer --- old/nxscripts/run-nxviewer 2007-02-01 14:51:58.000000000 +0100 +++ new/nxscripts/run-nxviewer 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxviewer-client new/nxscripts/run-nxviewer-client --- old/nxscripts/run-nxviewer-client 2007-02-01 14:52:01.000000000 +0100 +++ new/nxscripts/run-nxviewer-client 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-nxviewer-server new/nxscripts/run-nxviewer-server --- old/nxscripts/run-nxviewer-server 2007-02-01 14:52:04.000000000 +0100 +++ new/nxscripts/run-nxviewer-server 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/run-x11perf new/nxscripts/run-x11perf --- old/nxscripts/run-x11perf 2007-02-01 14:52:24.000000000 +0100 +++ new/nxscripts/run-x11perf 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxagent new/nxscripts/tar-nxagent --- old/nxscripts/tar-nxagent 2007-02-01 14:52:28.000000000 +0100 +++ new/nxscripts/tar-nxagent 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxauth new/nxscripts/tar-nxauth --- old/nxscripts/tar-nxauth 2007-02-01 14:52:31.000000000 +0100 +++ new/nxscripts/tar-nxauth 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxauth-org new/nxscripts/tar-nxauth-org --- old/nxscripts/tar-nxauth-org 2007-02-01 14:52:34.000000000 +0100 +++ new/nxscripts/tar-nxauth-org 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxclient new/nxscripts/tar-nxclient --- old/nxscripts/tar-nxclient 2007-02-01 14:52:40.000000000 +0100 +++ new/nxscripts/tar-nxclient 2007-09-12 19:51:17.000000000 +0200 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ @@ -79,10 +79,7 @@ sed -e 's|NXCLIENT_VERSION=.*$|NXCLIENT_VERSION=\\\"'${version}'\\\"|g' nxclient.pro > nxclient.pro.sed || exit 1 mv nxclient.pro.sed nxclient.pro || exit 1 - sed -e 's|AppVersion=.*$|AppVersion='${version}'\r|g' nxclient.iss > nxclient.iss.sed || exit 1 - mv nxclient.iss.sed nxclient.iss || exit 1 - - sed -e 's|AppVerName=NX Client for Windows.*$|AppVerName=NX Client for Windows '${version}'\r|g' nxclient.iss > nxclient.iss.sed || exit 1 + sed -e 's|\#define\ AppVersion .*$|\#define AppVersion '\"${version}\"'\r|g' nxclient.iss > nxclient.iss.sed || exit 1 mv nxclient.iss.sed nxclient.iss || exit 1 sed -e 's|const char \*NX_CLIENT_VERSION =.*$|const char *NX_CLIENT_VERSION = \"'${version}'\";|g' NXClientVersion.h > NXClientVersion.h.sed || exit 1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxcomp new/nxscripts/tar-nxcomp --- old/nxscripts/tar-nxcomp 2007-02-01 14:52:43.000000000 +0100 +++ new/nxscripts/tar-nxcomp 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxcompext new/nxscripts/tar-nxcompext --- old/nxscripts/tar-nxcompext 2007-02-01 14:52:46.000000000 +0100 +++ new/nxscripts/tar-nxcompext 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxcompsh new/nxscripts/tar-nxcompsh --- old/nxscripts/tar-nxcompsh 2007-02-01 14:52:49.000000000 +0100 +++ new/nxscripts/tar-nxcompsh 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxcompshad new/nxscripts/tar-nxcompshad --- old/nxscripts/tar-nxcompshad 1970-01-01 01:00:00.000000000 +0100 +++ new/nxscripts/tar-nxcompshad 2007-04-06 16:26:31.000000000 +0200 @@ -0,0 +1,108 @@ +#!/bin/sh + +#/**************************************************************************/ +#/* */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ +#/* */ +#/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ +#/* are copyright of NoMachine. Redistribution and use of the present */ +#/* software is allowed according to terms specified in the file LICENSE */ +#/* which comes in the source distribution. */ +#/* */ +#/* Check http://www.nomachine.com/licensing.html for applicability. */ +#/* */ +#/* NX and NoMachine are trademarks of Medialogic S.p.A. */ +#/* */ +#/* All rights reserved. */ +#/* */ +#/**************************************************************************/ + + +PROJECT=nxcompshad +TEMPORARY=t +SUFFIX=XXX + + +if [ `uname` = "SunOS" ] ; then + TAR=gtar + CP="cp -r" +elif [ `uname` = "Darwin" ] ; then + TAR=tar + CP="cp -RPp" +else + TAR=tar + CP="cp -a" +fi + + + +if [ $1 ] ; then + SUFFIX=$1 + if [ -f ${PROJECT}-${SUFFIX}.tar.gz ] ; then + echo -ne "Release file ${PROJECT}-${SUFFIX}.tar.gz exists.\n" + exit 1 + fi +fi + +cd ../NX 2>/dev/null || \ + if [ 1 ] ; then + echo -ne "Change directory to 'NX' project home and retry.\n" + exit 1 + fi + +if [ ! -d ${PROJECT} ] ; then + echo -ne "Can't find '${PROJECT}' project files.\n" + exit 1 +fi + +if [ -f ${TEMPORARY} ] ; then + echo -ne "Please remove file '${TEMPORARY}' and retry.\n" + exit 1 +fi + +if [ -d ${TEMPORARY} ] ; then + echo -ne "Removing temporary directory '${TEMPORARY}'...\n" + rm -rf ${TEMPORARY} 2>/dev/null +fi + +mkdir ${TEMPORARY} 2>/dev/null + +# +# Copy all files pertaining to ${PROJECT} +# to a temporary directory. +# + +echo -ne "Copying '${PROJECT}' project files to '${TEMPORARY}'...\n" + +cd ${TEMPORARY} 2>/dev/null || exit 1 + +$CP ../${PROJECT} . || exit 1 + +# +# Make a distclean in copy of project's directory. +# + +cd ${PROJECT} || exit 1 + +echo -ne "Making distclean in '${TEMPORARY}/${PROJECT}'...\n" + +make distclean 1>/dev/null 2>/dev/null || \ + if [ 1 ] ; then + echo -ne "Distclean failed. Check you have successfully built\n" + echo -ne "the project and have such target in your makefile.\n" + exit 1 + fi + +cd .. + +# +# Make the tarfile. +# + +echo -ne "Making '${PROJECT}' tar file from '${TEMPORARY}'...\n" + +$TAR zcf ../${PROJECT}-${SUFFIX}.tar.gz ${PROJECT} || exit 1 + +if [ -e $1 ] ; then + echo -ne "Please now rename file '${PROJECT}-${SUFFIX}.tar.gz' to your version number.\n" +fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxdarwin new/nxscripts/tar-nxdarwin --- old/nxscripts/tar-nxdarwin 2007-02-01 14:52:52.000000000 +0100 +++ new/nxscripts/tar-nxdarwin 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxdesktop new/nxscripts/tar-nxdesktop --- old/nxscripts/tar-nxdesktop 2007-02-01 14:52:54.000000000 +0100 +++ new/nxscripts/tar-nxdesktop 2007-02-08 16:18:33.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxesd new/nxscripts/tar-nxesd --- old/nxscripts/tar-nxesd 2007-02-01 14:52:57.000000000 +0100 +++ new/nxscripts/tar-nxesd 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxkbd new/nxscripts/tar-nxkbd --- old/nxscripts/tar-nxkbd 2007-02-01 14:53:00.000000000 +0100 +++ new/nxscripts/tar-nxkbd 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxkdrive new/nxscripts/tar-nxkdrive --- old/nxscripts/tar-nxkdrive 2007-02-01 14:53:03.000000000 +0100 +++ new/nxscripts/tar-nxkdrive 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxkill new/nxscripts/tar-nxkill --- old/nxscripts/tar-nxkill 1970-01-01 01:00:00.000000000 +0100 +++ new/nxscripts/tar-nxkill 2007-05-16 16:24:02.000000000 +0200 @@ -0,0 +1,108 @@ +#!/bin/sh + +#/**************************************************************************/ +#/* */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ +#/* */ +#/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ +#/* are copyright of NoMachine. Redistribution and use of the present */ +#/* software is allowed according to terms specified in the file LICENSE */ +#/* which comes in the source distribution. */ +#/* */ +#/* Check http://www.nomachine.com/licensing.html for applicability. */ +#/* */ +#/* NX and NoMachine are trademarks of Medialogic S.p.A. */ +#/* */ +#/* All rights reserved. */ +#/* */ +#/**************************************************************************/ + + +PROJECT=nxkill +TEMPORARY=t +SUFFIX=XXX + + +if [ `uname` = "SunOS" ] ; then + TAR=gtar + CP="cp -r" +elif [ `uname` = "Darwin" ] ; then + TAR=tar + CP="cp -RPp" +else + TAR=tar + CP="cp -a" +fi + + + +if [ $1 ] ; then + SUFFIX=$1 + if [ -f ${PROJECT}-${SUFFIX}.tar.gz ] ; then + echo -ne "Release file ${PROJECT}-${SUFFIX}.tar.gz exists.\n" + exit 1 + fi +fi + +cd ../NX 2>/dev/null || \ + if [ 1 ] ; then + echo -ne "Change directory to 'NX' project home and retry.\n" + exit 1 + fi + +if [ ! -d ${PROJECT} ] ; then + echo -ne "Can't find '${PROJECT}' project files.\n" + exit 1 +fi + +if [ -f ${TEMPORARY} ] ; then + echo -ne "Please remove file '${TEMPORARY}' and retry.\n" + exit 1 +fi + +if [ -d ${TEMPORARY} ] ; then + echo -ne "Removing temporary directory '${TEMPORARY}'...\n" + rm -rf ${TEMPORARY} 2>/dev/null +fi + +mkdir ${TEMPORARY} 2>/dev/null + +# +# Copy all files pertaining to ${PROJECT} +# to a temporary directory. +# + +echo -ne "Copying '${PROJECT}' project files to '${TEMPORARY}'...\n" + +cd ${TEMPORARY} 2>/dev/null || exit 1 + +$CP ../${PROJECT} . || exit 1 + +# +# Make a distclean in copy of project's directory. +# + +cd ${PROJECT} || exit 1 + +echo -ne "Making distclean in '${TEMPORARY}/${PROJECT}'...\n" + +make distclean 1>/dev/null 2>/dev/null || \ + if [ 1 ] ; then + echo -ne "Distclean failed. Check you have successfully built\n" + echo -ne "the project and have such target in your makefile.\n" + exit 1 + fi + +cd .. + +# +# Make the tarfile. +# + +echo -ne "Making '${PROJECT}' tar file from '${TEMPORARY}'...\n" + +$TAR zcf ../${PROJECT}-${SUFFIX}.tar.gz ${PROJECT} || exit 1 + +if [ -e $1 ] ; then + echo -ne "Please now rename file '${PROJECT}-${SUFFIX}.tar.gz' to your version number.\n" +fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxproxy new/nxscripts/tar-nxproxy --- old/nxscripts/tar-nxproxy 2007-02-01 14:53:06.000000000 +0100 +++ new/nxscripts/tar-nxproxy 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxscripts new/nxscripts/tar-nxscripts --- old/nxscripts/tar-nxscripts 2007-02-01 14:53:08.000000000 +0100 +++ new/nxscripts/tar-nxscripts 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxsensor new/nxscripts/tar-nxsensor --- old/nxscripts/tar-nxsensor 2007-02-01 14:53:53.000000000 +0100 +++ new/nxscripts/tar-nxsensor 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxservice new/nxscripts/tar-nxservice --- old/nxscripts/tar-nxservice 2007-02-01 14:53:56.000000000 +0100 +++ new/nxscripts/tar-nxservice 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxspool new/nxscripts/tar-nxspool --- old/nxscripts/tar-nxspool 2007-02-01 14:53:58.000000000 +0100 +++ new/nxscripts/tar-nxspool 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxssh new/nxscripts/tar-nxssh --- old/nxscripts/tar-nxssh 2007-02-01 14:54:01.000000000 +0100 +++ new/nxscripts/tar-nxssh 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxsync new/nxscripts/tar-nxsync --- old/nxscripts/tar-nxsync 2007-02-01 14:54:04.000000000 +0100 +++ new/nxscripts/tar-nxsync 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxuexec new/nxscripts/tar-nxuexec --- old/nxscripts/tar-nxuexec 1970-01-01 01:00:00.000000000 +0100 +++ new/nxscripts/tar-nxuexec 2007-05-16 16:24:18.000000000 +0200 @@ -0,0 +1,108 @@ +#!/bin/sh + +#/**************************************************************************/ +#/* */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ +#/* */ +#/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ +#/* are copyright of NoMachine. Redistribution and use of the present */ +#/* software is allowed according to terms specified in the file LICENSE */ +#/* which comes in the source distribution. */ +#/* */ +#/* Check http://www.nomachine.com/licensing.html for applicability. */ +#/* */ +#/* NX and NoMachine are trademarks of Medialogic S.p.A. */ +#/* */ +#/* All rights reserved. */ +#/* */ +#/**************************************************************************/ + + +PROJECT=nxuexec +TEMPORARY=t +SUFFIX=XXX + + +if [ `uname` = "SunOS" ] ; then + TAR=gtar + CP="cp -r" +elif [ `uname` = "Darwin" ] ; then + TAR=tar + CP="cp -RPp" +else + TAR=tar + CP="cp -a" +fi + + + +if [ $1 ] ; then + SUFFIX=$1 + if [ -f ${PROJECT}-${SUFFIX}.tar.gz ] ; then + echo -ne "Release file ${PROJECT}-${SUFFIX}.tar.gz exists.\n" + exit 1 + fi +fi + +cd ../NX 2>/dev/null || \ + if [ 1 ] ; then + echo -ne "Change directory to 'NX' project home and retry.\n" + exit 1 + fi + +if [ ! -d ${PROJECT} ] ; then + echo -ne "Can't find '${PROJECT}' project files.\n" + exit 1 +fi + +if [ -f ${TEMPORARY} ] ; then + echo -ne "Please remove file '${TEMPORARY}' and retry.\n" + exit 1 +fi + +if [ -d ${TEMPORARY} ] ; then + echo -ne "Removing temporary directory '${TEMPORARY}'...\n" + rm -rf ${TEMPORARY} 2>/dev/null +fi + +mkdir ${TEMPORARY} 2>/dev/null + +# +# Copy all files pertaining to ${PROJECT} +# to a temporary directory. +# + +echo -ne "Copying '${PROJECT}' project files to '${TEMPORARY}'...\n" + +cd ${TEMPORARY} 2>/dev/null || exit 1 + +$CP ../${PROJECT} . || exit 1 + +# +# Make a distclean in copy of project's directory. +# + +cd ${PROJECT} || exit 1 + +echo -ne "Making distclean in '${TEMPORARY}/${PROJECT}'...\n" + +make distclean 1>/dev/null 2>/dev/null || \ + if [ 1 ] ; then + echo -ne "Distclean failed. Check you have successfully built\n" + echo -ne "the project and have such target in your makefile.\n" + exit 1 + fi + +cd .. + +# +# Make the tarfile. +# + +echo -ne "Making '${PROJECT}' tar file from '${TEMPORARY}'...\n" + +$TAR zcf ../${PROJECT}-${SUFFIX}.tar.gz ${PROJECT} || exit 1 + +if [ -e $1 ] ; then + echo -ne "Please now rename file '${PROJECT}-${SUFFIX}.tar.gz' to your version number.\n" +fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxviewer new/nxscripts/tar-nxviewer --- old/nxscripts/tar-nxviewer 2007-02-01 14:54:07.000000000 +0100 +++ new/nxscripts/tar-nxviewer 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxwin new/nxscripts/tar-nxwin --- old/nxscripts/tar-nxwin 2007-02-01 14:54:10.000000000 +0100 +++ new/nxscripts/tar-nxwin 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nxwin-org new/nxscripts/tar-nxwin-org --- old/nxscripts/tar-nxwin-org 2007-02-01 14:54:12.000000000 +0100 +++ new/nxscripts/tar-nxwin-org 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nx-X11 new/nxscripts/tar-nx-X11 --- old/nxscripts/tar-nx-X11 2007-02-01 14:54:15.000000000 +0100 +++ new/nxscripts/tar-nx-X11 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nx-X11-org new/nxscripts/tar-nx-X11-org --- old/nxscripts/tar-nx-X11-org 2007-02-01 14:54:18.000000000 +0100 +++ new/nxscripts/tar-nx-X11-org 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nx-X11-org-updated new/nxscripts/tar-nx-X11-org-updated --- old/nxscripts/tar-nx-X11-org-updated 2007-02-01 14:54:29.000000000 +0100 +++ new/nxscripts/tar-nx-X11-org-updated 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/tar-nx-X11-updated new/nxscripts/tar-nx-X11-updated --- old/nxscripts/tar-nx-X11-updated 2007-02-01 14:54:34.000000000 +0100 +++ new/nxscripts/tar-nx-X11-updated 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nxscripts/update-NX new/nxscripts/update-NX --- old/nxscripts/update-NX 2007-02-01 14:54:51.000000000 +0100 +++ new/nxscripts/update-NX 2007-02-08 16:18:34.000000000 +0100 @@ -2,7 +2,7 @@ #/**************************************************************************/ #/* */ -#/* Copyright (c) 2001, 2006 NoMachine, http://www.nomachine.com/. */ +#/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ #/* */ #/* NXSCRIPTS, NX protocol compression and NX extensions to this software */ #/* are copyright of NoMachine. Redistribution and use of the present */ ++++++ nx-X11-2.1.0-3.tar.gz -> nx-X11-3.2.0-2.tar.gz ++++++ NX/nx-X11-2.1.0-3.tar.gz /mounts/work_src_done/STABLE/NX/nx-X11-3.2.0-2.tar.gz differ: byte 5, 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 nagios-plugins
by root＠Hilbert.suse.de 25 Jul '08

25 Jul '08

Hello community, here is the log from the commit of package nagios-plugins checked in at Fri Jul 25 16:57:55 CEST 2008. -------- --- nagios-plugins/nagios-plugins.changes 2008-05-05 15:58:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/nagios-plugins/nagios-plugins.changes 2008-07-24 10:02:11.603617000 +0200 @@ -1,0 +2,33 @@ +Mon Jul 21 18:24:49 CEST 2008 - lrupp(a)suse.de + +- update to 1.4.12: + + Fixed check_http regression in 1.4.10 where following + redirects to relative URLs on virtual hosts failed if + both "-H" and "-I" were used + + Merged two new checks that deprecates check_ntp: + check_ntp_peer and check_ntp_time. + You should read the --help output so see which one is suitable + for you. + ++ check_ntp_peer implement stratum thresholds support + (feature request nagios-bt#1703823). + ++ check_ntp now returns UNKNOWN instead of WARNING if jitter + is unavailable (jitter=-1.000000) as long as the thresholds + range include -1. If no offset threshold is specified and the + offset is unavailable, will return UNKNOWN as well. + + Fixed broken usage2 in check_snmp and check_cluster + + check_cluster now accepts all valid characters in + its thresholds ("-", "@", "~") + + Fixed check_disk reporting OK if disk usage grows + over 100% (nagios-bt#1348746). + + Fixed check_load argument handling when not passing + triplets (nagios-bt#1831890) + + Fixed buffer overflow in check_snmp (CVE-2007-5623) + + Tinderbox builds now runs tests in a verbose mode + + Updated Nagios::Plugin to 0.22 + + VPATH problem fixed for compiling plugins-root +- disabled nagios-plugins-1.4.5-check_procs.c.patch (upstream has + another solution) +- BuildRequires nagios-devel now +- package check_linux_raid + +------------------------------------------------------------------- Old: ---- nagios-plugins-1.4.11.tar.bz2 nagios-plugins-1.4.5-check_procs.c.patch New: ---- nagios-plugins-1.4.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios-plugins.spec ++++++ --- /var/tmp/diff_new_pack.w23669/_old 2008-07-25 16:57:07.000000000 +0200 +++ /var/tmp/diff_new_pack.w23669/_new 2008-07-25 16:57:07.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package nagios-plugins (Version 1.4.11) +# spec file for package nagios-plugins (Version 1.4.12) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,19 +13,20 @@ Name: nagios-plugins Summary: The Nagios Plug-Ins -Version: 1.4.11 -Release: 46 +Version: 1.4.12 +Release: 1 Url: http://nagiosplug.sourceforge.net/ License: GPL v2 or later Group: System/Monitoring -BuildRequires: bind-utils dhcp-devel fping iputils libsmbclient libsmbclient-devel +BuildRequires: bind-utils dhcp-devel fping iputils libsmbclient-devel BuildRequires: mysql-devel net-snmp-devel openldap2-devel openssh perl-Net-SNMP BuildRequires: gnutls-devel postfix postgresql-devel procps python-devel samba-client -BuildRequires: gnutls -BuildRequires: nagios +BuildRequires: nagios-devel %if 0%{?suse_version} %if 0%{?suse_version} > 1020 BuildRequires: freeradius-client-devel +%else +BuildRequires: freeradius-devel %endif %if 0%{?suse_version} < 1010 BuildRequires: heimdal-devel @@ -37,7 +38,6 @@ %endif Source0: nagios-plugins-%{version}.tar.bz2 Source10: nagios-plugins.check_xenvm.sh -Patch1: nagios-plugins-1.4.5-check_procs.c.patch Patch2: nagios-plugins-1.4.5-check_fping.c.patch Patch3: nagios-plugins-1.4.5-check_mysql.c.patch Patch4: nagios-plugins-1.4.5-check_mysql_query.c.patch @@ -91,7 +91,6 @@ %prep %setup -q -%patch1 %patch2 %patch3 %patch4 @@ -118,11 +117,14 @@ --with-mysql #--enable-perl-modules make all %{?jobs:-j%jobs} +gawk -f plugins-scripts/subst contrib/check_linux_raid.pl > contrib/check_linux_raid %install +sed -i 's,^MKINSTALLDIRS.*,MKINSTALLDIRS = ../mkinstalldirs,' po/Makefile %makeinstall install -D -m 664 command.cfg %buildroot/%_sysconfdir/nagios/command.cfg cp -avL %{S:10} $RPM_BUILD_ROOT%{libexecdir}/check_xenvm +%{__install} -m 0755 contrib/check_linux_raid %{buildroot}%libexecdir/ %find_lang %name %clean @@ -159,6 +161,7 @@ %libexecdir/check_ifstatus %libexecdir/check_imap %libexecdir/check_ircd +%libexecdir/check_linux_raid %libexecdir/check_load %libexecdir/check_log %libexecdir/check_mailq @@ -214,6 +217,36 @@ %libexecdir/check_game %changelog +* Mon Jul 21 2008 lrupp(a)suse.de +- update to 1.4.12: + + Fixed check_http regression in 1.4.10 where following + redirects to relative URLs on virtual hosts failed if + both "-H" and "-I" were used + + Merged two new checks that deprecates check_ntp: + check_ntp_peer and check_ntp_time. + You should read the --help output so see which one is suitable + for you. + ++ check_ntp_peer implement stratum thresholds support + (feature request nagios-bt#1703823). + ++ check_ntp now returns UNKNOWN instead of WARNING if jitter + is unavailable (jitter=-1.000000) as long as the thresholds + range include -1. If no offset threshold is specified and the + offset is unavailable, will return UNKNOWN as well. + + Fixed broken usage2 in check_snmp and check_cluster + + check_cluster now accepts all valid characters in + its thresholds ("-", "@", "~") + + Fixed check_disk reporting OK if disk usage grows + over 100%% (nagios-bt#1348746). + + Fixed check_load argument handling when not passing + triplets (nagios-bt#1831890) + + Fixed buffer overflow in check_snmp (CVE-2007-5623) + + Tinderbox builds now runs tests in a verbose mode + + Updated Nagios::Plugin to 0.22 + + VPATH problem fixed for compiling plugins-root +- disabled nagios-plugins-1.4.5-check_procs.c.patch (upstream has + another solution) +- BuildRequires nagios-devel now +- package check_linux_raid * Mon May 05 2008 olh(a)suse.de - fix return type of validate_arguments() in negate.c * Thu Apr 17 2008 max(a)suse.de ++++++ nagios-plugins-1.4.11.tar.bz2 -> nagios-plugins-1.4.12.tar.bz2 ++++++ ++++ 62771 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 MozillaThunderbird
by root＠Hilbert.suse.de 25 Jul '08

25 Jul '08

Hello community, here is the log from the commit of package MozillaThunderbird checked in at Fri Jul 25 16:57:18 CEST 2008. -------- --- MozillaThunderbird/MozillaThunderbird.changes 2008-06-24 19:04:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/MozillaThunderbird/MozillaThunderbird.changes 2008-07-23 18:01:12.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jul 23 18:01:05 CEST 2008 - schwab(a)suse.de + +- Remove unused includes. + +------------------------------------------------------------------- New: ---- unused-includes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaThunderbird.spec ++++++ --- /var/tmp/diff_new_pack.h22862/_old 2008-07-25 16:56:54.000000000 +0200 +++ /var/tmp/diff_new_pack.h22862/_new 2008-07-25 16:56:54.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: fdupes gcc-c++ libgnomeui-devel libidl-devel mozilla-nss-devel orbit-devel unzip update-desktop-files zip License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) Version: 2.0.0.14 -Release: 1 +Release: 11 Summary: The Stand-Alone Mozilla Mail Component Url: http://www.mozilla.org/products/thunderbird/ Group: Productivity/Networking/Email/Clients @@ -50,6 +50,7 @@ Patch27: thunderbird-1.5.0.8-uninitalized-vars-232305.patch #Patch28: thunderbird-gcc4.3-fixes.patch Patch29: visibility.patch +Patch30: unused-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: libstdc++ fileutils textutils /bin/sh %if %suse_version > 1000 @@ -182,6 +183,7 @@ %patch26 %patch27 -p0 # %patch28 -p1 +%patch30 %build export MOZ_BUILD_DATE=%{releasedate} @@ -670,6 +672,8 @@ %{_bindir}/thunderbird-config %changelog +* Wed Jul 23 2008 schwab(a)suse.de +- Remove unused includes. * Tue Jun 24 2008 maw(a)suse.de - Security update to version 2.0.0.14 (bnc#390992): + MFSA 2008-15 / CVE-2008-1236 and CVE-2008-1237: Crashes with ++++++ unused-includes.patch ++++++ --- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ipf32.cpp +++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ipf32.cpp @@ -39,8 +39,6 @@ #include "xptcprivate.h" -#include <iostream.h> - // "This code is for IA64 only" --- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ipf64.cpp +++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ipf64.cpp @@ -40,7 +40,6 @@ #include "xptcprivate.h" #include <stdint.h> -#include <iostream.h> // "This code is for IA64 only" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 lyx
by root＠Hilbert.suse.de 25 Jul '08

25 Jul '08

Hello community, here is the log from the commit of package lyx checked in at Fri Jul 25 16:56:58 CEST 2008. -------- --- lyx/lyx.changes 2008-07-22 17:16:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/lyx/lyx.changes 2008-07-25 08:36:46.951940000 +0200 @@ -4 +4 @@ -- update to 1.5.4: +- update to 1.5.5: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lyx.spec ++++++ --- /var/tmp/diff_new_pack.N12888/_old 2008-07-25 16:53:03.000000000 +0200 +++ /var/tmp/diff_new_pack.N12888/_new 2008-07-25 16:53:03.000000000 +0200 @@ -24,7 +24,7 @@ Requires: texlive-latex ImageMagick free-ttf-fonts AutoReqProv: on Version: 1.5.5 -Release: 1 +Release: 2 Summary: LaTeX-Based WYSIWYG Editor Url: http://www.lyx.org/ Source: lyx-%{version}.tar.bz2 @@ -108,7 +108,7 @@ %changelog * Tue Jul 22 2008 coolo(a)suse.de -- update to 1.5.4: +- update to 1.5.5: * for changelog, see http://www.lyx.org/announce/1_5_5.txt - take out autogen.sh call * Tue Apr 29 2008 dmueller(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 lilo
by root＠Hilbert.suse.de 25 Jul '08

25 Jul '08

Hello community, here is the log from the commit of package lilo checked in at Fri Jul 25 16:56:34 CEST 2008. -------- --- arch/i386/lilo/lilo.changes 2008-07-18 16:04:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/lilo/lilo.changes 2008-07-25 10:53:11.000000000 +0200 @@ -1,0 +2,21 @@ +Fri Jul 25 10:52:16 CEST 2008 - olh(a)suse.de + +- use correct udevadm option for settle + +------------------------------------------------------------------- +Tue Jul 22 16:40:33 CEST 2008 - olh(a)suse.de + +- fix incorrect variable size in iseries-addRamDisk + +------------------------------------------------------------------- +Tue Jul 22 15:16:34 CEST 2008 - olh(a)suse.de + +- look also for CAS bootp reply if there are no device options + in the bootpath + +------------------------------------------------------------------- +Tue Jul 22 13:29:09 CEST 2008 - olh(a)suse.de + +- print tftp download rate, because CAS has a slow tftp client + +------------------------------------------------------------------- @@ -30 +51 @@ -- use either udevtrigger or udevadm trigger, or sleep +- use either udevsettle or udevadm settle, or sleep Old: ---- yaboot-22.8-r1090.tar.bz2 New: ---- yaboot-22.8-r1092.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lilo.spec ++++++ --- /var/tmp/diff_new_pack.Q12338/_old 2008-07-25 16:52:55.000000000 +0200 +++ /var/tmp/diff_new_pack.Q12338/_new 2008-07-25 16:52:55.000000000 +0200 @@ -14,7 +14,7 @@ Name: lilo ExclusiveArch: ppc ppc64 %ix86 x86_64 -%define yaboot_vers 22.8-r1090 +%define yaboot_vers 22.8-r1092 Group: System/Boot License: BSD 3-Clause Summary: The Linux Loader, a Boot Menu @@ -38,7 +38,7 @@ BuildRequires: gcc-32bit glibc-devel-32bit libgcc42-32bit libmudflap42-32bit %endif Version: 22.8 -Release: 1 +Release: 3 Source0: lilo-ppc-%{version}.tar.bz2 Source1: http://penguinppc.org/projects/yaboot/yaboot-%{yaboot_vers}.tar.bz2 Source86: lilo-%{version}.src.tar.bz2 @@ -200,6 +200,15 @@ %endif %doc %{_mandir}/*/* %changelog +* Fri Jul 25 2008 olh(a)suse.de +- use correct udevadm option for settle +* Tue Jul 22 2008 olh(a)suse.de +- fix incorrect variable size in iseries-addRamDisk +* Tue Jul 22 2008 olh(a)suse.de +- look also for CAS bootp reply if there are no device options + in the bootpath +* Tue Jul 22 2008 olh(a)suse.de +- print tftp download rate, because CAS has a slow tftp client * Fri Jul 18 2008 olh(a)suse.de - fix a parser bug in CAS tftp options, use full options even if the firmware provided not all options @@ -215,7 +224,7 @@ * Fri Jul 04 2008 olh(a)suse.de - handle new obp-tftp interface in pSeries CAS firmware in yaboot * Fri Jul 04 2008 olh(a)suse.de -- use either udevtrigger or udevadm trigger, or sleep +- use either udevsettle or udevadm settle, or sleep * Thu Jul 03 2008 olh(a)suse.de - add md5sum check for vmlinuz/initrd to bootheader openfirmware truncates large bootfiles if real-base is at 32MB ++++++ lilo-ppc-22.8.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-ppc-22.8/bootheader/utils/iseries-addRamDisk.c new/lilo-ppc-22.8/bootheader/utils/iseries-addRamDisk.c --- old/lilo-ppc-22.8/bootheader/utils/iseries-addRamDisk.c 2008-06-24 17:10:19.000000000 +0200 +++ new/lilo-ppc-22.8/bootheader/utils/iseries-addRamDisk.c 2008-07-22 16:44:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* $Id: iseries-addRamDisk.c 1070 2008-06-24 15:10:19Z olh $ */ +/* $Id: iseries-addRamDisk.c 1093 2008-07-22 14:44:11Z olh $ */ #include <stdio.h> #include <stdlib.h> #include <netinet/in.h> @@ -74,7 +74,7 @@ void death(const char *msg, FILE *fdesc, const char *fname) { - fprintf(stderr, msg); + fprintf(stderr, "ERROR: %s", msg); fclose(fdesc); unlink(fname); exit(1); @@ -100,14 +100,14 @@ unsigned long actualKernelLen; unsigned long round; unsigned long roundedKernelLen; - unsigned long ramStartOffs; - unsigned long ramPages; + u_int32_t ramStartOffs; + u_int32_t ramPages; unsigned long roundedKernelPages; u_int32_t hvReleaseData; u_int32_t eyeCatcher = 0xc8a5d9c4; - unsigned long naca; - unsigned long xRamDisk; - unsigned long xRamDiskSize; + u_int32_t naca; + u_int32_t xRamDisk; + u_int32_t xRamDiskSize; long padPages; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-ppc-22.8/lilo.new new/lilo-ppc-22.8/lilo.new --- old/lilo-ppc-22.8/lilo.new 2008-07-04 09:19:44.000000000 +0200 +++ new/lilo-ppc-22.8/lilo.new 2008-07-25 10:53:11.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/bash # vim: syntax=sh ts=4 -# $Id: lilo.new 1082 2008-07-04 07:19:44Z olh $ +# $Id: lilo.new 1094 2008-07-25 08:53:11Z olh $ # # a simple lilo to store the boot loader and the kernel images # in bash2 ... Think different [tm] @@ -331,7 +331,7 @@ # wait for pending triggered udev events. /sbin/udevsettle --timeout=$timeout elif test -x /sbin/udevadm ; then - /sbin/udevadm trigger --timeout=$timeout + /sbin/udevadm settle --timeout=$timeout else sleep $timeout fi ++++++ yaboot-22.8-r1090.tar.bz2 -> yaboot-22.8-r1092.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-22.8-r1090/Changelog.SuSE new/yaboot-22.8-r1092/Changelog.SuSE --- old/yaboot-22.8-r1090/Changelog.SuSE 2008-07-18 16:05:25.000000000 +0200 +++ new/yaboot-22.8-r1092/Changelog.SuSE 2008-07-25 10:53:42.000000000 +0200 @@ -1,4 +1,21 @@ ------------------------------------------------------------------------ +r1092 | olh | 2008-07-22 13:17:16 +0000 (Tue, 22 Jul 2008) | 3 lines +Changed paths: + M /trunk/lilo.changes + M /trunk/yaboot/second/parse_device_path.c + ++- look also for CAS bootp reply if there are no device options ++ in the bootpath + +------------------------------------------------------------------------ +r1091 | olh | 2008-07-22 11:29:51 +0000 (Tue, 22 Jul 2008) | 2 lines +Changed paths: + M /trunk/lilo.changes + M /trunk/yaboot/second/fs_of.c + ++- print tftp download rate, because CAS has a slow tftp client + +------------------------------------------------------------------------ r1090 | olh | 2008-07-18 14:04:38 +0000 (Fri, 18 Jul 2008) | 3 lines Changed paths: M /trunk/lilo.changes diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-22.8-r1090/Makefile new/yaboot-22.8-r1092/Makefile --- old/yaboot-22.8-r1090/Makefile 2008-07-18 16:05:25.000000000 +0200 +++ new/yaboot-22.8-r1092/Makefile 2008-07-25 10:53:42.000000000 +0200 @@ -6,7 +6,7 @@ include Config -VERSION = 22.8-r1090 +VERSION = 22.8-r1092 # Debug mode (spam/verbose) DEBUG = 0 # make install vars diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-22.8-r1090/second/fs_of.c new/yaboot-22.8-r1092/second/fs_of.c --- old/yaboot-22.8-r1090/second/fs_of.c 2008-07-07 15:26:09.000000000 +0200 +++ new/yaboot-22.8-r1092/second/fs_of.c 2008-07-22 13:29:51.000000000 +0200 @@ -97,6 +97,7 @@ static int of_net_download(unsigned char **buffer, ihandle of_device) { + int ms; int ret = LOAD_BUFFER_TRIES; unsigned char *p, *mem = (unsigned char *)LOAD_BUFFER_BASE; @@ -115,12 +116,25 @@ goto out; } memset(p, 0, LOAD_BUFFER_SIZE); + ms = prom_getms(); DEBUG_F("TFTP...\n"); ret = prom_loadmethod(of_device, p); DEBUG_F("result: %d\n", ret); if (ret > 0) { *buffer = p; - prom_printf("yaboot downloaded %08x bytes via network\n", ret); + ms = prom_getms() - ms; + if (ms < 1000) { + ms = 1000 / ms; + ms *= ret; + } else { + ms /= 1000; + ms = ret / ms; + } + ms /= 1000; + prom_printf("yaboot downloaded %08x bytes via network, download rate %d KB/s.\n", ret, ms); + if (ms > 42 && ms < 666) + prom_printf("\n A download rate of %d KB/s is really slow, isn't it? \n\n", ms); + } else prom_release(p, LOAD_BUFFER_SIZE); out: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-22.8-r1090/second/parse_device_path.c new/yaboot-22.8-r1092/second/parse_device_path.c --- old/yaboot-22.8-r1090/second/parse_device_path.c 2008-07-18 16:04:38.000000000 +0200 +++ new/yaboot-22.8-r1092/second/parse_device_path.c 2008-07-22 15:17:16.000000000 +0200 @@ -1,4 +1,4 @@ -/* $Id: parse_device_path.c 1090 2008-07-18 14:04:38Z olh $ */ +/* $Id: parse_device_path.c 1092 2008-07-22 13:17:16Z olh $ */ #ifndef DEVPATH_TEST #include <errors.h> #include <file.h> @@ -303,7 +303,7 @@ prom_printf("%s\n", __FUNCTION__); #endif if (!result->u.n.ip_before_filename) - return; + goto out; p = result->u.n.ip_before_filename; @@ -345,9 +345,9 @@ *p = '\0'; p++; result->u.n.ip_after_filename = p; - hack_boot_path_for_CAS(result); } out: + hack_boot_path_for_CAS(result); return; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 krb5
by root＠Hilbert.suse.de 25 Jul '08

25 Jul '08

Hello community, here is the log from the commit of package krb5 checked in at Fri Jul 25 16:52:34 CEST 2008. -------- --- krb5/krb5.changes 2008-06-18 15:59:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/krb5/krb5.changes 2008-07-25 12:18:44.335498000 +0200 @@ -1,0 +2,9 @@ +Fri Jul 25 12:13:24 CEST 2008 - mc(a)suse.de + +- add patches from SVN post 1.6.3 + * krb5_string_to_keysalts: Fix an infinite loop + * fix some mutex issues + * better recovery from corrupt rcache files + * some more small fixes + +------------------------------------------------------------------- --- krb5/krb5-doc.changes 2008-06-18 15:59:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/krb5/krb5-doc.changes 2008-07-25 12:18:44.338495000 +0200 @@ -1,0 +2,6 @@ +Fri Jul 25 12:17:10 CEST 2008 - mc(a)suse.de + +- add patches from SVN post 1.6.3 + * some fixes in the man pages + +------------------------------------------------------------------- --- krb5/krb5-plugins.changes 2008-06-18 15:59:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/krb5/krb5-plugins.changes 2008-07-25 12:18:44.343491000 +0200 @@ -1,0 +2,9 @@ +Fri Jul 25 12:17:44 CEST 2008 - mc(a)suse.de + +- add patches from SVN post 1.6.3 + * krb5_string_to_keysalts: Fix an infinite loop + * fix some mutex issues + * better recovery from corrupt rcache files + * some more small fixes + +------------------------------------------------------------------- New: ---- krb5-1.6.3-post.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krb5-doc.spec ++++++ --- /var/tmp/diff_new_pack.WC9606/_old 2008-07-25 16:52:07.000000000 +0200 +++ /var/tmp/diff_new_pack.WC9606/_new 2008-07-25 16:52:07.000000000 +0200 @@ -14,7 +14,7 @@ Name: krb5-doc BuildRequires: ghostscript-library latex2html texlive Version: 1.6.3 -Release: 84 +Release: 96 %define srcRoot krb5-1.6.3 Summary: MIT Kerberos5 Implementation--Documentation License: X11/MIT @@ -26,6 +26,7 @@ Source3: %{name}-%{version}-rpmlintrc Patch0: krb5-1.3.5-perlfix.dif Patch1: krb5-1.6.3-texi2dvi-fix.dif +Patch2: krb5-1.6.3-post.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -48,6 +49,7 @@ %setup -n %{srcRoot} %patch0 %patch1 +%patch2 cp %{_sourcedir}/Makefile.kadm5 %{_builddir}/%{srcRoot}/doc/kadm5/Makefile %build @@ -131,6 +133,9 @@ %doc doc/html %changelog +* Fri Jul 25 2008 mc(a)suse.de +- add patches from SVN post 1.6.3 + * some fixes in the man pages * Wed Jun 18 2008 mc(a)suse.de - reduce rpmlint warnings * Tue Oct 23 2007 mc(a)suse.de ++++++ krb5-plugins.spec ++++++ --- /var/tmp/diff_new_pack.WC9606/_old 2008-07-25 16:52:07.000000000 +0200 +++ /var/tmp/diff_new_pack.WC9606/_new 2008-07-25 16:52:07.000000000 +0200 @@ -14,7 +14,7 @@ Name: krb5-plugins Version: 1.6.3 -Release: 10 +Release: 11 BuildRequires: bison krb5-devel ncurses-devel openldap2-devel %define srcRoot krb5-1.6.3 %define vendorFiles %{_builddir}/%{srcRoot}/vendor-files/ @@ -60,6 +60,7 @@ Patch42: krb5-trunk-seqnum.patch Patch43: krb5-1.6.3-case-insensitive.dif Patch44: krb5-1.6.3-ktutil-manpage.dif +Patch45: krb5-1.6.3-post.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -157,6 +158,7 @@ %patch42 %patch43 %patch44 -p1 +%patch45 cp %{_sourcedir}/EncryptWithMasterKey.c %{_builddir}/%{srcRoot}/src/kadmin/dbutil/EncryptWithMasterKey.c # Rename the man pages so that they'll get generated correctly. pushd src @@ -271,6 +273,12 @@ %{_libdir}/krb5/plugins/preauth/pkinit.so %changelog +* Fri Jul 25 2008 mc(a)suse.de +- add patches from SVN post 1.6.3 + * krb5_string_to_keysalts: Fix an infinite loop + * fix some mutex issues + * better recovery from corrupt rcache files + * some more small fixes * Wed Jun 18 2008 mc(a)suse.de - reduce rpmlint warnings * Tue Dec 04 2007 mc(a)suse.de ++++++ krb5.spec ++++++ --- /var/tmp/diff_new_pack.WC9606/_old 2008-07-25 16:52:07.000000000 +0200 +++ /var/tmp/diff_new_pack.WC9606/_new 2008-07-25 16:52:07.000000000 +0200 @@ -13,7 +13,7 @@ Name: krb5 Version: 1.6.3 -Release: 52 +Release: 58 BuildRequires: bison libcom_err-devel ncurses-devel %if %{suse_version} > 1010 BuildRequires: keyutils keyutils-devel @@ -63,6 +63,7 @@ Patch42: krb5-trunk-seqnum.patch Patch43: krb5-1.6.3-case-insensitive.dif Patch44: krb5-1.6.3-ktutil-manpage.dif +Patch45: krb5-1.6.3-post.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: mktemp, grep, /bin/touch, coreutils PreReq: %insserv_prereq %fillup_prereq @@ -234,6 +235,7 @@ %patch42 %patch43 %patch44 -p1 +%patch45 cp %{_sourcedir}/EncryptWithMasterKey.c %{_builddir}/%{srcRoot}/src/kadmin/dbutil/EncryptWithMasterKey.c # Rename the man pages so that they'll get generated correctly. pushd src @@ -552,6 +554,12 @@ %{_mandir}/man1/krb5-config.1* %changelog +* Fri Jul 25 2008 mc(a)suse.de +- add patches from SVN post 1.6.3 + * krb5_string_to_keysalts: Fix an infinite loop + * fix some mutex issues + * better recovery from corrupt rcache files + * some more small fixes * Wed Jun 18 2008 mc(a)suse.de - add case-insensitive.dif (FATE#300771) - minor fixes for ktutil man page ++++++ krb5-1.6.3-post.dif ++++++ ++++ 2869 lines (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 jlex
by root＠Hilbert.suse.de 25 Jul '08

25 Jul '08

Hello community, here is the log from the commit of package jlex checked in at Fri Jul 25 16:51:44 CEST 2008. -------- --- jlex/jlex.changes 2006-09-25 17:13:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/jlex/jlex.changes 2008-07-25 08:08:08.419197000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 25 08:08:03 CEST 2008 - coolo(a)suse.de + +- build with gcj to avoid bootstrap problems with openjdk + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jlex.spec ++++++ --- /var/tmp/diff_new_pack.Th8030/_old 2008-07-25 16:51:31.000000000 +0200 +++ /var/tmp/diff_new_pack.Th8030/_new 2008-07-25 16:51:31.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package jlex (Version 1.2.6) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,21 +11,22 @@ # norootforbuild # icecream 0 + Name: jlex -BuildRequires: ant java2-devel-packages xml-commons-apis +BuildRequires: ant java-1_5_0-gcj-compat-devel xml-commons-apis-bootstrap %define name jlex %define version 1.2.6 %define release 2jpp %define section free Version: 1.2.6 -Release: 24 +Release: 230 Summary: A Lexical Analyzer Generator for Java -License: BSD +License: BSD 3-Clause Group: Development/Libraries/Java Source0: http://www.cs.princeton.edu/~appel/modern/java/JLex/Archive/1.2.5/Main.java Source1: %{name}-%{version}.build.xml Patch0: %{name}-%{version}.static.patch -URL: http://www.cs.princeton.edu/~appel/modern/java/JLex/ +Url: http://www.cs.princeton.edu/~appel/modern/java/JLex/ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -35,6 +36,7 @@ %package javadoc +License: BSD 3-Clause PreReq: coreutils Group: Development/Libraries/Java Summary: Javadoc for jlex @@ -75,15 +77,17 @@ %defattr(-,root,root,-) %{_javadocdir}/%{name}-%{version} -%changelog -n jlex -* Mon Sep 25 2006 - skh(a)suse.de +%changelog +* Fri Jul 25 2008 coolo(a)suse.de +- build with gcj to avoid bootstrap problems with openjdk +* Mon Sep 25 2006 skh(a)suse.de - don't use icecream - use source="1.4" and target="1.4" for build with java 1.5 -* Wed Jan 25 2006 - mls(a)suse.de +* Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Thu Jul 28 2005 - jsmeix(a)suse.de +* Thu Jul 28 2005 jsmeix(a)suse.de - Adjustments in the spec file. -* Mon Jul 18 2005 - jsmeix(a)suse.de +* Mon Jul 18 2005 jsmeix(a)suse.de - Current version 1.2.6 from JPackage.org -* Thu Sep 02 2004 - skh(a)suse.de +* Thu Sep 02 2004 skh(a)suse.de - Initial package created with version 1.2.6 (JPackage 1.5) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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