May 2006 - openSUSE Commits - openSUSE Mailing Lists

commit udpcast
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package udpcast checked in at Tue May 23 01:37:17 CEST 2006. -------- --- udpcast/udpcast.changes 2006-01-25 21:42:23.000000000 +0100 +++ udpcast/udpcast.changes 2006-05-22 21:00:16.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 22 20:59:43 CEST 2006 - schwab(a)suse.de + +- Use RPM_OPT_FLAGS. +- Don't strip binaries. + +------------------------------------------------------------------- New: ---- udpcast-20050226.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ udpcast.spec ++++++ --- /var/tmp/diff_new_pack.VRSeZf/_old 2006-05-23 01:37:13.000000000 +0200 +++ /var/tmp/diff_new_pack.VRSeZf/_new 2006-05-23 01:37:13.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package udpcast (Version 20050226) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 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. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -14,10 +14,11 @@ URL: http://udpcast.linux.lu/ Summary: File transfer tool via UDP broadcast Version: 20050226 -Release: 3 +Release: 14 License: GPL, BSD Group: Productivity/Networking/Other Source: http://udpcast.linux.lu/udpcast-%{version}.tar.gz +Patch: udpcast-%{version}.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -32,6 +33,7 @@ %prep %setup -q -n udpcast +%patch %build make all @@ -48,6 +50,9 @@ %doc %_mandir/man1/udp-receiver.1.gz %changelog -n udpcast +* Mon May 22 2006 - schwab(a)suse.de +- Use RPM_OPT_FLAGS. +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Wed Sep 28 2005 - dmueller(a)suse.de ++++++ udpcast-20050226.diff ++++++ --- Makefile +++ Makefile @@ -2,7 +2,8 @@ #CFLAGS = -O4 -Wall -DNDEBUG -DLOSSTEST CFLAGS =-Wall -Wshadow -DBB_FEATURE_UDPCAST_FEC -D_FILE_OFFSET_BITS=64 -DUSE_SYSLOG -LDFLAGS =-s -Wl,-warn-common +CFLAGS += $(RPM_OPT_FLAGS) +LDFLAGS = -Wl,-warn-common LIBS=-lpthread BUSYBOX=../udp-busybox/busybox BBTARGET=$(BUSYBOX)/udpcast ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit kmymoney
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package kmymoney checked in at Tue May 23 01:37:17 CEST 2006. -------- --- KDE/kmymoney/kmymoney.changes 2006-05-16 11:21:03.000000000 +0200 +++ kmymoney/kmymoney.changes 2006-05-23 01:13:35.000000000 +0200 @@ -1,0 +2,8 @@ +Mon May 22 09:24:19 CEST 2006 - stbinner(a)suse.de + +- update to version 0.8.4 + * several bug fixes and some improvements to the entry of + scheduled transactions + * some new translations + +------------------------------------------------------------------- Old: ---- fix-warnings.diff kmymoney2-0.8.3.tar.bz2 New: ---- kmymoney2-0.8.4.diff kmymoney2-0.8.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmymoney.spec ++++++ --- /var/tmp/diff_new_pack.HjKXrd/_old 2006-05-23 01:36:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HjKXrd/_new 2006-05-23 01:36:18.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kmymoney (Version 0.8.3) +# spec file for package kmymoney (Version 0.8.4) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,12 +16,12 @@ License: GPL Group: Productivity/Office/Finance Summary: A Personal Finance Manager -Version: 0.8.3 -Release: 3 +Version: 0.8.4 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}2-%{version}.tar.bz2 Patch1: %name.diff -Patch2: fix-warnings.diff +Patch2: kmymoney2-0.8.4.diff %description KMyMoney is a personal finance manager. It does not support online @@ -75,6 +75,11 @@ %_mandir/man1/* %changelog -n kmymoney +* Mon May 22 2006 - stbinner(a)suse.de +- update to version 0.8.4 + * several bug fixes and some improvements to the entry of + scheduled transactions + * some new translations * Mon Apr 24 2006 - dmueller(a)suse.de - Avoid undefined C code (#159361) * Wed Feb 22 2006 - stbinner(a)suse.de ++++++ kmymoney2-0.8.4.diff ++++++ diff -u -r kmymoney2/dialogs/Makefile.in kmymoney2/dialogs/Makefile.in --- kmymoney2/dialogs/Makefile.in 2006-05-15 16:21:39.000000000 +0200 +++ kmymoney2/dialogs/Makefile.in 2006-05-19 13:44:31.760305256 +0200 @@ -1282,8 +1282,11 @@ rm -f ksecuritylisteditordecl.cpp echo '#include <kdialog.h>' > ksecuritylisteditordecl.cpp echo '#include <klocale.h>' >> ksecuritylisteditordecl.cpp + echo '#ifndef KMM_I18N' >> ksecuritylisteditordecl.cpp + echo '#define KMM_I18N' >> ksecuritylisteditordecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> ksecuritylisteditordecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> ksecuritylisteditordecl.cpp + echo '#endif' >> ksecuritylisteditordecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/ksecuritylisteditordecl.ui; \ $(UIC) -tr ${UIC_TR} -i ksecuritylisteditordecl.h $(srcdir)/ksecuritylisteditordecl.ui > ksecuritylisteditordecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" ksecuritylisteditordecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_ksecuritylisteditordecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> ksecuritylisteditordecl.cpp ;\ @@ -1301,8 +1304,11 @@ rm -f konlinequoteconfigurationdecl.cpp echo '#include <kdialog.h>' > konlinequoteconfigurationdecl.cpp echo '#include <klocale.h>' >> konlinequoteconfigurationdecl.cpp + echo '#ifndef KMM_I18N' >> konlinequoteconfigurationdecl.cpp + echo '#define KMM_I18N' >> konlinequoteconfigurationdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> konlinequoteconfigurationdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> konlinequoteconfigurationdecl.cpp + echo '#endif' >> konlinequoteconfigurationdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/konlinequoteconfigurationdecl.ui; \ $(UIC) -tr ${UIC_TR} -i konlinequoteconfigurationdecl.h $(srcdir)/konlinequoteconfigurationdecl.ui > konlinequoteconfigurationdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" konlinequoteconfigurationdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_konlinequoteconfigurationdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> konlinequoteconfigurationdecl.cpp ;\ @@ -1320,8 +1326,11 @@ rm -f kconfirmmanualenterdialog.cpp echo '#include <kdialog.h>' > kconfirmmanualenterdialog.cpp echo '#include <klocale.h>' >> kconfirmmanualenterdialog.cpp + echo '#ifndef KMM_I18N' >> kconfirmmanualenterdialog.cpp + echo '#define KMM_I18N' >> kconfirmmanualenterdialog.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kconfirmmanualenterdialog.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kconfirmmanualenterdialog.cpp + echo '#endif' >> kconfirmmanualenterdialog.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kconfirmmanualenterdialog.ui; \ $(UIC) -tr ${UIC_TR} -i kconfirmmanualenterdialog.h $(srcdir)/kconfirmmanualenterdialog.ui > kconfirmmanualenterdialog.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kconfirmmanualenterdialog.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kconfirmmanualenterdialog,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kconfirmmanualenterdialog.cpp ;\ @@ -1339,8 +1348,11 @@ rm -f knewaccountwizarddecl.cpp echo '#include <kdialog.h>' > knewaccountwizarddecl.cpp echo '#include <klocale.h>' >> knewaccountwizarddecl.cpp + echo '#ifndef KMM_I18N' >> knewaccountwizarddecl.cpp + echo '#define KMM_I18N' >> knewaccountwizarddecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> knewaccountwizarddecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> knewaccountwizarddecl.cpp + echo '#endif' >> knewaccountwizarddecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/knewaccountwizarddecl.ui; \ $(UIC) -tr ${UIC_TR} -i knewaccountwizarddecl.h $(srcdir)/knewaccountwizarddecl.ui > knewaccountwizarddecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" knewaccountwizarddecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_knewaccountwizarddecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> knewaccountwizarddecl.cpp ;\ @@ -1358,8 +1370,11 @@ rm -f knewbankdlgdecl.cpp echo '#include <kdialog.h>' > knewbankdlgdecl.cpp echo '#include <klocale.h>' >> knewbankdlgdecl.cpp + echo '#ifndef KMM_I18N' >> knewbankdlgdecl.cpp + echo '#define KMM_I18N' >> knewbankdlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> knewbankdlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> knewbankdlgdecl.cpp + echo '#endif' >> knewbankdlgdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/knewbankdlgdecl.ui; \ $(UIC) -tr ${UIC_TR} -i knewbankdlgdecl.h $(srcdir)/knewbankdlgdecl.ui > knewbankdlgdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" knewbankdlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_knewbankdlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> knewbankdlgdecl.cpp ;\ @@ -1377,8 +1392,11 @@ rm -f kcurrencyeditdlgdecl.cpp echo '#include <kdialog.h>' > kcurrencyeditdlgdecl.cpp echo '#include <klocale.h>' >> kcurrencyeditdlgdecl.cpp + echo '#ifndef KMM_I18N' >> kcurrencyeditdlgdecl.cpp + echo '#define KMM_I18N' >> kcurrencyeditdlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kcurrencyeditdlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kcurrencyeditdlgdecl.cpp + echo '#endif' >> kcurrencyeditdlgdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kcurrencyeditdlgdecl.ui; \ $(UIC) -tr ${UIC_TR} -i kcurrencyeditdlgdecl.h $(srcdir)/kcurrencyeditdlgdecl.ui > kcurrencyeditdlgdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kcurrencyeditdlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kcurrencyeditdlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kcurrencyeditdlgdecl.cpp ;\ @@ -1396,8 +1414,11 @@ rm -f mymoneyqifprofileeditordecl.cpp echo '#include <kdialog.h>' > mymoneyqifprofileeditordecl.cpp echo '#include <klocale.h>' >> mymoneyqifprofileeditordecl.cpp + echo '#ifndef KMM_I18N' >> mymoneyqifprofileeditordecl.cpp + echo '#define KMM_I18N' >> mymoneyqifprofileeditordecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> mymoneyqifprofileeditordecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> mymoneyqifprofileeditordecl.cpp + echo '#endif' >> mymoneyqifprofileeditordecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/mymoneyqifprofileeditordecl.ui; \ $(UIC) -tr ${UIC_TR} -i mymoneyqifprofileeditordecl.h $(srcdir)/mymoneyqifprofileeditordecl.ui > mymoneyqifprofileeditordecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" mymoneyqifprofileeditordecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_mymoneyqifprofileeditordecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> mymoneyqifprofileeditordecl.cpp ;\ @@ -1415,8 +1436,11 @@ rm -f knewinvestmentwizarddecl.cpp echo '#include <kdialog.h>' > knewinvestmentwizarddecl.cpp echo '#include <klocale.h>' >> knewinvestmentwizarddecl.cpp + echo '#ifndef KMM_I18N' >> knewinvestmentwizarddecl.cpp + echo '#define KMM_I18N' >> knewinvestmentwizarddecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> knewinvestmentwizarddecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> knewinvestmentwizarddecl.cpp + echo '#endif' >> knewinvestmentwizarddecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/knewinvestmentwizarddecl.ui; \ $(UIC) -tr ${UIC_TR} -i knewinvestmentwizarddecl.h $(srcdir)/knewinvestmentwizarddecl.ui > knewinvestmentwizarddecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" knewinvestmentwizarddecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_knewinvestmentwizarddecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> knewinvestmentwizarddecl.cpp ;\ @@ -1434,8 +1458,11 @@ rm -f ksplittransactiondlgdecl.cpp echo '#include <kdialog.h>' > ksplittransactiondlgdecl.cpp echo '#include <klocale.h>' >> ksplittransactiondlgdecl.cpp + echo '#ifndef KMM_I18N' >> ksplittransactiondlgdecl.cpp + echo '#define KMM_I18N' >> ksplittransactiondlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> ksplittransactiondlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> ksplittransactiondlgdecl.cpp + echo '#endif' >> ksplittransactiondlgdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/ksplittransactiondlgdecl.ui; \ $(UIC) -tr ${UIC_TR} -i ksplittransactiondlgdecl.h $(srcdir)/ksplittransactiondlgdecl.ui > ksplittransactiondlgdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" ksplittransactiondlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_ksplittransactiondlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> ksplittransactiondlgdecl.cpp ;\ @@ -1453,8 +1480,11 @@ rm -f kchooseimportexportdlgdecl.cpp echo '#include <kdialog.h>' > kchooseimportexportdlgdecl.cpp echo '#include <klocale.h>' >> kchooseimportexportdlgdecl.cpp + echo '#ifndef KMM_I18N' >> kchooseimportexportdlgdecl.cpp + echo '#define KMM_I18N' >> kchooseimportexportdlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kchooseimportexportdlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kchooseimportexportdlgdecl.cpp + echo '#endif' >> kchooseimportexportdlgdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kchooseimportexportdlgdecl.ui; \ $(UIC) -tr ${UIC_TR} -i kchooseimportexportdlgdecl.h $(srcdir)/kchooseimportexportdlgdecl.ui > kchooseimportexportdlgdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kchooseimportexportdlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kchooseimportexportdlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kchooseimportexportdlgdecl.cpp ;\ @@ -1472,8 +1502,11 @@ rm -f kexportdlgdecl.cpp echo '#include <kdialog.h>' > kexportdlgdecl.cpp echo '#include <klocale.h>' >> kexportdlgdecl.cpp + echo '#ifndef KMM_I18N' >> kexportdlgdecl.cpp + echo '#define KMM_I18N' >> kexportdlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kexportdlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kexportdlgdecl.cpp + echo '#endif' >> kexportdlgdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kexportdlgdecl.ui; \ $(UIC) -tr ${UIC_TR} -i kexportdlgdecl.h $(srcdir)/kexportdlgdecl.ui > kexportdlgdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kexportdlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kexportdlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kexportdlgdecl.cpp ;\ @@ -1491,8 +1524,11 @@ rm -f knewloanwizarddecl.cpp echo '#include <kdialog.h>' > knewloanwizarddecl.cpp echo '#include <klocale.h>' >> knewloanwizarddecl.cpp + echo '#ifndef KMM_I18N' >> knewloanwizarddecl.cpp + echo '#define KMM_I18N' >> knewloanwizarddecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> knewloanwizarddecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> knewloanwizarddecl.cpp + echo '#endif' >> knewloanwizarddecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/knewloanwizarddecl.ui; \ $(UIC) -tr ${UIC_TR} -i knewloanwizarddecl.h $(srcdir)/knewloanwizarddecl.ui > knewloanwizarddecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" knewloanwizarddecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_knewloanwizarddecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> knewloanwizarddecl.cpp ;\ @@ -1510,8 +1546,11 @@ rm -f knewfiledlgdecl.cpp echo '#include <kdialog.h>' > knewfiledlgdecl.cpp echo '#include <klocale.h>' >> knewfiledlgdecl.cpp + echo '#ifndef KMM_I18N' >> knewfiledlgdecl.cpp + echo '#define KMM_I18N' >> knewfiledlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> knewfiledlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> knewfiledlgdecl.cpp + echo '#endif' >> knewfiledlgdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/knewfiledlgdecl.ui; \ $(UIC) -tr ${UIC_TR} -i knewfiledlgdecl.h $(srcdir)/knewfiledlgdecl.ui > knewfiledlgdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" knewfiledlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_knewfiledlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> knewfiledlgdecl.cpp ;\ @@ -1529,8 +1568,11 @@ rm -f kupdatestockpricedlgdecl.cpp echo '#include <kdialog.h>' > kupdatestockpricedlgdecl.cpp echo '#include <klocale.h>' >> kupdatestockpricedlgdecl.cpp + echo '#ifndef KMM_I18N' >> kupdatestockpricedlgdecl.cpp + echo '#define KMM_I18N' >> kupdatestockpricedlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kupdatestockpricedlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kupdatestockpricedlgdecl.cpp + echo '#endif' >> kupdatestockpricedlgdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kupdatestockpricedlgdecl.ui; \ $(UIC) -tr ${UIC_TR} -i kupdatestockpricedlgdecl.h $(srcdir)/kupdatestockpricedlgdecl.ui > kupdatestockpricedlgdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kupdatestockpricedlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kupdatestockpricedlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kupdatestockpricedlgdecl.cpp ;\ @@ -1548,8 +1590,11 @@ rm -f kgncpricesourcedlgdecl.cpp echo '#include <kdialog.h>' > kgncpricesourcedlgdecl.cpp echo '#include <klocale.h>' >> kgncpricesourcedlgdecl.cpp + echo '#ifndef KMM_I18N' >> kgncpricesourcedlgdecl.cpp + echo '#define KMM_I18N' >> kgncpricesourcedlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kgncpricesourcedlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kgncpricesourcedlgdecl.cpp + echo '#endif' >> kgncpricesourcedlgdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kgncpricesourcedlgdecl.ui; \ $(UIC) -tr ${UIC_TR} -i kgncpricesourcedlgdecl.h $(srcdir)/kgncpricesourcedlgdecl.ui > kgncpricesourcedlgdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kgncpricesourcedlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kgncpricesourcedlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kgncpricesourcedlgdecl.cpp ;\ @@ -1567,8 +1612,11 @@ rm -f kreconciledlgdecl.cpp echo '#include <kdialog.h>' > kreconciledlgdecl.cpp echo '#include <klocale.h>' >> kreconciledlgdecl.cpp + echo '#ifndef KMM_I18N' >> kreconciledlgdecl.cpp + echo '#define KMM_I18N' >> kreconciledlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kreconciledlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kreconciledlgdecl.cpp + echo '#endif' >> kreconciledlgdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kreconciledlgdecl.ui; \ $(UIC) -tr ${UIC_TR} -i kreconciledlgdecl.h $(srcdir)/kreconciledlgdecl.ui > kreconciledlgdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kreconciledlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kreconciledlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kreconciledlgdecl.cpp ;\ @@ -1586,8 +1634,11 @@ rm -f kimportdlgdecl.cpp echo '#include <kdialog.h>' > kimportdlgdecl.cpp echo '#include <klocale.h>' >> kimportdlgdecl.cpp + echo '#ifndef KMM_I18N' >> kimportdlgdecl.cpp + echo '#define KMM_I18N' >> kimportdlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kimportdlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kimportdlgdecl.cpp + echo '#endif' >> kimportdlgdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kimportdlgdecl.ui; \ $(UIC) -tr ${UIC_TR} -i kimportdlgdecl.h $(srcdir)/kimportdlgdecl.ui > kimportdlgdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kimportdlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kimportdlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kimportdlgdecl.cpp ;\ @@ -1605,8 +1656,11 @@ rm -f keditschedtransdlgdecl.cpp echo '#include <kdialog.h>' > keditschedtransdlgdecl.cpp echo '#include <klocale.h>' >> keditschedtransdlgdecl.cpp + echo '#ifndef KMM_I18N' >> keditschedtransdlgdecl.cpp + echo '#define KMM_I18N' >> keditschedtransdlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> keditschedtransdlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> keditschedtransdlgdecl.cpp + echo '#endif' >> keditschedtransdlgdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/keditschedtransdlgdecl.ui; \ $(UIC) -tr ${UIC_TR} -i keditschedtransdlgdecl.h $(srcdir)/keditschedtransdlgdecl.ui > keditschedtransdlgdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" keditschedtransdlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_keditschedtransdlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> keditschedtransdlgdecl.cpp ;\ @@ -1624,8 +1678,11 @@ rm -f kenterscheduledialogdecl.cpp echo '#include <kdialog.h>' > kenterscheduledialogdecl.cpp echo '#include <klocale.h>' >> kenterscheduledialogdecl.cpp + echo '#ifndef KMM_I18N' >> kenterscheduledialogdecl.cpp + echo '#define KMM_I18N' >> kenterscheduledialogdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kenterscheduledialogdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kenterscheduledialogdecl.cpp + echo '#endif' >> kenterscheduledialogdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kenterscheduledialogdecl.ui; \ $(UIC) -tr ${UIC_TR} -i kenterscheduledialogdecl.h $(srcdir)/kenterscheduledialogdecl.ui > kenterscheduledialogdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kenterscheduledialogdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kenterscheduledialogdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kenterscheduledialogdecl.cpp ;\ @@ -1643,8 +1700,11 @@ rm -f kaccountselectdlgdecl.cpp echo '#include <kdialog.h>' > kaccountselectdlgdecl.cpp echo '#include <klocale.h>' >> kaccountselectdlgdecl.cpp + echo '#ifndef KMM_I18N' >> kaccountselectdlgdecl.cpp + echo '#define KMM_I18N' >> kaccountselectdlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kaccountselectdlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kaccountselectdlgdecl.cpp + echo '#endif' >> kaccountselectdlgdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kaccountselectdlgdecl.ui; \ $(UIC) -tr ${UIC_TR} -i kaccountselectdlgdecl.h $(srcdir)/kaccountselectdlgdecl.ui > kaccountselectdlgdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kaccountselectdlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kaccountselectdlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kaccountselectdlgdecl.cpp ;\ @@ -1662,8 +1722,11 @@ rm -f kbackupdlgdecl.cpp echo '#include <kdialog.h>' > kbackupdlgdecl.cpp echo '#include <klocale.h>' >> kbackupdlgdecl.cpp + echo '#ifndef KMM_I18N' >> kbackupdlgdecl.cpp + echo '#define KMM_I18N' >> kbackupdlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kbackupdlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kbackupdlgdecl.cpp + echo '#endif' >> kbackupdlgdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kbackupdlgdecl.ui; \ $(UIC) -tr ${UIC_TR} -i kbackupdlgdecl.h $(srcdir)/kbackupdlgdecl.ui > kbackupdlgdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kbackupdlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kbackupdlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kbackupdlgdecl.cpp ;\ @@ -1681,8 +1744,11 @@ rm -f keditequityentrydecl.cpp echo '#include <kdialog.h>' > keditequityentrydecl.cpp echo '#include <klocale.h>' >> keditequityentrydecl.cpp + echo '#ifndef KMM_I18N' >> keditequityentrydecl.cpp + echo '#define KMM_I18N' >> keditequityentrydecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> keditequityentrydecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> keditequityentrydecl.cpp + echo '#endif' >> keditequityentrydecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/keditequityentrydecl.ui; \ $(UIC) -tr ${UIC_TR} -i keditequityentrydecl.h $(srcdir)/keditequityentrydecl.ui > keditequityentrydecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" keditequityentrydecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_keditequityentrydecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> keditequityentrydecl.cpp ;\ @@ -1700,8 +1766,11 @@ rm -f kfindtransactiondlgdecl.cpp echo '#include <kdialog.h>' > kfindtransactiondlgdecl.cpp echo '#include <klocale.h>' >> kfindtransactiondlgdecl.cpp + echo '#ifndef KMM_I18N' >> kfindtransactiondlgdecl.cpp + echo '#define KMM_I18N' >> kfindtransactiondlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kfindtransactiondlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kfindtransactiondlgdecl.cpp + echo '#endif' >> kfindtransactiondlgdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kfindtransactiondlgdecl.ui; \ $(UIC) -tr ${UIC_TR} -i kfindtransactiondlgdecl.h $(srcdir)/kfindtransactiondlgdecl.ui > kfindtransactiondlgdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kfindtransactiondlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kfindtransactiondlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kfindtransactiondlgdecl.cpp ;\ @@ -1719,8 +1788,11 @@ rm -f knewaccountdlgdecl.cpp echo '#include <kdialog.h>' > knewaccountdlgdecl.cpp echo '#include <klocale.h>' >> knewaccountdlgdecl.cpp + echo '#ifndef KMM_I18N' >> knewaccountdlgdecl.cpp + echo '#define KMM_I18N' >> knewaccountdlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> knewaccountdlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> knewaccountdlgdecl.cpp + echo '#endif' >> knewaccountdlgdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/knewaccountdlgdecl.ui; \ $(UIC) -tr ${UIC_TR} -i knewaccountdlgdecl.h $(srcdir)/knewaccountdlgdecl.ui > knewaccountdlgdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" knewaccountdlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_knewaccountdlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> knewaccountdlgdecl.cpp ;\ @@ -1738,8 +1810,11 @@ rm -f kofxdirectconnectdlgdecl.cpp echo '#include <kdialog.h>' > kofxdirectconnectdlgdecl.cpp echo '#include <klocale.h>' >> kofxdirectconnectdlgdecl.cpp + echo '#ifndef KMM_I18N' >> kofxdirectconnectdlgdecl.cpp + echo '#define KMM_I18N' >> kofxdirectconnectdlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kofxdirectconnectdlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kofxdirectconnectdlgdecl.cpp + echo '#endif' >> kofxdirectconnectdlgdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kofxdirectconnectdlgdecl.ui; \ $(UIC) -tr ${UIC_TR} -i kofxdirectconnectdlgdecl.h $(srcdir)/kofxdirectconnectdlgdecl.ui > kofxdirectconnectdlgdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kofxdirectconnectdlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kofxdirectconnectdlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kofxdirectconnectdlgdecl.cpp ;\ @@ -1757,8 +1832,11 @@ rm -f ksplitcorrectiondlg.cpp echo '#include <kdialog.h>' > ksplitcorrectiondlg.cpp echo '#include <klocale.h>' >> ksplitcorrectiondlg.cpp + echo '#ifndef KMM_I18N' >> ksplitcorrectiondlg.cpp + echo '#define KMM_I18N' >> ksplitcorrectiondlg.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> ksplitcorrectiondlg.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> ksplitcorrectiondlg.cpp + echo '#endif' >> ksplitcorrectiondlg.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/ksplitcorrectiondlg.ui; \ $(UIC) -tr ${UIC_TR} -i ksplitcorrectiondlg.h $(srcdir)/ksplitcorrectiondlg.ui > ksplitcorrectiondlg.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" ksplitcorrectiondlg.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_ksplitcorrectiondlg,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> ksplitcorrectiondlg.cpp ;\ @@ -1776,8 +1854,11 @@ rm -f kmymoneypricedlgdecl.cpp echo '#include <kdialog.h>' > kmymoneypricedlgdecl.cpp echo '#include <klocale.h>' >> kmymoneypricedlgdecl.cpp + echo '#ifndef KMM_I18N' >> kmymoneypricedlgdecl.cpp + echo '#define KMM_I18N' >> kmymoneypricedlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kmymoneypricedlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kmymoneypricedlgdecl.cpp + echo '#endif' >> kmymoneypricedlgdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kmymoneypricedlgdecl.ui; \ $(UIC) -tr ${UIC_TR} -i kmymoneypricedlgdecl.h $(srcdir)/kmymoneypricedlgdecl.ui > kmymoneypricedlgdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kmymoneypricedlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kmymoneypricedlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kmymoneypricedlgdecl.cpp ;\ @@ -1795,8 +1876,11 @@ rm -f kadvancedbanksettingsdlgdecl.cpp echo '#include <kdialog.h>' > kadvancedbanksettingsdlgdecl.cpp echo '#include <klocale.h>' >> kadvancedbanksettingsdlgdecl.cpp + echo '#ifndef KMM_I18N' >> kadvancedbanksettingsdlgdecl.cpp + echo '#define KMM_I18N' >> kadvancedbanksettingsdlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kadvancedbanksettingsdlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kadvancedbanksettingsdlgdecl.cpp + echo '#endif' >> kadvancedbanksettingsdlgdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kadvancedbanksettingsdlgdecl.ui; \ $(UIC) -tr ${UIC_TR} -i kadvancedbanksettingsdlgdecl.h $(srcdir)/kadvancedbanksettingsdlgdecl.ui > kadvancedbanksettingsdlgdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kadvancedbanksettingsdlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kadvancedbanksettingsdlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kadvancedbanksettingsdlgdecl.cpp ;\ @@ -1814,8 +1898,11 @@ rm -f kcsvprogressdlgdecl.cpp echo '#include <kdialog.h>' > kcsvprogressdlgdecl.cpp echo '#include <klocale.h>' >> kcsvprogressdlgdecl.cpp + echo '#ifndef KMM_I18N' >> kcsvprogressdlgdecl.cpp + echo '#define KMM_I18N' >> kcsvprogressdlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kcsvprogressdlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kcsvprogressdlgdecl.cpp + echo '#endif' >> kcsvprogressdlgdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kcsvprogressdlgdecl.ui; \ $(UIC) -tr ${UIC_TR} -i kcsvprogressdlgdecl.h $(srcdir)/kcsvprogressdlgdecl.ui > kcsvprogressdlgdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kcsvprogressdlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kcsvprogressdlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kcsvprogressdlgdecl.cpp ;\ @@ -1833,8 +1920,11 @@ rm -f knewequityentrydecl.cpp echo '#include <kdialog.h>' > knewequityentrydecl.cpp echo '#include <klocale.h>' >> knewequityentrydecl.cpp + echo '#ifndef KMM_I18N' >> knewequityentrydecl.cpp + echo '#define KMM_I18N' >> knewequityentrydecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> knewequityentrydecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> knewequityentrydecl.cpp + echo '#endif' >> knewequityentrydecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/knewequityentrydecl.ui; \ $(UIC) -tr ${UIC_TR} -i knewequityentrydecl.h $(srcdir)/knewequityentrydecl.ui > knewequityentrydecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" knewequityentrydecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_knewequityentrydecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> knewequityentrydecl.cpp ;\ @@ -1852,8 +1942,11 @@ rm -f kimportverifydlgdecl.cpp echo '#include <kdialog.h>' > kimportverifydlgdecl.cpp echo '#include <klocale.h>' >> kimportverifydlgdecl.cpp + echo '#ifndef KMM_I18N' >> kimportverifydlgdecl.cpp + echo '#define KMM_I18N' >> kimportverifydlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kimportverifydlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kimportverifydlgdecl.cpp + echo '#endif' >> kimportverifydlgdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kimportverifydlgdecl.ui; \ $(UIC) -tr ${UIC_TR} -i kimportverifydlgdecl.h $(srcdir)/kimportverifydlgdecl.ui > kimportverifydlgdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kimportverifydlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kimportverifydlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kimportverifydlgdecl.cpp ;\ @@ -1871,8 +1964,11 @@ rm -f kequitypriceupdatedlgdecl.cpp echo '#include <kdialog.h>' > kequitypriceupdatedlgdecl.cpp echo '#include <klocale.h>' >> kequitypriceupdatedlgdecl.cpp + echo '#ifndef KMM_I18N' >> kequitypriceupdatedlgdecl.cpp + echo '#define KMM_I18N' >> kequitypriceupdatedlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kequitypriceupdatedlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kequitypriceupdatedlgdecl.cpp + echo '#endif' >> kequitypriceupdatedlgdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kequitypriceupdatedlgdecl.ui; \ $(UIC) -tr ${UIC_TR} -i kequitypriceupdatedlgdecl.h $(srcdir)/kequitypriceupdatedlgdecl.ui > kequitypriceupdatedlgdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kequitypriceupdatedlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kequitypriceupdatedlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kequitypriceupdatedlgdecl.cpp ;\ @@ -1890,8 +1986,11 @@ rm -f kgncimportoptionsdlgdecl.cpp echo '#include <kdialog.h>' > kgncimportoptionsdlgdecl.cpp echo '#include <klocale.h>' >> kgncimportoptionsdlgdecl.cpp + echo '#ifndef KMM_I18N' >> kgncimportoptionsdlgdecl.cpp + echo '#define KMM_I18N' >> kgncimportoptionsdlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kgncimportoptionsdlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kgncimportoptionsdlgdecl.cpp + echo '#endif' >> kgncimportoptionsdlgdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kgncimportoptionsdlgdecl.ui; \ $(UIC) -tr ${UIC_TR} -i kgncimportoptionsdlgdecl.h $(srcdir)/kgncimportoptionsdlgdecl.ui > kgncimportoptionsdlgdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kgncimportoptionsdlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kgncimportoptionsdlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kgncimportoptionsdlgdecl.cpp ;\ @@ -1909,8 +2008,11 @@ rm -f kendingbalancedlgdecl.cpp echo '#include <kdialog.h>' > kendingbalancedlgdecl.cpp echo '#include <klocale.h>' >> kendingbalancedlgdecl.cpp + echo '#ifndef KMM_I18N' >> kendingbalancedlgdecl.cpp + echo '#define KMM_I18N' >> kendingbalancedlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kendingbalancedlgdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kendingbalancedlgdecl.cpp + echo '#endif' >> kendingbalancedlgdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kendingbalancedlgdecl.ui; \ $(UIC) -tr ${UIC_TR} -i kendingbalancedlgdecl.h $(srcdir)/kendingbalancedlgdecl.ui > kendingbalancedlgdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kendingbalancedlgdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kendingbalancedlgdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kendingbalancedlgdecl.cpp ;\ @@ -1928,8 +2030,11 @@ rm -f kcurrencycalculatordecl.cpp echo '#include <kdialog.h>' > kcurrencycalculatordecl.cpp echo '#include <klocale.h>' >> kcurrencycalculatordecl.cpp + echo '#ifndef KMM_I18N' >> kcurrencycalculatordecl.cpp + echo '#define KMM_I18N' >> kcurrencycalculatordecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kcurrencycalculatordecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kcurrencycalculatordecl.cpp + echo '#endif' >> kcurrencycalculatordecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kcurrencycalculatordecl.ui; \ $(UIC) -tr ${UIC_TR} -i kcurrencycalculatordecl.h $(srcdir)/kcurrencycalculatordecl.ui > kcurrencycalculatordecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kcurrencycalculatordecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kcurrencycalculatordecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kcurrencycalculatordecl.cpp ;\ diff -u -r kmymoney2/views/Makefile.in kmymoney2/views/Makefile.in --- kmymoney2/views/Makefile.in 2006-05-15 16:21:40.000000000 +0200 +++ kmymoney2/views/Makefile.in 2006-05-19 13:52:44.736361504 +0200 @@ -1024,8 +1024,11 @@ rm -f kpayeesviewdecl.cpp echo '#include <kdialog.h>' > kpayeesviewdecl.cpp echo '#include <klocale.h>' >> kpayeesviewdecl.cpp + echo '#ifndef KMM_I18N' >> kpayeesviewdecl.cpp + echo '#define KMM_I18N' >> kpayeesviewdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kpayeesviewdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kpayeesviewdecl.cpp + echo '#endif' >> kpayeesviewdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kpayeesviewdecl.ui; \ $(UIC) -tr ${UIC_TR} -i kpayeesviewdecl.h $(srcdir)/kpayeesviewdecl.ui > kpayeesviewdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kpayeesviewdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kpayeesviewdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kpayeesviewdecl.cpp ;\ @@ -1043,8 +1046,11 @@ rm -f kscheduledviewdecl.cpp echo '#include <kdialog.h>' > kscheduledviewdecl.cpp echo '#include <klocale.h>' >> kscheduledviewdecl.cpp + echo '#ifndef KMM_I18N' >> kscheduledviewdecl.cpp + echo '#define KMM_I18N' >> kscheduledviewdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kscheduledviewdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kscheduledviewdecl.cpp + echo '#endif' >> kscheduledviewdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kscheduledviewdecl.ui; \ $(UIC) -tr ${UIC_TR} -i kscheduledviewdecl.h $(srcdir)/kscheduledviewdecl.ui > kscheduledviewdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kscheduledviewdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kscheduledviewdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kscheduledviewdecl.cpp ;\ @@ -1062,8 +1068,11 @@ rm -f kbankviewdecl.cpp echo '#include <kdialog.h>' > kbankviewdecl.cpp echo '#include <klocale.h>' >> kbankviewdecl.cpp + echo '#ifndef KMM_I18N' >> kbankviewdecl.cpp + echo '#define KMM_I18N' >> kbankviewdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kbankviewdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kbankviewdecl.cpp + echo '#endif' >> kbankviewdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kbankviewdecl.ui; \ $(UIC) -tr ${UIC_TR} -i kbankviewdecl.h $(srcdir)/kbankviewdecl.ui > kbankviewdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kbankviewdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kbankviewdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kbankviewdecl.cpp ;\ @@ -1081,8 +1090,11 @@ rm -f kcategoriesviewdecl.cpp echo '#include <kdialog.h>' > kcategoriesviewdecl.cpp echo '#include <klocale.h>' >> kcategoriesviewdecl.cpp + echo '#ifndef KMM_I18N' >> kcategoriesviewdecl.cpp + echo '#define KMM_I18N' >> kcategoriesviewdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kcategoriesviewdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kcategoriesviewdecl.cpp + echo '#endif' >> kcategoriesviewdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kcategoriesviewdecl.ui; \ $(UIC) -tr ${UIC_TR} -i kcategoriesviewdecl.h $(srcdir)/kcategoriesviewdecl.ui > kcategoriesviewdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kcategoriesviewdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kcategoriesviewdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kcategoriesviewdecl.cpp ;\ @@ -1100,8 +1112,11 @@ rm -f kstocktransactionviewdecl.cpp echo '#include <kdialog.h>' > kstocktransactionviewdecl.cpp echo '#include <klocale.h>' >> kstocktransactionviewdecl.cpp + echo '#ifndef KMM_I18N' >> kstocktransactionviewdecl.cpp + echo '#define KMM_I18N' >> kstocktransactionviewdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kstocktransactionviewdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kstocktransactionviewdecl.cpp + echo '#endif' >> kstocktransactionviewdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kstocktransactionviewdecl.ui; \ $(UIC) -tr ${UIC_TR} -i kstocktransactionviewdecl.h $(srcdir)/kstocktransactionviewdecl.ui > kstocktransactionviewdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kstocktransactionviewdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kstocktransactionviewdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kstocktransactionviewdecl.cpp ;\ @@ -1119,8 +1134,11 @@ rm -f kinvestmentviewdecl.cpp echo '#include <kdialog.h>' > kinvestmentviewdecl.cpp echo '#include <klocale.h>' >> kinvestmentviewdecl.cpp + echo '#ifndef KMM_I18N' >> kinvestmentviewdecl.cpp + echo '#define KMM_I18N' >> kinvestmentviewdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kinvestmentviewdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kinvestmentviewdecl.cpp + echo '#endif' >> kinvestmentviewdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kinvestmentviewdecl.ui; \ $(UIC) -tr ${UIC_TR} -i kinvestmentviewdecl.h $(srcdir)/kinvestmentviewdecl.ui > kinvestmentviewdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kinvestmentviewdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kinvestmentviewdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kinvestmentviewdecl.cpp ;\ diff -u -r kmymoney2/widgets/Makefile.in kmymoney2/widgets/Makefile.in --- kmymoney2/widgets/Makefile.in 2006-05-15 16:21:40.000000000 +0200 +++ kmymoney2/widgets/Makefile.in 2006-05-19 13:55:57.907994952 +0200 @@ -1239,8 +1239,11 @@ rm -f kmymoneyonlinequoteconfigdecl.cpp echo '#include <kdialog.h>' > kmymoneyonlinequoteconfigdecl.cpp echo '#include <klocale.h>' >> kmymoneyonlinequoteconfigdecl.cpp + echo '#ifndef KMM_I18N' >> kmymoneyonlinequoteconfigdecl.cpp + echo '#define KMM_I18N' >> kmymoneyonlinequoteconfigdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kmymoneyonlinequoteconfigdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kmymoneyonlinequoteconfigdecl.cpp + echo '#endif' >> kmymoneyonlinequoteconfigdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kmymoneyonlinequoteconfigdecl.ui; \ $(UIC) -tr ${UIC_TR} -i kmymoneyonlinequoteconfigdecl.h $(srcdir)/kmymoneyonlinequoteconfigdecl.ui > kmymoneyonlinequoteconfigdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kmymoneyonlinequoteconfigdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kmymoneyonlinequoteconfigdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kmymoneyonlinequoteconfigdecl.cpp ;\ @@ -1258,8 +1261,11 @@ rm -f kmymoneyreportconfigtab1decl.cpp echo '#include <kdialog.h>' > kmymoneyreportconfigtab1decl.cpp echo '#include <klocale.h>' >> kmymoneyreportconfigtab1decl.cpp + echo '#ifndef KMM_I18N' >> kmymoneyreportconfigtab1decl.cpp + echo '#define KMM_I18N' >> kmymoneyreportconfigtab1decl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kmymoneyreportconfigtab1decl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kmymoneyreportconfigtab1decl.cpp + echo '#endif' >> kmymoneyreportconfigtab1decl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kmymoneyreportconfigtab1decl.ui; \ $(UIC) -tr ${UIC_TR} -i kmymoneyreportconfigtab1decl.h $(srcdir)/kmymoneyreportconfigtab1decl.ui > kmymoneyreportconfigtab1decl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kmymoneyreportconfigtab1decl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kmymoneyreportconfigtab1decl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kmymoneyreportconfigtab1decl.cpp ;\ @@ -1277,8 +1283,11 @@ rm -f kschedulebriefwidget.cpp echo '#include <kdialog.h>' > kschedulebriefwidget.cpp echo '#include <klocale.h>' >> kschedulebriefwidget.cpp + echo '#ifndef KMM_I18N' >> kschedulebriefwidget.cpp + echo '#define KMM_I18N' >> kschedulebriefwidget.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kschedulebriefwidget.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kschedulebriefwidget.cpp + echo '#endif' >> kschedulebriefwidget.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kschedulebriefwidget.ui; \ $(UIC) -tr ${UIC_TR} -i kschedulebriefwidget.h $(srcdir)/kschedulebriefwidget.ui > kschedulebriefwidget.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kschedulebriefwidget.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kschedulebriefwidget,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kschedulebriefwidget.cpp ;\ @@ -1296,8 +1305,11 @@ rm -f kmymoneyreportcontroldecl.cpp echo '#include <kdialog.h>' > kmymoneyreportcontroldecl.cpp echo '#include <klocale.h>' >> kmymoneyreportcontroldecl.cpp + echo '#ifndef KMM_I18N' >> kmymoneyreportcontroldecl.cpp + echo '#define KMM_I18N' >> kmymoneyreportcontroldecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kmymoneyreportcontroldecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kmymoneyreportcontroldecl.cpp + echo '#endif' >> kmymoneyreportcontroldecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kmymoneyreportcontroldecl.ui; \ $(UIC) -tr ${UIC_TR} -i kmymoneyreportcontroldecl.h $(srcdir)/kmymoneyreportcontroldecl.ui > kmymoneyreportcontroldecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kmymoneyreportcontroldecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kmymoneyreportcontroldecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kmymoneyreportcontroldecl.cpp ;\ @@ -1315,8 +1327,11 @@ rm -f kmymoneypriceviewdecl.cpp echo '#include <kdialog.h>' > kmymoneypriceviewdecl.cpp echo '#include <klocale.h>' >> kmymoneypriceviewdecl.cpp + echo '#ifndef KMM_I18N' >> kmymoneypriceviewdecl.cpp + echo '#define KMM_I18N' >> kmymoneypriceviewdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kmymoneypriceviewdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kmymoneypriceviewdecl.cpp + echo '#endif' >> kmymoneypriceviewdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kmymoneypriceviewdecl.ui; \ $(UIC) -tr ${UIC_TR} -i kmymoneypriceviewdecl.h $(srcdir)/kmymoneypriceviewdecl.ui > kmymoneypriceviewdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kmymoneypriceviewdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kmymoneypriceviewdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kmymoneypriceviewdecl.cpp ;\ @@ -1334,8 +1349,11 @@ rm -f kmymoneyreportconfigtab2decl.cpp echo '#include <kdialog.h>' > kmymoneyreportconfigtab2decl.cpp echo '#include <klocale.h>' >> kmymoneyreportconfigtab2decl.cpp + echo '#ifndef KMM_I18N' >> kmymoneyreportconfigtab2decl.cpp + echo '#define KMM_I18N' >> kmymoneyreportconfigtab2decl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kmymoneyreportconfigtab2decl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kmymoneyreportconfigtab2decl.cpp + echo '#endif' >> kmymoneyreportconfigtab2decl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kmymoneyreportconfigtab2decl.ui; \ $(UIC) -tr ${UIC_TR} -i kmymoneyreportconfigtab2decl.h $(srcdir)/kmymoneyreportconfigtab2decl.ui > kmymoneyreportconfigtab2decl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kmymoneyreportconfigtab2decl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kmymoneyreportconfigtab2decl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kmymoneyreportconfigtab2decl.cpp ;\ @@ -1353,8 +1371,11 @@ rm -f kmymoneyreportconfigtab3decl.cpp echo '#include <kdialog.h>' > kmymoneyreportconfigtab3decl.cpp echo '#include <klocale.h>' >> kmymoneyreportconfigtab3decl.cpp + echo '#ifndef KMM_I18N' >> kmymoneyreportconfigtab3decl.cpp + echo '#define KMM_I18N' >> kmymoneyreportconfigtab3decl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kmymoneyreportconfigtab3decl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kmymoneyreportconfigtab3decl.cpp + echo '#endif' >> kmymoneyreportconfigtab3decl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kmymoneyreportconfigtab3decl.ui; \ $(UIC) -tr ${UIC_TR} -i kmymoneyreportconfigtab3decl.h $(srcdir)/kmymoneyreportconfigtab3decl.ui > kmymoneyreportconfigtab3decl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kmymoneyreportconfigtab3decl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kmymoneyreportconfigtab3decl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kmymoneyreportconfigtab3decl.cpp ;\ @@ -1372,8 +1393,11 @@ rm -f kmymoneygpgconfigdecl.cpp echo '#include <kdialog.h>' > kmymoneygpgconfigdecl.cpp echo '#include <klocale.h>' >> kmymoneygpgconfigdecl.cpp + echo '#ifndef KMM_I18N' >> kmymoneygpgconfigdecl.cpp + echo '#define KMM_I18N' >> kmymoneygpgconfigdecl.cpp echo 'inline QString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }' >> kmymoneygpgconfigdecl.cpp echo 'inline QString kmm_i18n(const char* msg) { return i18n(msg); }' >> kmymoneygpgconfigdecl.cpp + echo '#endif' >> kmymoneygpgconfigdecl.cpp $(top_srcdir)/admin/fixuifiles $(srcdir)/kmymoneygpgconfigdecl.ui; \ $(UIC) -tr ${UIC_TR} -i kmymoneygpgconfigdecl.h $(srcdir)/kmymoneygpgconfigdecl.ui > kmymoneygpgconfigdecl.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" kmymoneygpgconfigdecl.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_kmymoneygpgconfigdecl,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" | $(PERL) -pe "s,${UIC_TR},kmm_i18n,g">> kmymoneygpgconfigdecl.cpp ;\ ++++++ kmymoney2-0.8.3.tar.bz2 -> kmymoney2-0.8.4.tar.bz2 ++++++ ++++ 71013 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit syslogd
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package syslogd checked in at Tue May 23 01:37:06 CEST 2006. -------- --- syslogd/syslogd.changes 2006-02-15 13:58:56.000000000 +0100 +++ syslogd/syslogd.changes 2006-05-22 20:52:42.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 22 20:52:39 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syslogd.spec ++++++ --- /var/tmp/diff_new_pack.csH0Ac/_old 2006-05-23 01:36:57.000000000 +0200 +++ /var/tmp/diff_new_pack.csH0Ac/_new 2006-05-23 01:36:57.000000000 +0200 @@ -17,7 +17,7 @@ Provides: syslog Autoreqprov: on Version: 1.4.1 -Release: 548 +Release: 559 Summary: The Syslog daemon Source: sysklogd-1.4.1.tar.bz2 Source1: logrotate.syslog @@ -109,7 +109,6 @@ make LOG_BUFFER_SIZE=-DLOG_BUFFER_SIZE=131072 %install - test -n "$RPM_BUILD_ROOT" && rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/{sbin,etc} mkdir -p $RPM_BUILD_ROOT/etc/init.d mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d @@ -201,6 +200,8 @@ /sbin/klogd %changelog -n syslogd +* Mon May 22 2006 - schwab(a)suse.de +- Don't strip binaries. * Wed Feb 15 2006 - mt(a)suse.de - Added log rotation for /var/log/news/news.* files * Wed Feb 08 2006 - werner(a)suse.de ++++++ sysklogd-1.4.1.dif ++++++ --- /var/tmp/diff_new_pack.csH0Ac/_old 2006-05-23 01:36:58.000000000 +0200 +++ /var/tmp/diff_new_pack.csH0Ac/_new 2006-05-23 01:36:58.000000000 +0200 @@ -32,7 +32,7 @@ -CFLAGS= $(RPM_OPT_FLAGS) -DINET6 -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce -LDFLAGS= -s +CFLAGS= $(RPM_OPT_FLAGS) -D_GNU_SOURCE -DINET6 -DSYSV -Wall -pipe $(LOG_BUFFER_SIZE) -funroll-loops -fpie -+LDFLAGS= -s -pie ++LDFLAGS= -pie # Look where your install program is. INSTALL = /usr/bin/install @@ -56,8 +56,8 @@ install_exec: syslogd klogd - ${INSTALL} -m 500 -s syslogd ${BINDIR}/syslogd - ${INSTALL} -m 500 -s klogd ${BINDIR}/klogd -+ ${INSTALL} -s syslogd ${DESTDIR}${BINDIR}/syslogd -+ ${INSTALL} -s klogd ${DESTDIR}${BINDIR}/klogd ++ ${INSTALL} syslogd ${DESTDIR}${BINDIR}/syslogd ++ ${INSTALL} klogd ${DESTDIR}${BINDIR}/klogd + ${INSTALL} -m 644 sample.conf ${DESTDIR}/etc/syslog.conf install_man: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit sysconfig
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package sysconfig checked in at Tue May 23 01:37:04 CEST 2006. -------- --- sysconfig/sysconfig.changes 2006-05-18 20:52:16.000000000 +0200 +++ sysconfig/sysconfig.changes 2006-05-22 22:38:26.000000000 +0200 @@ -1,0 +2,8 @@ +Mon May 22 22:31:38 CEST 2006 - poeml(a)suse.de + +- fix dhcpcd-hook so that syslog picks up a changed hostname during + bootup, by reloading syslog. The reload was already being done + during IP address change ("renew state") but not during "up" + state. [#160916] + +------------------------------------------------------------------- New: ---- sysconfig-0.50.9-syslog-reload.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.DtrLQ1/_old 2006-05-23 01:36:51.000000000 +0200 +++ /var/tmp/diff_new_pack.DtrLQ1/_new 2006-05-23 01:36:52.000000000 +0200 @@ -13,7 +13,7 @@ Name: sysconfig BuildRequires: autofs portmap sysfsutils ypbind Version: 0.50.9 -Release: 13 +Release: 14 Summary: The sysconfig scheme Group: System/Base License: GPL @@ -22,6 +22,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq %insserv_prereq textutils fileutils gawk /usr/bin/sed /usr/bin/grep Source: %name-%version.tar.bz2 +Patch: sysconfig-0.50.9-syslog-reload.dif %description This package provides the SuSE system configuration scheme. @@ -41,6 +42,7 @@ %prep %setup -n sysconfig-%{version} +%patch -p1 %build autoreconf --force --install @@ -206,6 +208,11 @@ %{insserv_cleanup} %changelog -n sysconfig +* Mon May 22 2006 - poeml(a)suse.de +- fix dhcpcd-hook so that syslog picks up a changed hostname during + bootup, by reloading syslog. The reload was already being done + during IP address change ("renew state") but not during "up" + state. [#160916] * Thu May 18 2006 - zoz(a)suse.de - rcnetwork: quoted two occurrences $OLDPWD to allow spaces in directory names. (Bug 174029) ++++++ sysconfig-0.50.9-syslog-reload.dif ++++++ diff -uNr sysconfig-0.50.9.orig/scripts/dhcpcd-hook sysconfig-0.50.9/scripts/dhcpcd-hook --- sysconfig-0.50.9.orig/scripts/dhcpcd-hook 2006-01-13 13:50:25.000000000 +0100 +++ sysconfig-0.50.9/scripts/dhcpcd-hook 2006-05-22 22:30:39.736808078 +0200 @@ -106,6 +106,9 @@ up) $debug && $log_dbg "Running ifup $INTERFACE -o dhcp" ifup $INTERFACE -o dhcp + + # reload syslog so it knows the new hostname + /etc/init.d/syslog reload ;; down) # We now call PRE_DOWN_SCRIPT directly from ifdown, because it was called ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit suse-release
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package suse-release checked in at Tue May 23 01:36:49 CEST 2006. -------- --- suse-release/suse-release.changes 2006-04-08 09:47:51.000000000 +0200 +++ suse-release/suse-release.changes 2006-05-22 09:08:56.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 22 09:08:51 CEST 2006 - aj(a)suse.de + +- Prepare for 10.2. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suse-release.spec ++++++ --- /var/tmp/diff_new_pack.3fkPvk/_old 2006-05-23 01:36:11.000000000 +0200 +++ /var/tmp/diff_new_pack.3fkPvk/_new 2006-05-23 01:36:11.000000000 +0200 @@ -14,13 +14,14 @@ License: GPL Group: System/Fhs Version: 10.1 -Release: 5 +Release: 11 Provides: aaa_version distribution-release suse-release-oss Provides: %{name}-%{version} Obsoletes: aaa_version suse-release-oss Autoreqprov: on Summary: SuSE release version files BuildRoot: %{_tmppath}/%{name}-%{version}-build +%define betaversion "Pre-Alpha1" %description This package contains the files: /etc/SuSE-release, /etc/issue, and @@ -36,9 +37,9 @@ %install mkdir -p $RPM_BUILD_ROOT/etc test -e /.buildenv && . /.buildenv -echo -e "\nWelcome to $BUILD_DISTRIBUTION_NAME - Kernel \\\r (\\\l).\n\n" > $RPM_BUILD_ROOT/etc/issue -echo "Welcome to $BUILD_DISTRIBUTION_NAME - Kernel %%r (%%t)." > $RPM_BUILD_ROOT/etc/issue.net -echo $BUILD_DISTRIBUTION_NAME > $RPM_BUILD_ROOT/etc/SuSE-release +echo -e "\nWelcome to $BUILD_DISTRIBUTION_NAME %{betaversion} - Kernel \\\r (\\\l).\n\n" > $RPM_BUILD_ROOT/etc/issue +echo "Welcome to $BUILD_DISTRIBUTION_NAME %{betaversion} - Kernel %%r (%%t)." > $RPM_BUILD_ROOT/etc/issue.net +echo $BUILD_DISTRIBUTION_NAME "%{betaversion}" > $RPM_BUILD_ROOT/etc/SuSE-release echo VERSION = $BUILD_DISTRIBUTION_VERSION >> $RPM_BUILD_ROOT/etc/SuSE-release echo "Have a lot of fun..." > $RPM_BUILD_ROOT/etc/motd @@ -50,6 +51,8 @@ %config(noreplace) /etc/issue.net %changelog -n suse-release +* Mon May 22 2006 - aj(a)suse.de +- Prepare for 10.2. * Sat Apr 08 2006 - aj(a)suse.de - Remove Beta. * Wed Mar 29 2006 - aj(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit device-mapper
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package device-mapper checked in at Tue May 23 01:36:10 CEST 2006. -------- --- device-mapper/device-mapper.changes 2006-05-18 18:39:04.000000000 +0200 +++ device-mapper/device-mapper.changes 2006-05-23 01:06:25.000000000 +0200 @@ -1,0 +2,12 @@ +Mon May 22 17:16:40 CEST 2006 - fehr(a)suse.de + +- update to new version 1.02.07 + Add DM_CORELOG flag to dm_tree_node_add_mirror_target(). + Avoid a dmeventd compiler warning. + +- update to new version 1.02.06 + Move DEFS into configure.h. + Fix leaks in error paths found by coverity. + Remove dmsetup line buffer limitation. + +------------------------------------------------------------------- Old: ---- device-mapper.1.02.05.tar.bz2 New: ---- device-mapper.1.02.07.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ device-mapper.spec ++++++ --- /var/tmp/diff_new_pack.tsqGSs/_old 2006-05-23 01:36:02.000000000 +0200 +++ /var/tmp/diff_new_pack.tsqGSs/_new 2006-05-23 01:36:02.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package device-mapper (Version 1.02.05) +# spec file for package device-mapper (Version 1.02.07) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,7 +13,7 @@ License: GPL, LGPL Group: System/Base Autoreqprov: on -Version: 1.02.05 +Version: 1.02.07 Release: 1 Summary: Device Mapper Tools Source: device-mapper.%{version}.tar.bz2 @@ -68,6 +68,14 @@ %{_mandir}/man8/dmsetup.8.gz %changelog -n device-mapper +* Mon May 22 2006 - fehr(a)suse.de +- update to new version 1.02.07 + Add DM_CORELOG flag to dm_tree_node_add_mirror_target(). + Avoid a dmeventd compiler warning. +- update to new version 1.02.06 + Move DEFS into configure.h. + Fix leaks in error paths found by coverity. + Remove dmsetup line buffer limitation. * Thu Apr 20 2006 - fehr(a)suse.de - update to new version 1.02.05 Separate install_include target in makefiles. ++++++ device-mapper.1.02.05.tar.bz2 -> device-mapper.1.02.07.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.05/VERSION new/device-mapper.1.02.07/VERSION --- old/device-mapper.1.02.05/VERSION 2006-04-19 19:25:07.000000000 +0200 +++ new/device-mapper.1.02.07/VERSION 2006-05-11 22:24:50.000000000 +0200 @@ -1 +1 @@ -1.02.05 (2006-04-19) +1.02.07 (2006-05-11) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.05/WHATS_NEW new/device-mapper.1.02.07/WHATS_NEW --- old/device-mapper.1.02.05/WHATS_NEW 2006-04-19 18:41:03.000000000 +0200 +++ new/device-mapper.1.02.07/WHATS_NEW 2006-05-11 22:24:07.000000000 +0200 @@ -1,3 +1,14 @@ +Version 1.02.07 - 11 May 2006 +============================= + Add DM_CORELOG flag to dm_tree_node_add_mirror_target(). + Avoid a dmeventd compiler warning. + +Version 1.02.06 - 10 May 2006 +============================= + Move DEFS into configure.h. + Fix leaks in error paths found by coverity. + Remove dmsetup line buffer limitation. + Version 1.02.05 - 19 Apr 2006 ============================= Separate install_include target in makefiles. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.05/configure new/device-mapper.1.02.07/configure --- old/device-mapper.1.02.05/configure 2006-04-19 18:38:56.000000000 +0200 +++ new/device-mapper.1.02.07/configure 2006-05-10 21:38:25.000000000 +0200 @@ -310,7 +310,7 @@ #endif" ac_default_prefix=/usr -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB LIBOBJS MSGFMT usrlibdir JOBS STATIC_LINK OWNER GROUP interface kerneldir missingkernel kernelvsn tmpdir LVM_DEFS COPTIMISE_FLAG CLDFLAGS LDDEPS LIB_SUFFIX DEBUG DM_LIB_VERSION COMPAT DMIOCTLS LOCALEDIR INTL_PACKAGE INTL DEVICE_UID DEVICE_GID DEVICE_MODE DMEVENTD PKGCONFIG LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB LIBOBJS MSGFMT usrlibdir JOBS STATIC_LINK OWNER GROUP interface kerneldir missingkernel kernelvsn tmpdir COPTIMISE_FLAG CLDFLAGS LDDEPS LIB_SUFFIX DEBUG DM_LIB_VERSION COMPAT DMIOCTLS LOCALEDIR INTL_PACKAGE INTL DEVICE_UID DEVICE_GID DEVICE_MODE DMEVENTD PKGCONFIG LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1321,6 +1321,10 @@ ################################################################################ + ac_config_headers="$ac_config_headers include/configure.h" + + +################################################################################ ac_aux_dir= for ac_dir in autoconf $srcdir/autoconf; do if test -f $ac_dir/install-sh; then @@ -5364,6 +5368,82 @@ then exec_prefix=""; fi; + +################################################################################ + +echo "$as_me:$LINENO: checking for getline in -lc" >&5 +echo $ECHO_N "checking for getline in -lc... $ECHO_C" >&6 +if test "${ac_cv_lib_c_getline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lc $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char getline (); +int +main () +{ +getline (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_c_getline=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_c_getline=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_c_getline" >&5 +echo "${ECHO_T}$ac_cv_lib_c_getline" >&6 +if test $ac_cv_lib_c_getline = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_GETLINE 1 +_ACEOF + +fi + + ################################################################################ echo "$as_me:$LINENO: checking whether to enable selinux support" >&5 echo $ECHO_N "checking whether to enable selinux support... $ECHO_C" >&6 @@ -5377,8 +5457,6 @@ ################################################################################ if test x$SELINUX = xyes; then - echo "$as_me:$LINENO: checking for sepol_check_context function" >&5 -echo $ECHO_N "checking for sepol_check_context function... $ECHO_C" >&6 echo "$as_me:$LINENO: checking for sepol_check_context in -lsepol" >&5 echo $ECHO_N "checking for sepol_check_context in -lsepol... $ECHO_C" >&6 if test "${ac_cv_lib_sepol_sepol_check_context+set}" = set; then @@ -5449,15 +5527,16 @@ HAVE_SEPOL=no fi - echo "$as_me:$LINENO: result: $HAVE_SEPOL" >&5 -echo "${ECHO_T}$HAVE_SEPOL" >&6 if test x$HAVE_SEPOL = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_SEPOL 1 +_ACEOF + LIBS="-lsepol $LIBS" fi - echo "$as_me:$LINENO: checking for is_selinux_enabled function" >&5 -echo $ECHO_N "checking for is_selinux_enabled function... $ECHO_C" >&6 echo "$as_me:$LINENO: checking for is_selinux_enabled in -lselinux" >&5 echo $ECHO_N "checking for is_selinux_enabled in -lselinux... $ECHO_C" >&6 if test "${ac_cv_lib_selinux_is_selinux_enabled+set}" = set; then @@ -5528,11 +5607,13 @@ HAVE_SELINUX=no fi - echo "$as_me:$LINENO: result: $HAVE_SELINUX" >&5 -echo "${ECHO_T}$HAVE_SELINUX" >&6 if test x$HAVE_SELINUX = xyes; then - LVM_DEFS="$LVM_DEFS -DHAVE_SELINUX" + +cat >>confdefs.h <<\_ACEOF +#define HAVE_SELINUX 1 +_ACEOF + LIBS="-lselinux $LIBS" else { echo "$as_me:$LINENO: WARNING: Disabling selinux" >&5 @@ -5686,7 +5767,11 @@ cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - LVM_DEFS="$LVM_DEFS -DHAVE_GETOPTLONG" + +cat >>confdefs.h <<\_ACEOF +#define HAVE_GETOPTLONG 1 +_ACEOF + fi done @@ -5906,7 +5991,6 @@ - ################################################################################ ac_config_files="$ac_config_files Makefile make.tmpl include/Makefile dmsetup/Makefile lib/Makefile lib/libdevmapper.pc lib/libdm-common.h dmeventd/Makefile dmeventd/libdevmapper-event.pc kernel/Makefile man/Makefile po/Makefile" cat >confcache <<\_ACEOF @@ -5983,38 +6067,7 @@ }' fi -# Transform confdefs.h into DEFS. -# Protect against shell expansion while executing Makefile rules. -# Protect against Makefile macro expansion. -# -# If the first sed substitution is executed (which looks for macros that -# take arguments), then we branch to the quote section. Otherwise, -# look for a macro that doesn't take arguments. -cat >confdef2opt.sed <<\_ACEOF -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*$[^ (][^ (]*([^)]*)$[ ]*$.*$,-D\1=\2,g -t quote -s,^[ ]*#[ ]*define[ ][ ]*$[^ ][^ ]*$[ ]*$.*$,-D\1=\2,g -t quote -d -: quote -s,[ `~#$^&*(){}\\|;'"<>?],\\&,g -s,\[,\\&,g -s,\],\\&,g -s,\$,$$,g -p -_ACEOF -# We use echo to avoid assuming a particular line-breaking character. -# The extra dot is to prevent the shell from consuming trailing -# line-breaks from the sub-command output. A line-break within -# single-quotes doesn't work because, if this script is created in a -# platform that uses two characters for line-breaks (e.g., DOS), tr -# would break. -ac_LF_and_DOT=`echo; echo .` -DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` -rm -f confdef2opt.sed - +DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= @@ -6348,10 +6401,15 @@ --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE Configuration files: $config_files +Configuration headers: +$config_headers + Report bugs to <bug-autoconf(a)gnu.org>." _ACEOF @@ -6472,6 +6530,7 @@ "kernel/Makefile" ) CONFIG_FILES="$CONFIG_FILES kernel/Makefile" ;; "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; "po/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/Makefile" ;; + "include/configure.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/configure.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; @@ -6484,6 +6543,7 @@ # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers fi # Have a temporary directory for convenience. Make it in the build tree @@ -6596,7 +6656,6 @@ s,@missingkernel@,$missingkernel,;t t s,@kernelvsn@,$kernelvsn,;t t s,@tmpdir@,$tmpdir,;t t -s,@LVM_DEFS@,$LVM_DEFS,;t t s,@COPTIMISE_FLAG@,$COPTIMISE_FLAG,;t t s,@CLDFLAGS@,$CLDFLAGS,;t t s,@LDDEPS@,$LDDEPS,;t t @@ -6852,6 +6911,229 @@ done _ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF + +# +# CONFIG_HEADER section. +# + +# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where +# NAME is the cpp macro being defined and VALUE is the value it is being given. +# +# ac_d sets the value in "#define NAME VALUE" lines. +ac_dA='s,^$[ ]*$#$[ ]*define[ ][ ]*$' +ac_dB='[ ].*$,\1#\2' +ac_dC=' ' +ac_dD=',;t' +# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". +ac_uA='s,^$[ ]*$#$[ ]*$undef$[ ][ ]*$' +ac_uB='$,\1#\2define\3' +ac_uC=' ' +ac_uD=',;t' + +for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + case $ac_file in + - | *:- | *:-:* ) # input from stdin + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + * ) ac_file_in=$ac_file.in ;; + esac + + test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the + # src tree. + ac_file_inputs=`IFS=: + for f in $ac_file_in; do + case $f in + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + # Do quote $f, to prevent DOS paths from being IFS'd. + echo "$f";; + *) # Relative + if test -f "$f"; then + # Build tree + echo "$f" + elif test -f "$srcdir/$f"; then + # Source tree + echo "$srcdir/$f" + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; + esac + done` || { (exit 1); exit 1; } + # Remove the trailing spaces. + sed 's/[ ]*$//' $ac_file_inputs >$tmp/in + +_ACEOF + +# Transform confdefs.h into two sed scripts, `conftest.defines' and +# `conftest.undefs', that substitutes the proper values into +# config.h.in to produce config.h. The first handles `#define' +# templates, and the second `#undef' templates. +# And first: Protect against being on the right side of a sed subst in +# config.status. Protect against being in an unquoted here document +# in config.status. +rm -f conftest.defines conftest.undefs +# Using a here document instead of a string reduces the quoting nightmare. +# Putting comments in sed scripts is not portable. +# +# `end' is used to avoid that the second main sed command (meant for +# 0-ary CPP macros) applies to n-ary macro definitions. +# See the Autoconf documentation for `clear'. +cat >confdef2sed.sed <<\_ACEOF +s/[\\&,]/\\&/g +s,[\\$`],\\&,g +t clear +: clear +s,^[ ]*#[ ]*define[ ][ ]*$[^ (][^ (]*$$([^)]*)$[ ]*$.*$$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp +t end +s,^[ ]*#[ ]*define[ ][ ]*$[^ ][^ ]*$[ ]*$.*$$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp +: end +_ACEOF +# If some macros were called several times there might be several times +# the same #defines, which is useless. Nevertheless, we may not want to +# sort them, since we want the *last* AC-DEFINE to be honored. +uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines +sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs +rm -f confdef2sed.sed + +# This sed command replaces #undef with comments. This is necessary, for +# example, in the case of _POSIX_SOURCE, which is predefined and required +# on some systems where configure will not decide to define it. +cat >>conftest.undefs <<\_ACEOF +s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, +_ACEOF + +# Break up conftest.defines because some shells have a limit on the size +# of here documents, and old seds have small limits too (100 cmds). +echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS +echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS +echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS +echo ' :' >>$CONFIG_STATUS +rm -f conftest.tail +while grep . conftest.defines >/dev/null +do + # Write a limited-size here document to $tmp/defines.sed. + echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS + # Speed up: don't consider the non `#define' lines. + echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS + # Work around the forget-to-reset-the-flag bug. + echo 't clr' >>$CONFIG_STATUS + echo ': clr' >>$CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS + echo 'CEOF + sed -f $tmp/defines.sed $tmp/in >$tmp/out + rm -f $tmp/in + mv $tmp/out $tmp/in +' >>$CONFIG_STATUS + sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail + rm -f conftest.defines + mv conftest.tail conftest.defines +done +rm -f conftest.defines +echo ' fi # grep' >>$CONFIG_STATUS +echo >>$CONFIG_STATUS + +# Break up conftest.undefs because some shells have a limit on the size +# of here documents, and old seds have small limits too (100 cmds). +echo ' # Handle all the #undef templates' >>$CONFIG_STATUS +rm -f conftest.tail +while grep . conftest.undefs >/dev/null +do + # Write a limited-size here document to $tmp/undefs.sed. + echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS + # Speed up: don't consider the non `#undef' + echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS + # Work around the forget-to-reset-the-flag bug. + echo 't clr' >>$CONFIG_STATUS + echo ': clr' >>$CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS + echo 'CEOF + sed -f $tmp/undefs.sed $tmp/in >$tmp/out + rm -f $tmp/in + mv $tmp/out $tmp/in +' >>$CONFIG_STATUS + sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail + rm -f conftest.undefs + mv conftest.tail conftest.undefs +done +rm -f conftest.undefs + +cat >>$CONFIG_STATUS <<\_ACEOF + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + if test x"$ac_file" = x-; then + echo "/* Generated by configure. */" >$tmp/config.h + else + echo "/* $ac_file. Generated by configure. */" >$tmp/config.h + fi + cat $tmp/in >>$tmp/config.h + rm -f $tmp/in + if test x"$ac_file" != x-; then + if diff $ac_file $tmp/config.h >/dev/null 2>&1; then + { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 +echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`(dirname "$ac_file") 2>/dev/null || +$as_expr X"$ac_file" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X$//$[^/]' \| \ + X"$ac_file" : 'X$//$$' \| \ + X"$ac_file" : 'X$/$' \| \ + . : '$.$' 2>/dev/null || +echo X"$ac_file" | + sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X$\/\/$[^/].*/{ s//\1/; q; } + /^X$\/\/$$/{ s//\1/; q; } + /^X$\/$.*/{ s//\1/; q; } + s/.*/./; q'` + { if $as_mkdir_p; then + mkdir -p "$ac_dir" + else + as_dir="$ac_dir" + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || +$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X$//$[^/]' \| \ + X"$as_dir" : 'X$//$$' \| \ + X"$as_dir" : 'X$/$' \| \ + . : '$.$' 2>/dev/null || +echo X"$as_dir" | + sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X$\/\/$[^/].*/{ s//\1/; q; } + /^X$\/\/$$/{ s//\1/; q; } + /^X$\/$.*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; }; } + + rm -f $ac_file + mv $tmp/config.h $ac_file + fi + else + cat $tmp/config.h + rm -f $tmp/config.h + fi +done +_ACEOF cat >>$CONFIG_STATUS <<\_ACEOF diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.05/configure.in new/device-mapper.1.02.07/configure.in --- old/device-mapper.1.02.05/configure.in 2006-04-19 18:38:56.000000000 +0200 +++ new/device-mapper.1.02.07/configure.in 2006-05-10 21:38:25.000000000 +0200 @@ -20,6 +20,9 @@ AC_INIT(lib/libdevmapper.h) ################################################################################ +AC_CONFIG_HEADERS(include/configure.h) + +################################################################################ dnl -- Setup the directory where autoconf has auxilary files AC_CONFIG_AUX_DIR(autoconf) @@ -200,6 +203,12 @@ then exec_prefix=""; fi; + +################################################################################ +dnl -- getline included in recent libc + +AC_CHECK_LIB(c, getline, AC_DEFINE([HAVE_GETLINE], 1, [Define to 1 if getline is available.])) + ################################################################################ dnl -- Disable selinux AC_MSG_CHECKING(whether to enable selinux support) @@ -210,20 +219,17 @@ ################################################################################ dnl -- Check for selinux if test x$SELINUX = xyes; then - AC_MSG_CHECKING(for sepol_check_context function) AC_CHECK_LIB(sepol, sepol_check_context, HAVE_SEPOL=yes, HAVE_SEPOL=no) - AC_MSG_RESULT($HAVE_SEPOL) if test x$HAVE_SEPOL = xyes; then + AC_DEFINE([HAVE_SEPOL], 1, [Define to 1 if sepol_check_context is available.]) LIBS="-lsepol $LIBS" fi - AC_MSG_CHECKING(for is_selinux_enabled function) AC_CHECK_LIB(selinux, is_selinux_enabled, HAVE_SELINUX=yes, HAVE_SELINUX=no) - AC_MSG_RESULT($HAVE_SELINUX) if test x$HAVE_SELINUX = xyes; then - LVM_DEFS="$LVM_DEFS -DHAVE_SELINUX" + AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 if selinux is available.]) LIBS="-lselinux $LIBS" else AC_MSG_WARN(Disabling selinux) @@ -232,7 +238,7 @@ ################################################################################ dnl -- Check for getopt -AC_CHECK_HEADERS(getopt.h, LVM_DEFS="$LVM_DEFS -DHAVE_GETOPTLONG") +AC_CHECK_HEADERS(getopt.h, AC_DEFINE([HAVE_GETOPTLONG], 1, [Define to 1 if getopt_long is available.])) ################################################################################ dnl -- Internationalisation stuff @@ -359,7 +365,6 @@ AC_SUBST(missingkernel) AC_SUBST(kernelvsn) AC_SUBST(tmpdir) -AC_SUBST(LVM_DEFS) AC_SUBST(CFLAGS) AC_SUBST(COPTIMISE_FLAG) AC_SUBST(CLDFLAGS) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.05/dmeventd/dmeventd.c new/device-mapper.1.02.07/dmeventd/dmeventd.c --- old/device-mapper.1.02.05/dmeventd/dmeventd.c 2006-03-09 22:33:59.000000000 +0100 +++ new/device-mapper.1.02.07/dmeventd/dmeventd.c 2006-05-11 21:08:02.000000000 +0200 @@ -16,6 +16,9 @@ * dmeventd - dm event daemon to monitor active mapped devices */ +#define _GNU_SOURCE +#define _FILE_OFFSET_BITS 64 + #include "libdevmapper.h" #include "libdevmapper-event.h" #include "list.h" @@ -318,7 +321,7 @@ struct stat st_buf; char path2[PATH_MAX]; - if (!device) + if (!device || !*device) return 0; if (device[0] == '/') /* absolute path */ @@ -718,8 +721,11 @@ void *dl; struct dso_data *ret = NULL; + log_very_verbose("Opening shared library %s", data->dso_name); + if (!(dl = dlopen(data->dso_name, RTLD_NOW))){ - log_error("%s\n", dlerror()); + log_error("dmeventd %s dlopen failed: %s", data->dso_name, + dlerror()); return NULL; } @@ -1207,14 +1213,14 @@ /* Init thread signal handling. */ static void init_thread_signals(void) { - sigset_t sigset; + sigset_t my_sigset; struct sigaction act; memset(&act, 0, sizeof(act)); act.sa_handler = sig_alarm; sigaction(SIGALRM, &act, NULL); - sigfillset(&sigset); - pthread_sigmask(SIG_BLOCK, &sigset, NULL); + sigfillset(&my_sigset); + pthread_sigmask(SIG_BLOCK, &my_sigset, NULL); } static int daemonize(void) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.05/dmsetup/dmsetup.c new/device-mapper.1.02.07/dmsetup/dmsetup.c --- old/device-mapper.1.02.05/dmsetup/dmsetup.c 2006-04-06 18:20:40.000000000 +0200 +++ new/device-mapper.1.02.07/dmsetup/dmsetup.c 2006-05-10 21:38:25.000000000 +0200 @@ -19,6 +19,8 @@ #define _GNU_SOURCE #define _FILE_OFFSET_BITS 64 +#include <configure.h> + #include "libdevmapper.h" #include "log.h" @@ -74,7 +76,7 @@ # define MKDEV(x,y) makedev((x),(y)) #endif -#define LINE_SIZE 1024 +#define LINE_SIZE 4096 #define ARGS_MAX 256 #define err(msg, x...) fprintf(stderr, msg "\n", ##x) @@ -117,7 +119,9 @@ */ static int _parse_file(struct dm_task *dmt, const char *file) { - char buffer[LINE_SIZE], ttype[LINE_SIZE], *ptr, *comment; + char *buffer = NULL; + size_t buffer_size = 0; + char ttype[LINE_SIZE], *ptr, *comment; FILE *fp; unsigned long long start, size; int r = 0, n, line = 0; @@ -132,7 +136,17 @@ } else fp = stdin; - while (fgets(buffer, sizeof(buffer), fp)) { +#ifndef HAVE_GETLINE + buffer_size = LINE_SIZE; + if (!(buffer = malloc(buffer_size))) { + err("Failed to malloc line buffer."); + return 0; + } + + while (fgets(buffer, buffer_size, fp)) { +#else + while (getline(&buffer, &buffer_size, fp) > 0) { +#endif line++; /* trim trailing space */ @@ -164,6 +178,7 @@ r = 1; out: + free(buffer); if (file) fclose(fp); return r; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.05/include/Makefile.in new/device-mapper.1.02.07/include/Makefile.in --- old/device-mapper.1.02.05/include/Makefile.in 2004-04-02 17:18:37.000000000 +0200 +++ new/device-mapper.1.02.07/include/Makefile.in 2006-05-10 21:38:25.000000000 +0200 @@ -34,7 +34,7 @@ distclean: find . -maxdepth 2 -type l -exec $(RM) \{\} \; - $(RM) Makefile .include_symlinks .symlinks_created + $(RM) Makefile .include_symlinks .symlinks_created configure.h pofile: all diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.05/include/configure.h.in new/device-mapper.1.02.07/include/configure.h.in --- old/device-mapper.1.02.05/include/configure.h.in 1970-01-01 01:00:00.000000000 +0100 +++ new/device-mapper.1.02.07/include/configure.h.in 2006-05-10 21:38:25.000000000 +0200 @@ -0,0 +1,181 @@ +/* include/configure.h.in. Generated from configure.in by autoheader. */ + +/* Define to 1 if the `closedir' function returns void instead of `int'. */ +#undef CLOSEDIR_VOID + +/* Define to 1 if you have the <ctype.h> header file. */ +#undef HAVE_CTYPE_H + +/* Define to 1 if you have the <dirent.h> header file. */ +#undef HAVE_DIRENT_H + +/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ +#undef HAVE_DOPRNT + +/* Define to 1 if you have the <errno.h> header file. */ +#undef HAVE_ERRNO_H + +/* Define to 1 if you have the <fcntl.h> header file. */ +#undef HAVE_FCNTL_H + +/* Define to 1 if getline is available. */ +#undef HAVE_GETLINE + +/* Define to 1 if getopt_long is available. */ +#undef HAVE_GETOPTLONG + +/* Define to 1 if you have the <getopt.h> header file. */ +#undef HAVE_GETOPT_H + +/* Define to 1 if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the <limits.h> header file. */ +#undef HAVE_LIMITS_H + +/* Define to 1 if your system has a GNU libc compatible `malloc' function, and + to 0 otherwise. */ +#undef HAVE_MALLOC + +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the `memset' function. */ +#undef HAVE_MEMSET + +/* Define to 1 if you have the `mkdir' function. */ +#undef HAVE_MKDIR + +/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ +#undef HAVE_NDIR_H + +/* Define to 1 if you have the `rmdir' function. */ +#undef HAVE_RMDIR + +/* Define to 1 if selinux is available. */ +#undef HAVE_SELINUX + +/* Define to 1 if sepol_check_context is available. */ +#undef HAVE_SEPOL + +/* Define to 1 if `stat' has the bug that it succeeds when given the + zero-length file name argument. */ +#undef HAVE_STAT_EMPTY_STRING_BUG + +/* Define to 1 if you have the <stdarg.h> header file. */ +#undef HAVE_STDARG_H + +/* Define to 1 if you have the <stdint.h> header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the <stdio.h> header file. */ +#undef HAVE_STDIO_H + +/* Define to 1 if you have the <stdlib.h> header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the `strchr' function. */ +#undef HAVE_STRCHR + +/* Define to 1 if you have the `strdup' function. */ +#undef HAVE_STRDUP + +/* Define to 1 if you have the `strerror' function. */ +#undef HAVE_STRERROR + +/* Define to 1 if you have the <strings.h> header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the <string.h> header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the `strrchr' function. */ +#undef HAVE_STRRCHR + +/* Define to 1 if `st_rdev' is member of `struct stat'. */ +#undef HAVE_STRUCT_STAT_ST_RDEV + +/* Define to 1 if your `struct stat' has `st_rdev'. Deprecated, use + `HAVE_STRUCT_STAT_ST_RDEV' instead. */ +#undef HAVE_ST_RDEV + +/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. + */ +#undef HAVE_SYS_DIR_H + +/* Define to 1 if you have the <sys/ioctl.h> header file. */ +#undef HAVE_SYS_IOCTL_H + +/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. + */ +#undef HAVE_SYS_NDIR_H + +/* Define to 1 if you have the <sys/param.h> header file. */ +#undef HAVE_SYS_PARAM_H + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the <sys/types.h> header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the <termios.h> header file. */ +#undef HAVE_TERMIOS_H + +/* Define to 1 if you have the `uname' function. */ +#undef HAVE_UNAME + +/* Define to 1 if you have the <unistd.h> header file. */ +#undef HAVE_UNISTD_H + +/* Define to 1 if you have the `vprintf' function. */ +#undef HAVE_VPRINTF + +/* Define to 1 if `lstat' dereferences a symlink specified with a trailing + slash. */ +#undef LSTAT_FOLLOWS_SLASHED_SYMLINK + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define as the return type of signal handlers (`int' or `void'). */ +#undef RETSIGTYPE + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ +#undef TIME_WITH_SYS_TIME + +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +#undef inline +#endif + +/* Define to rpl_malloc if the replacement function should be used. */ +#undef malloc + +/* Define to `long' if <sys/types.h> does not define. */ +#undef off_t + +/* Define to `int' if <sys/types.h> does not define. */ +#undef pid_t + +/* Define to `unsigned' if <sys/types.h> does not define. */ +#undef size_t diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.05/include/lib.h new/device-mapper.1.02.07/include/lib.h --- old/device-mapper.1.02.05/include/lib.h 2005-10-17 00:57:20.000000000 +0200 +++ new/device-mapper.1.02.07/include/lib.h 2006-05-10 21:38:25.000000000 +0200 @@ -23,6 +23,8 @@ #define _GNU_SOURCE #define _FILE_OFFSET_BITS 64 +#include <configure.h> + #include "log.h" #include "intl.h" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.05/lib/libdevmapper.h new/device-mapper.1.02.07/lib/libdevmapper.h --- old/device-mapper.1.02.05/lib/libdevmapper.h 2006-02-23 20:11:51.000000000 +0100 +++ new/device-mapper.1.02.07/lib/libdevmapper.h 2006-05-11 21:10:55.000000000 +0200 @@ -350,6 +350,7 @@ #define DM_NOSYNC 0x00000001 /* Known already in sync */ #define DM_FORCESYNC 0x00000002 /* Force resync */ #define DM_BLOCK_ON_ERROR 0x00000004 /* On error, suspend I/O */ +#define DM_CORELOG 0x00000008 /* In-memory log */ int dm_tree_node_add_mirror_target_log(struct dm_tree_node *node, uint32_t region_size, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.05/lib/libdm-common.c new/device-mapper.1.02.07/lib/libdm-common.c --- old/device-mapper.1.02.05/lib/libdm-common.c 2006-02-21 00:55:58.000000000 +0100 +++ new/device-mapper.1.02.07/lib/libdm-common.c 2006-05-10 18:23:41.000000000 +0200 @@ -101,8 +101,10 @@ return NULL; } - if (!dm_check_version()) + if (!dm_check_version()) { + dm_free(dmt); return NULL; + } memset(dmt, 0, sizeof(*dmt)); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.05/lib/libdm-deptree.c new/device-mapper.1.02.07/lib/libdm-deptree.c --- old/device-mapper.1.02.05/lib/libdm-deptree.c 2006-02-08 15:14:13.000000000 +0100 +++ new/device-mapper.1.02.07/lib/libdm-deptree.c 2006-05-11 21:10:55.000000000 +0200 @@ -1243,8 +1243,8 @@ log_parm_count += hweight32(seg->flags); /* [no]sync, block_on_error etc. */ if (seg->clustered) { - if (seg->uuid) - log_parm_count++; /* uuid */ + if (seg->uuid && !(seg->flags & DM_CORELOG)) + log_parm_count++; /* uuid (already counted for core log) */ if ((tw = _dm_snprintf(params + pos, paramsize - pos, "clustered_")) < 0) { stack; /* Out of space */ return -1; @@ -1701,18 +1701,19 @@ seg = list_item(list_last(&node->props.segs), struct load_segment); if (log_uuid) { - if (!(log_node = dm_tree_find_node_by_uuid(node->dtree, log_uuid))) { - log_error("Couldn't find mirror log uuid %s.", log_uuid); - return 0; - } - - if (!_link_tree_nodes(node, log_node)) - return_0; - if (!(seg->uuid = dm_pool_strdup(node->dtree->mem, log_uuid))) { log_error("log uuid pool_strdup failed"); return 0; } + if (!(flags & DM_CORELOG)) { + if (!(log_node = dm_tree_find_node_by_uuid(node->dtree, log_uuid))) { + log_error("Couldn't find mirror log uuid %s.", log_uuid); + return 0; + } + + if (!_link_tree_nodes(node, log_node)) + return_0; + } } seg->log = log_node; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.05/lib/libdm-file.c new/device-mapper.1.02.07/lib/libdm-file.c --- old/device-mapper.1.02.05/lib/libdm-file.c 2006-01-31 15:50:37.000000000 +0100 +++ new/device-mapper.1.02.07/lib/libdm-file.c 2006-05-10 18:23:41.000000000 +0200 @@ -23,7 +23,7 @@ static int _create_dir_recursive(const char *dir) { char *orig, *s; - int rc; + int rc, r = 0; log_verbose("Creating directory \"%s\"", dir); /* Create parent directories */ @@ -35,22 +35,24 @@ if (rc < 0 && errno != EEXIST) { log_error("%s: mkdir failed: %s", orig, strerror(errno)); - dm_free(orig); - return 0; + goto out; } } *s++ = '/'; } - dm_free(orig); /* Create final directory */ rc = mkdir(dir, 0777); if (rc < 0 && errno != EEXIST) { log_error("%s: mkdir failed: %s", orig, strerror(errno)); - return 0; + goto out; } - return 1; + + r = 1; +out: + dm_free(orig); + return r; } int create_dir(const char *dir) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.05/make.tmpl.in new/device-mapper.1.02.07/make.tmpl.in --- old/device-mapper.1.02.05/make.tmpl.in 2006-04-19 17:23:10.000000000 +0200 +++ new/device-mapper.1.02.07/make.tmpl.in 2006-05-10 21:38:25.000000000 +0200 @@ -24,7 +24,7 @@ MSGFMT = @MSGFMT@ LN_S = @LN_S@ LIBS = @LIBS@ -DEFS += @DEFS@ @LVM_DEFS@ +DEFS += @DEFS@ CFLAGS += @CFLAGS@ CLDFLAGS += @CLDFLAGS@ LDDEPS += @LDDEPS@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit simias-bonjour
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package simias-bonjour checked in at Tue May 23 01:35:14 CEST 2006. -------- --- arch/i386/simias-bonjour/simias-bonjour.changes 2006-05-08 17:24:08.000000000 +0200 +++ simias-bonjour/simias-bonjour.changes 2006-05-22 18:23:02.000000000 +0200 @@ -1,0 +2,11 @@ +Mon May 22 18:22:50 CEST 2006 - ro(a)suse.de + +- remove false self-obsolete + +------------------------------------------------------------------- +Mon May 22 16:42:49 CEST 2006 - jhargadon(a)novell.com + +- modified the specfile so that the version variable is assigned a + value before it is referenced. + +------------------------------------------------------------------- Old: ---- simias-bonjour-1.4.6128.1.tar.gz New: ---- simias-bonjour-1.4.6142.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ simias-bonjour.spec ++++++ --- /var/tmp/diff_new_pack.aAeja3/_old 2006-05-23 01:34:49.000000000 +0200 +++ /var/tmp/diff_new_pack.aAeja3/_new 2006-05-23 01:34:49.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package simias-bonjour (Version 1.4.6128.1) +# spec file for package simias-bonjour (Version 1.4.6142.1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,7 +12,7 @@ Name: simias-bonjour BuildRequires: glib2 glib2-devel gnutls-devel log4net mDNSResponder-devel mono-core mono-data mono-devel mono-web pkgconfig simias -%define buildnum 6128 +%define buildnum 6142 URL: http://www.ifolder.com %define prefix /opt/novell/ifolder3 %define sysconfdir /etc @@ -24,9 +24,8 @@ Requires: mono-core >= 1.1.13 Requires: mono-data >= 1.1.13 Requires: mono-web >= 1.1.13 -Obsoletes : %{name} <= %{version} -Version: 1.4.6128.1 -Release: 2 +Version: 1.4.6142.1 +Release: 1 Summary: Peer-to-Peer addition to Simias Source: simias-bonjour-1.4.%{buildnum}.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -66,6 +65,11 @@ %{prefix}/web/modules/* %changelog -n simias-bonjour +* Mon May 22 2006 - ro(a)suse.de +- remove false self-obsolete +* Mon May 22 2006 - jhargadon(a)novell.com +- modified the specfile so that the version variable is assigned a + value before it is referenced. * Mon May 08 2006 - jhargadon(a)novell.com - resubmitting package to keep in sync with iFolder3 package. * Thu Apr 20 2006 - jhargadon(a)novell.com ++++++ simias-bonjour-1.4.6128.1.tar.gz -> simias-bonjour-1.4.6142.1.tar.gz ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit simias
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package simias checked in at Tue May 23 01:35:12 CEST 2006. -------- --- simias/simias.changes 2006-05-18 16:18:26.000000000 +0200 +++ simias/simias.changes 2006-05-22 16:41:20.000000000 +0200 @@ -1,0 +2,21 @@ +Mon May 22 16:35:54 CEST 2006 - jhargadon(a)novell.com + +- Created a UserName property in MyEnvironment that guarantees the + username to be a single component. Changed three locations in + Simias that called Environment.UserName to use MyEnvironment.UserName +- fixed a bug where the username retrieved from CASA was case + sensitive compared with the simias username. The simias username + originated from eDirectory upcased the first letter of the username. +- updated DomainAgent to correctly handle when certificates are not + valid +- Build a hard-coded Uri if WS-Inspection fails while setting the + host address (fix for 165068) +- Fixed StoreBrowser so it won't throw exceptions at start up. +- fixed Bug 152856 and 166366 The files were getting deleted on + windows because the src and dst names matched. This only occurred +- fixed a case where two directories with the same name are created + on different machines within a sync cycle. This was creating two + nodes for the directory. The first directory to the server will + now win. + +------------------------------------------------------------------- Old: ---- simias-1.4.6128.1.tar.gz New: ---- simias-1.4.6142.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ simias.spec ++++++ --- /var/tmp/diff_new_pack.65YFHO/_old 2006-05-23 01:34:43.000000000 +0200 +++ /var/tmp/diff_new_pack.65YFHO/_new 2006-05-23 01:34:43.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package simias (Version 1.4.6128.1) +# spec file for package simias (Version 1.4.6142.1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,7 +12,7 @@ Name: simias BuildRequires: compat-libstdc++ e2fsprogs e2fsprogs-devel gcc-c++ glib2 glib2-devel libflaim libflaim-devel libstdc++ libstdc++-devel libxml2 libxml2-devel log4net mono-core mono-data mono-devel mono-web pkgconfig -%define buildnum 6128 +%define buildnum 6142 URL: http://www.ifolder.com %define prefix /opt/novell/ifolder3 %define sysconfdir /etc @@ -23,9 +23,9 @@ Requires: mono-data >= 1.1.13 Requires: mono-web >= 1.1.13 Requires: log4net +Version: 1.4.6142.1 +Release: 1 Obsoletes: %{name} < %{version} -Version: 1.4.6128.1 -Release: 4 Summary: Collection-Oriented Data Storage Source: simias-1.4.%{buildnum}.1.tar.gz Patch: simias-libflaim.patch @@ -145,6 +145,24 @@ #%config(noreplace) %{prefix}/web/web.config %changelog -n simias +* Mon May 22 2006 - jhargadon(a)novell.com +- Created a UserName property in MyEnvironment that guarantees the + username to be a single component. Changed three locations in + Simias that called Environment.UserName to use MyEnvironment.UserName +- fixed a bug where the username retrieved from CASA was case + sensitive compared with the simias username. The simias username + originated from eDirectory upcased the first letter of the username. +- updated DomainAgent to correctly handle when certificates are not + valid +- Build a hard-coded Uri if WS-Inspection fails while setting the + host address (fix for 165068) +- Fixed StoreBrowser so it won't throw exceptions at start up. +- fixed Bug 152856 and 166366 The files were getting deleted on + windows because the src and dst names matched. This only occurred +- fixed a case where two directories with the same name are created + on different machines within a sync cycle. This was creating two + nodes for the directory. The first directory to the server will + now win. * Thu May 18 2006 - meissner(a)suse.de - build helper binaries soapcpp2 and wsdl2h from source to allow all platforms. Fixed the function return warnings. ++++++ simias-1.4.6128.1.tar.gz -> simias-1.4.6142.1.tar.gz ++++++ simias/simias-1.4.6128.1.tar.gz simias/simias-1.4.6142.1.tar.gz differ: char 5, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit scim-chewing
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package scim-chewing checked in at Tue May 23 01:34:41 CEST 2006. -------- --- scim-chewing/scim-chewing.changes 2006-02-28 11:50:06.000000000 +0100 +++ scim-chewing/scim-chewing.changes 2006-05-22 17:35:31.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 22 17:35:24 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-chewing.spec ++++++ --- /var/tmp/diff_new_pack.60ns8k/_old 2006-05-23 01:33:02.000000000 +0200 +++ /var/tmp/diff_new_pack.60ns8k/_new 2006-05-23 01:33:02.000000000 +0200 @@ -13,7 +13,7 @@ Name: scim-chewing BuildRequires: gcc-c++ gtk2-devel libchewing-devel scim-devel update-desktop-files Version: 0.2.1 -Release: 6 +Release: 16 License: GPL Group: System/I18n/Chinese Autoreqprov: on @@ -51,8 +51,7 @@ make %install -[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; -make DESTDIR=${RPM_BUILD_ROOT} install-strip +make DESTDIR=${RPM_BUILD_ROOT} install rm -f $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/*.la %find_lang scim-chewing @@ -70,6 +69,8 @@ %{_datadir}/scim/icons/scim-chewing.png %changelog -n scim-chewing +* Mon May 22 2006 - schwab(a)suse.de +- Don't strip binaries. * Tue Feb 28 2006 - mfabian(a)suse.de - Bugzilla #153791: use ';' in Provides locale(...). * Thu Feb 23 2006 - mfabian(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit setserial
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package setserial checked in at Tue May 23 01:34:38 CEST 2006. -------- --- setserial/setserial.changes 2006-01-25 21:41:34.000000000 +0100 +++ setserial/setserial.changes 2006-05-22 18:08:59.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 22 18:08:52 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ setserial.spec ++++++ --- /var/tmp/diff_new_pack.BeW7oq/_old 2006-05-23 01:33:02.000000000 +0200 +++ /var/tmp/diff_new_pack.BeW7oq/_new 2006-05-23 01:33:02.000000000 +0200 @@ -1,18 +1,18 @@ # # spec file for package setserial (Version 2.17) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 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. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: setserial Version: 2.17 -Release: 581 +Release: 593 Provides: util:/sbin/setserial PreReq: %insserv_prereq Requires: /sbin/isserial @@ -46,6 +46,7 @@ %patch2 %build +%suse_update_config CFLAGS="$RPM_OPT_FLAGS -Wall" \ ./configure \ --prefix=%{_prefix} \ @@ -55,12 +56,11 @@ make %install -rm -rf "$RPM_BUILD_ROOT" mkdir -p ${RPM_BUILD_ROOT}/bin mkdir -p ${RPM_BUILD_ROOT}/etc/init.d mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8 mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} -make install DESTDIR="$RPM_BUILD_ROOT" +make install DESTDIR="$RPM_BUILD_ROOT" STRIP=: install %SOURCE1 ${RPM_BUILD_ROOT}/etc/init.d/setserial ln -sf /etc/init.d/setserial ${RPM_BUILD_ROOT}%{_sbindir}/rcsetserial @@ -92,6 +92,8 @@ %{_sbindir}/* %changelog -n setserial +* Mon May 22 2006 - schwab(a)suse.de +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Thu Sep 08 2005 - mjancar(a)suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit samba
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package samba checked in at Tue May 23 01:32:55 CEST 2006. -------- --- samba/samba.changes 2006-05-21 14:21:16.000000000 +0200 +++ samba/samba.changes 2006-05-22 23:54:26.000000000 +0200 @@ -2,6 +2 @@ -Sun May 21 14:13:44 CEST 2006 - lmuelle(a)suse.de - -- Set the groups membership first whilst we're still root; [#177114]. - -------------------------------------------------------------------- -Fri May 19 20:23:46 CEST 2006 - lmuelle(a)suse.de +Mon May 22 20:14:38 CEST 2006 - lmuelle(a)suse.de @@ -8,0 +4,5 @@ +- Optimize lookup of user's group memberships via ExtendedDn LDAP control; + [#168100]. +- Restart winbind if the hostname is modified by the DHCP client; [#169260]. +- Set the groups membership first whilst we're still root and use execve() + instead of execv() in get_printing_ticket; [#177114]. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba-doc.spec ++++++ --- /var/tmp/diff_new_pack.CCQsqz/_old 2006-05-23 01:23:49.000000000 +0200 +++ /var/tmp/diff_new_pack.CCQsqz/_new 2006-05-23 01:23:49.000000000 +0200 @@ -16,7 +16,7 @@ License: GPL URL: http://www.samba.org/ Version: 3.0.22 -Release: 22 +Release: 24 Summary: Samba Documentation Group: Documentation/Other Autoreqprov: on ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.CCQsqz/_old 2006-05-23 01:23:49.000000000 +0200 +++ /var/tmp/diff_new_pack.CCQsqz/_new 2006-05-23 01:23:49.000000000 +0200 @@ -20,7 +20,7 @@ URL: http://www.samba.org/ Autoreqprov: on Version: 3.0.22 -Release: 14 +Release: 15 Provides: sambaxp = %{version}-%{release} samba3 = %{version}-%{release} Obsoletes: samba-classic samba-ldap sambaxp samba3 < %{version} Requires: samba-client >= %{version} @@ -165,7 +165,7 @@ Group: Productivity/Networking/Samba Autoreqprov: on Version: 1.34a -Release: 19 +Release: 20 Requires: perl-ldap %endif %if %{suse_version} > 920 @@ -180,7 +180,7 @@ Group: Productivity/Networking/Samba Autoreqprov: on Version: 0.3.6b -Release: 43 +Release: 44 Provides: samba3-vscan = 0.3.6b Obsoletes: samba3-vscan Requires: samba = %{samba_ver} @@ -1229,9 +1229,12 @@ %endif %changelog -n samba -* Sun May 21 2006 - lmuelle(a)suse.de -- Set the groups membership first whilst we're still root; [#177114]. -* Fri May 19 2006 - lmuelle(a)suse.de +* Mon May 22 2006 - lmuelle(a)suse.de +- Optimize lookup of user's group memberships via ExtendedDn LDAP control; + [#168100]. +- Restart winbind if the hostname is modified by the DHCP client; [#169260]. +- Set the groups membership first whilst we're still root and use execve() + instead of execv() in get_printing_ticket; [#177114]. - Add samba-krb-printing sub package with get_printing_ticket wrapper binary; [#149698]. * Tue May 16 2006 - gd(a)suse.de ++++++ patches.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/samba.org/15306 new/patches/samba.org/15306 --- old/patches/samba.org/15306 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/15306 2006-05-22 17:31:03.000000000 +0200 @@ -0,0 +1,135 @@ +------------------------------------------------------------------------ +r15306 | gd | 2006-04-28 16:48:22 +0200 (Fr, 28 Apr 2006) | 5 lines + +Be consistent between rpc and ads winbind backend: let the ads backend +query the samlogon cache first as well. + +Guenther + +------------------------------------------------------------------------ +Index: source/nsswitch/winbindd_ads.c +=================================================================== +--- source/nsswitch/winbindd_ads.c.orig ++++ source/nsswitch/winbindd_ads.c +@@ -624,6 +624,12 @@ static NTSTATUS lookup_usergroups(struct + DEBUG(3,("ads: lookup_usergroups\n")); + *p_num_groups = 0; + ++ status = lookup_usergroups_cached(domain, mem_ctx, sid, ++ p_num_groups, user_sids); ++ if (NT_STATUS_IS_OK(status)) { ++ return NT_STATUS_OK; ++ } ++ + ads = ads_cached_connection(domain); + + if (!ads) { +@@ -669,10 +675,12 @@ static NTSTATUS lookup_usergroups(struct + + /* there must always be at least one group in the token, + unless we are talking to a buggy Win2k server */ ++ + if (count == 0) { ++ + status = lookup_usergroups_alt(domain, mem_ctx, user_dn, +- &primary_group, +- &num_groups, user_sids); ++ &primary_group, ++ &num_groups, user_sids); + *p_num_groups = (uint32)num_groups; + return status; + } +Index: source/nsswitch/winbindd_util.c +=================================================================== +--- source/nsswitch/winbindd_util.c.orig ++++ source/nsswitch/winbindd_util.c +@@ -1211,3 +1211,49 @@ BOOL winbindd_upgrade_idmap(void) + + return idmap_convert(idmap_name); + } ++NTSTATUS lookup_usergroups_cached(struct winbindd_domain *domain, ++ TALLOC_CTX *mem_ctx, ++ const DOM_SID *user_sid, ++ uint32 *p_num_groups, DOM_SID **user_sids) ++{ ++ NET_USER_INFO_3 *info3 = NULL; ++ NTSTATUS status = NT_STATUS_NO_MEMORY; ++ int i; ++ size_t num_groups = 0; ++ DOM_SID group_sid, primary_group; ++ ++ DEBUG(3,(": lookup_usergroups_cached\n")); ++ ++ *user_sids = NULL; ++ num_groups = 0; ++ ++ info3 = netsamlogon_cache_get(mem_ctx, user_sid); ++ ++ if (info3 == NULL) { ++ return NT_STATUS_OBJECT_NAME_NOT_FOUND; ++ } ++ ++ if (info3->num_groups == 0) { ++ SAFE_FREE(info3); ++ return NT_STATUS_UNSUCCESSFUL; ++ } ++ ++ /* always add the primary group to the sid array */ ++ sid_compose(&primary_group, &info3->dom_sid.sid, info3->user_rid); ++ ++ add_sid_to_array(mem_ctx, &primary_group, user_sids, &num_groups); ++ ++ for (i=0; i<info3->num_groups; i++) { ++ sid_copy(&group_sid, &info3->dom_sid.sid); ++ sid_append_rid(&group_sid, info3->gids[i].g_rid); ++ ++ add_sid_to_array(mem_ctx, &group_sid, user_sids, ++ &num_groups); ++ } ++ ++ SAFE_FREE(info3); ++ *p_num_groups = num_groups; ++ status = (user_sids != NULL) ? NT_STATUS_OK : NT_STATUS_NO_MEMORY; ++ ++ return status; ++} +Index: source/nsswitch/winbindd_rpc.c +=================================================================== +--- source/nsswitch/winbindd_rpc.c.orig ++++ source/nsswitch/winbindd_rpc.c +@@ -412,7 +412,6 @@ static NTSTATUS lookup_usergroups(struct + unsigned int i; + fstring sid_string; + uint32 user_rid; +- NET_USER_INFO_3 *user; + struct rpc_pipe_client *cli; + + DEBUG(3,("rpc: lookup_usergroups sid=%s\n", +@@ -425,23 +424,10 @@ static NTSTATUS lookup_usergroups(struct + *user_grpsids = NULL; + + /* so lets see if we have a cached user_info_3 */ +- +- if ( (user = netsamlogon_cache_get( mem_ctx, user_sid )) != NULL ) +- { +- DEBUG(5,("query_user: Cache lookup succeeded for %s\n", +- sid_string_static(user_sid))); +- +- *num_groups = user->num_groups; +- +- (*user_grpsids) = TALLOC_ARRAY(mem_ctx, DOM_SID, *num_groups); +- for (i=0;i<(*num_groups);i++) { +- sid_copy(&((*user_grpsids)[i]), &domain->sid); +- sid_append_rid(&((*user_grpsids)[i]), +- user->gids[i].g_rid); +- } +- +- SAFE_FREE(user); +- ++ result = lookup_usergroups_cached(domain, mem_ctx, user_sid, ++ num_groups, user_grpsids); ++ ++ if (NT_STATUS_IS_OK(result)) { + return NT_STATUS_OK; + } + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/samba.org/15492 new/patches/samba.org/15492 --- old/patches/samba.org/15492 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/15492 2006-05-22 17:24:32.000000000 +0200 @@ -0,0 +1,61 @@ +------------------------------------------------------------------------ +r15492 | abartlet | 2006-05-07 17:05:32 +0200 (So, 07 Mai 2006) | 10 lines + +Without this patch, the LDAP client libs will call abort() in +ldap_get_values_len, because they were handed a NULL msgs pointer, for +example in ads_pull_sid(). + +This occurs when the AD server fails at the connect stage. (The +toubled AD server is actually Samba4 in my example). + +Andrew Bartlett + + +------------------------------------------------------------------------ +Index: source/libads/ldap_utils.c +=================================================================== +--- source/libads/ldap_utils.c (Revision 15491) ++++ source/libads/ldap_utils.c (Revision 15492) +@@ -48,16 +48,17 @@ + return ADS_ERROR_NT(NT_STATUS_NO_MEMORY); + } + +- while (count--) { +- *res = NULL; +- status = ads_do_search_all(ads, bp, scope, expr, attrs, res); +- if (ADS_ERR_OK(status)) { +- DEBUG(5,("Search for %s gave %d replies\n", +- expr, ads_count_replies(ads, *res))); +- SAFE_FREE(bp); +- return status; +- } ++ *res = NULL; ++ status = ads_do_search_all(ads, bp, scope, expr, attrs, res); ++ if (ADS_ERR_OK(status)) { ++ DEBUG(5,("Search for %s gave %d replies\n", ++ expr, ads_count_replies(ads, *res))); ++ SAFE_FREE(bp); ++ return status; ++ } + ++ while (--count) { ++ + if (*res) + ads_msgfree(ads, *res); + *res = NULL; +@@ -79,6 +80,15 @@ + SAFE_FREE(bp); + return status; + } ++ ++ *res = NULL; ++ status = ads_do_search_all(ads, bp, scope, expr, attrs, res); ++ if (ADS_ERR_OK(status)) { ++ DEBUG(5,("Search for %s gave %d replies\n", ++ expr, ads_count_replies(ads, *res))); ++ SAFE_FREE(bp); ++ return status; ++ } + } + SAFE_FREE(bp); + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/samba.org/15698 new/patches/samba.org/15698 --- old/patches/samba.org/15698 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/15698 2006-05-22 17:48:50.000000000 +0200 @@ -0,0 +1,639 @@ +------------------------------------------------------------------------ +r15698 | gd | 2006-05-18 21:34:25 +0200 (Do, 18 Mai 2006) | 24 lines + +An attempt to make the winbind lookup_usergroups() call in security=ads +more scalable: + +The most efficient way is to use the "tokenGroups" attribute which gives +the nested group membership. As this attribute can not always be +retrieved when binding with the machine account (the only garanteed way +to get the tokenGroups I could find is when the machine account is a +member of the "Pre Win2k Access" builtin group). + +Our current fallback when "tokenGroups" failed is looking for all groups +where the userdn was in the "member" attribute. This behaves not very +well in very large AD domains. + +The patch first tries the "memberOf" attribute on the user's dn in that +case and directly retrieves the group's sids by using the LDAP Extended +DN control from the user's object. + +The way to pass down the control to the ldap search call is rather +painfull and probably will be rearranged later on. + +Successfully tested on win2k sp0, win2k sp4, wink3 sp1 and win2k3 r2. + +Guenther + +------------------------------------------------------------------------ +Index: source/nsswitch/winbindd_ads.c +=================================================================== +--- source/nsswitch/winbindd_ads.c.orig ++++ source/nsswitch/winbindd_ads.c +@@ -516,11 +516,11 @@ done: + + /* Lookup groups a user is a member of - alternate method, for when + tokenGroups are not available. */ +-static NTSTATUS lookup_usergroups_alt(struct winbindd_domain *domain, +- TALLOC_CTX *mem_ctx, +- const char *user_dn, +- DOM_SID *primary_group, +- size_t *p_num_groups, DOM_SID **user_sids) ++static NTSTATUS lookup_usergroups_member(struct winbindd_domain *domain, ++ TALLOC_CTX *mem_ctx, ++ const char *user_dn, ++ DOM_SID *primary_group, ++ size_t *p_num_groups, DOM_SID **user_sids) + { + ADS_STATUS rc; + NTSTATUS status = NT_STATUS_UNSUCCESSFUL; +@@ -533,7 +533,7 @@ static NTSTATUS lookup_usergroups_alt(st + char *escaped_dn; + size_t num_groups = 0; + +- DEBUG(3,("ads: lookup_usergroups_alt\n")); ++ DEBUG(3,("ads: lookup_usergroups_member\n")); + + ads = ads_cached_connection(domain); + +@@ -547,9 +547,6 @@ static NTSTATUS lookup_usergroups_alt(st + goto done; + } + +- /* buggy server, no tokenGroups. Instead lookup what groups this user +- is a member of by DN search on member*/ +- + if (!(ldap_exp = talloc_asprintf(mem_ctx, "(&(member=%s)(objectCategory=group))", escaped_dn))) { + DEBUG(1,("lookup_usergroups(dn=%s) asprintf failed!\n", user_dn)); + SAFE_FREE(escaped_dn); +@@ -593,7 +590,7 @@ static NTSTATUS lookup_usergroups_alt(st + *p_num_groups = num_groups; + status = (user_sids != NULL) ? NT_STATUS_OK : NT_STATUS_NO_MEMORY; + +- DEBUG(3,("ads lookup_usergroups (alt) for dn=%s\n", user_dn)); ++ DEBUG(3,("ads lookup_usergroups (member) succeeded for dn=%s\n", user_dn)); + done: + if (res) + ads_msgfree(ads, res); +@@ -601,6 +598,89 @@ done: + return status; + } + ++/* Lookup groups a user is a member of - alternate method, for when ++ tokenGroups are not available. */ ++static NTSTATUS lookup_usergroups_memberof(struct winbindd_domain *domain, ++ TALLOC_CTX *mem_ctx, ++ const char *user_dn, ++ DOM_SID *primary_group, ++ size_t *p_num_groups, DOM_SID **user_sids) ++{ ++ ADS_STATUS rc; ++ NTSTATUS status = NT_STATUS_UNSUCCESSFUL; ++ int count; ++ void *res = NULL; ++ ADS_STRUCT *ads; ++ const char *attrs[] = {"memberOf", NULL}; ++ size_t num_groups = 0; ++ DOM_SID *group_sids = NULL; ++ int i; ++ ++ DEBUG(3,("ads: lookup_usergroups_memberof\n")); ++ ++ ads = ads_cached_connection(domain); ++ ++ if (!ads) { ++ domain->last_status = NT_STATUS_SERVER_DISABLED; ++ goto done; ++ } ++ ++ rc = ads_search_retry_extended_dn(ads, &res, user_dn, attrs, ++ ADS_EXTENDED_DN_HEX_STRING); ++ ++ if (!ADS_ERR_OK(rc) || !res) { ++ DEBUG(1,("lookup_usergroups_memberof ads_search member=%s: %s\n", ++ user_dn, ads_errstr(rc))); ++ return ads_ntstatus(rc); ++ } ++ ++ count = ads_count_replies(ads, res); ++ ++ if (count == 0) { ++ status = NT_STATUS_NO_SUCH_USER; ++ goto done; ++ } ++ ++ *user_sids = NULL; ++ num_groups = 0; ++ ++ /* always add the primary group to the sid array */ ++ add_sid_to_array(mem_ctx, primary_group, user_sids, &num_groups); ++ ++ count = ads_pull_sids_from_extendeddn(ads, mem_ctx, res, "memberOf", ++ ADS_EXTENDED_DN_HEX_STRING, ++ &group_sids); ++ if (count == 0) { ++ DEBUG(1,("No memberOf for this user?!?\n")); ++ status = NT_STATUS_NO_MEMORY; ++ goto done; ++ } ++ ++ for (i=0; i<count; i++) { ++ ++ /* ignore Builtin groups from ADS - Guenther */ ++ if (sid_check_is_in_builtin(&group_sids[i])) { ++ continue; ++ } ++ ++ add_sid_to_array(mem_ctx, &group_sids[i], user_sids, ++ &num_groups); ++ ++ } ++ ++ *p_num_groups = num_groups; ++ status = (user_sids != NULL) ? NT_STATUS_OK : NT_STATUS_NO_MEMORY; ++ ++ DEBUG(3,("ads lookup_usergroups (memberof) succeeded for dn=%s\n", user_dn)); ++done: ++ TALLOC_FREE(group_sids); ++ if (res) ++ ads_msgfree(ads, res); ++ ++ return status; ++} ++ ++ + /* Lookup groups a user is a member of. */ + static NTSTATUS lookup_usergroups(struct winbindd_domain *domain, + TALLOC_CTX *mem_ctx, +@@ -676,13 +756,29 @@ static NTSTATUS lookup_usergroups(struct + /* there must always be at least one group in the token, + unless we are talking to a buggy Win2k server */ + ++ /* actually this only happens when the machine account has no read ++ * permissions on the tokenGroup attribute - gd */ ++ + if (count == 0) { + +- status = lookup_usergroups_alt(domain, mem_ctx, user_dn, +- &primary_group, +- &num_groups, user_sids); +- *p_num_groups = (uint32)num_groups; +- return status; ++ /* no tokenGroups */ ++ ++ /* lookup what groups this user is a member of by DN search on ++ * "memberOf" */ ++ ++ status = lookup_usergroups_memberof(domain, mem_ctx, user_dn, ++ &primary_group, ++ p_num_groups, user_sids); ++ if (NT_STATUS_IS_OK(status)) { ++ return status; ++ } ++ ++ /* lookup what groups this user is a member of by DN search on ++ * "member" */ ++ ++ return lookup_usergroups_member(domain, mem_ctx, user_dn, ++ &primary_group, ++ p_num_groups, user_sids); + } + + *user_sids = NULL; +@@ -704,7 +800,7 @@ static NTSTATUS lookup_usergroups(struct + *p_num_groups = (uint32)num_groups; + status = (user_sids != NULL) ? NT_STATUS_OK : NT_STATUS_NO_MEMORY; + +- DEBUG(3,("ads lookup_usergroups for sid=%s\n", ++ DEBUG(3,("ads lookup_usergroups (tokenGroups) succeeded for sid=%s\n", + sid_to_string(sid_string, sid))); + done: + return status; +Index: source/nsswitch/winbindd_util.c +=================================================================== +--- source/nsswitch/winbindd_util.c.orig ++++ source/nsswitch/winbindd_util.c +@@ -1226,6 +1226,7 @@ NTSTATUS lookup_usergroups_cached(struct + + *user_sids = NULL; + num_groups = 0; ++ *p_num_groups = 0; + + info3 = netsamlogon_cache_get(mem_ctx, user_sid); + +@@ -1254,6 +1255,8 @@ NTSTATUS lookup_usergroups_cached(struct + SAFE_FREE(info3); + *p_num_groups = num_groups; + status = (user_sids != NULL) ? NT_STATUS_OK : NT_STATUS_NO_MEMORY; +- ++ ++ DEBUG(3,(": lookup_usergroups_cached succeeded\n")); ++ + return status; + } +Index: source/include/ads.h +=================================================================== +--- source/include/ads.h.orig ++++ source/include/ads.h +@@ -92,6 +92,7 @@ typedef void **ADS_MODLIST; + #define ADS_NO_REFERRALS_OID "1.2.840.113556.1.4.1339" + #define ADS_SERVER_SORT_OID "1.2.840.113556.1.4.473" + #define ADS_PERMIT_MODIFY_OID "1.2.840.113556.1.4.1413" ++#define ADS_EXTENDED_DN_OID "1.2.840.113556.1.4.529" + + /* ldap attribute oids (Services for Unix) */ + #define ADS_ATTR_SFU_UIDNUMBER_OID "1.2.840.113556.1.6.18.1.310" +@@ -264,3 +265,17 @@ typedef void **ADS_MODLIST; + + #define WELL_KNOWN_GUID_COMPUTERS "AA312825768811D1ADED00C04FD8D5CD" + #define WELL_KNOWN_GUID_USERS "A9D1CA15768811D1ADED00C04FD8D5CD" ++ ++enum ads_extended_dn_flags { ++ ADS_EXTENDED_DN_HEX_STRING = 0, ++ ADS_EXTENDED_DN_STRING = 1 /* not supported on win2k */ ++}; ++ ++/* this is probably not very well suited to pass other controls generically but ++ * is good enough for the extended dn control where it is only used for atm */ ++ ++typedef struct { ++ const char *control; ++ int val; ++ int critical; ++} ads_control; +Index: source/libads/ldap_utils.c +=================================================================== +--- source/libads/ldap_utils.c.orig ++++ source/libads/ldap_utils.c +@@ -27,9 +27,9 @@ + a wrapper around ldap_search_s that retries depending on the error code + this is supposed to catch dropped connections and auto-reconnect + */ +-ADS_STATUS ads_do_search_retry(ADS_STRUCT *ads, const char *bind_path, int scope, +- const char *expr, +- const char **attrs, void **res) ++static ADS_STATUS ads_do_search_retry_internal(ADS_STRUCT *ads, const char *bind_path, int scope, ++ const char *expr, ++ const char **attrs, void *args, void **res) + { + ADS_STATUS status = ADS_SUCCESS; + int count = 3; +@@ -49,7 +49,7 @@ ADS_STATUS ads_do_search_retry(ADS_STRUC + } + + *res = NULL; +- status = ads_do_search_all(ads, bp, scope, expr, attrs, res); ++ status = ads_do_search_all_args(ads, bp, scope, expr, attrs, args, res); + if (ADS_ERR_OK(status)) { + DEBUG(5,("Search for %s gave %d replies\n", + expr, ads_count_replies(ads, *res))); +@@ -82,7 +82,7 @@ ADS_STATUS ads_do_search_retry(ADS_STRUC + } + + *res = NULL; +- status = ads_do_search_all(ads, bp, scope, expr, attrs, res); ++ status = ads_do_search_all_args(ads, bp, scope, expr, attrs, args, res); + if (ADS_ERR_OK(status)) { + DEBUG(5,("Search for %s gave %d replies\n", + expr, ads_count_replies(ads, *res))); +@@ -99,6 +99,20 @@ ADS_STATUS ads_do_search_retry(ADS_STRUC + return status; + } + ++ADS_STATUS ads_do_search_retry(ADS_STRUCT *ads, const char *bind_path, int scope, ++ const char *expr, ++ const char **attrs, void **res) ++{ ++ return ads_do_search_retry_internal(ads, bind_path, scope, expr, attrs, NULL, res); ++} ++ ++ADS_STATUS ads_do_search_retry_args(ADS_STRUCT *ads, const char *bind_path, int scope, ++ const char *expr, ++ const char **attrs, void *args, void **res) ++{ ++ return ads_do_search_retry_internal(ads, bind_path, scope, expr, attrs, args, res); ++} ++ + + ADS_STATUS ads_search_retry(ADS_STRUCT *ads, void **res, + const char *expr, +@@ -115,4 +129,19 @@ ADS_STATUS ads_search_retry_dn(ADS_STRUC + return ads_do_search_retry(ads, dn, LDAP_SCOPE_BASE, + "(objectclass=*)", attrs, res); + } ++ ++ADS_STATUS ads_search_retry_extended_dn(ADS_STRUCT *ads, void **res, ++ const char *dn, ++ const char **attrs, ++ enum ads_extended_dn_flags flags) ++{ ++ ads_control args; ++ ++ args.control = ADS_EXTENDED_DN_OID; ++ args.val = flags; ++ args.critical = True; ++ ++ return ads_do_search_retry_args(ads, dn, LDAP_SCOPE_BASE, ++ "(objectclass=*)", attrs, &args, res); ++} + #endif +Index: source/libads/ldap.c +=================================================================== +--- source/libads/ldap.c.orig ++++ source/libads/ldap.c +@@ -435,21 +435,25 @@ static char **ads_pull_strvals(TALLOC_CT + * @param cookie The paged results cookie to be returned on subsequent calls + * @return status of search + **/ +-ADS_STATUS ads_do_paged_search(ADS_STRUCT *ads, const char *bind_path, +- int scope, const char *expr, +- const char **attrs, void **res, +- int *count, void **cookie) ++ADS_STATUS ads_do_paged_search_args(ADS_STRUCT *ads, const char *bind_path, ++ int scope, const char *expr, ++ const char **attrs, void *args, void **res, ++ int *count, void **cookie) + { + int rc, i, version; + char *utf8_expr, *utf8_path, **search_attrs; +- LDAPControl PagedResults, NoReferrals, *controls[3], **rcontrols; ++ LDAPControl PagedResults, NoReferrals, ExtendedDn, *controls[4], **rcontrols; + BerElement *cookie_be = NULL; + struct berval *cookie_bv= NULL; ++ BerElement *extdn_be = NULL; ++ struct berval *extdn_bv= NULL; ++ + TALLOC_CTX *ctx; ++ ads_control *external_control = (ads_control *) args; + + *res = NULL; + +- if (!(ctx = talloc_init("ads_do_paged_search"))) ++ if (!(ctx = talloc_init("ads_do_paged_search_args"))) + return ADS_ERROR(LDAP_NO_MEMORY); + + /* 0 means the conversion worked but the result was empty +@@ -499,10 +503,47 @@ ADS_STATUS ads_do_paged_search(ADS_STRUC + NoReferrals.ldctl_value.bv_len = 0; + NoReferrals.ldctl_value.bv_val = CONST_DISCARD(char *, ""); + ++ if (external_control && strequal(external_control->control, ADS_EXTENDED_DN_OID)) { ++ ++ ExtendedDn.ldctl_oid = CONST_DISCARD(char *, external_control->control); ++ ExtendedDn.ldctl_iscritical = (char) external_control->critical; ++ ++ /* win2k does not accept a ldctl_value beeing passed in */ ++ ++ if (external_control->val != 0) { ++ ++ if ((extdn_be = ber_alloc_t(LBER_USE_DER)) == NULL ) { ++ rc = LDAP_NO_MEMORY; ++ goto done; ++ } ++ ++ if ((ber_printf(extdn_be, "{i}", (ber_int_t) external_control->val)) == -1) { ++ rc = LDAP_NO_MEMORY; ++ goto done; ++ } ++ if ((ber_flatten(extdn_be, &extdn_bv)) == -1) { ++ rc = LDAP_NO_MEMORY; ++ goto done; ++ } ++ ++ ExtendedDn.ldctl_value.bv_len = extdn_bv->bv_len; ++ ExtendedDn.ldctl_value.bv_val = extdn_bv->bv_val; ++ ++ } else { ++ ExtendedDn.ldctl_value.bv_len = 0; ++ ExtendedDn.ldctl_value.bv_val = CONST_DISCARD(char *, ""); ++ } + +- controls[0] = &NoReferrals; +- controls[1] = &PagedResults; +- controls[2] = NULL; ++ controls[0] = &NoReferrals; ++ controls[1] = &PagedResults; ++ controls[2] = &ExtendedDn; ++ controls[3] = NULL; ++ ++ } else { ++ controls[0] = &NoReferrals; ++ controls[1] = &PagedResults; ++ controls[2] = NULL; ++ } + + /* we need to disable referrals as the openldap libs don't + handle them and paged results at the same time. Using them +@@ -523,7 +564,7 @@ ADS_STATUS ads_do_paged_search(ADS_STRUC + ber_bvfree(cookie_bv); + + if (rc) { +- DEBUG(3,("ads_do_paged_search: ldap_search_with_timeout(%s) -> %s\n", expr, ++ DEBUG(3,("ads_do_paged_search_args: ldap_search_with_timeout(%s) -> %s\n", expr, + ldap_err2string(rc))); + goto done; + } +@@ -555,12 +596,29 @@ ADS_STATUS ads_do_paged_search(ADS_STRUC + + done: + talloc_destroy(ctx); ++ ++ if (extdn_be) { ++ ber_free(extdn_be, 1); ++ } ++ ++ if (extdn_bv) { ++ ber_bvfree(extdn_bv); ++ } ++ + /* if/when we decide to utf8-encode attrs, take out this next line */ + str_list_free(&search_attrs); + + return ADS_ERROR(rc); + } + ++ADS_STATUS ads_do_paged_search(ADS_STRUCT *ads, const char *bind_path, ++ int scope, const char *expr, ++ const char **attrs, void **res, ++ int *count, void **cookie) ++{ ++ return ads_do_paged_search_args(ads, bind_path, scope, expr, attrs, NULL, res, count, cookie); ++} ++ + + /** + * Get all results for a search. This uses ads_do_paged_search() to return +@@ -573,16 +631,16 @@ done: + * @param res ** which will contain results - free res* with ads_msgfree() + * @return status of search + **/ +-ADS_STATUS ads_do_search_all(ADS_STRUCT *ads, const char *bind_path, +- int scope, const char *expr, +- const char **attrs, void **res) ++ADS_STATUS ads_do_search_all_args(ADS_STRUCT *ads, const char *bind_path, ++ int scope, const char *expr, ++ const char **attrs, void *args, void **res) + { + void *cookie = NULL; + int count = 0; + ADS_STATUS status; + + *res = NULL; +- status = ads_do_paged_search(ads, bind_path, scope, expr, attrs, res, ++ status = ads_do_paged_search_args(ads, bind_path, scope, expr, attrs, args, res, + &count, &cookie); + + if (!ADS_ERR_OK(status)) +@@ -594,8 +652,8 @@ ADS_STATUS ads_do_search_all(ADS_STRUCT + ADS_STATUS status2; + LDAPMessage *msg, *next; + +- status2 = ads_do_paged_search(ads, bind_path, scope, expr, +- attrs, &res2, &count, &cookie); ++ status2 = ads_do_paged_search_args(ads, bind_path, scope, expr, ++ attrs, args, &res2, &count, &cookie); + + if (!ADS_ERR_OK(status2)) break; + +@@ -616,6 +674,13 @@ ADS_STATUS ads_do_search_all(ADS_STRUCT + return status; + } + ++ADS_STATUS ads_do_search_all(ADS_STRUCT *ads, const char *bind_path, ++ int scope, const char *expr, ++ const char **attrs, void **res) ++{ ++ return ads_do_search_all_args(ads, bind_path, scope, expr, attrs, NULL, res); ++} ++ + /** + * Run a function on all results for a search. Uses ads_do_paged_search() and + * runs the function as each page is returned, using ads_process_results() +@@ -2701,4 +2766,127 @@ ADS_STATUS ads_workgroup_name(ADS_STRUCT + return ADS_SUCCESS; + } + ++/** ++ * pull a DOM_SID from an extended dn string ++ * @param mem_ctx TALLOC_CTX ++ * @param flags string type of extended_dn ++ * @param sid pointer to a DOM_SID ++ * @return boolean inidicating success ++ **/ ++BOOL ads_get_sid_from_extended_dn(TALLOC_CTX *mem_ctx, ++ const char *dn, ++ enum ads_extended_dn_flags flags, ++ DOM_SID *sid) ++{ ++ char *p, *q; ++ ++ if (!dn) { ++ return False; ++ } ++ ++ /* ++ * ADS_EXTENDED_DN_HEX_STRING: ++ * <GUID=238e1963cb390f4bb032ba0105525a29>;<SID=010500000000000515000000bb68c8fd6b61b427572eb04556040000>;CN=gd,OU=berlin,OU=suse,DC=ber,DC=suse,DC=de ++ * ++ * ADS_EXTENDED_DN_STRING (only with w2k3): ++ <GUID=63198e23-39cb-4b0f-b032-ba0105525a29>;<SID=S-1-5-21-4257769659-666132843-1169174103-1110>;CN=gd,OU=berlin,OU=suse,DC=ber,DC=suse,DC=de ++ */ ++ ++ p = strchr(dn, ';'); ++ if (!p) { ++ return False; ++ } ++ ++ if (strncmp(p, ";<SID=", strlen(";<SID=")) != 0) { ++ return False; ++ } ++ ++ p += strlen(";<SID="); ++ ++ q = strchr(p, '>'); ++ if (!q) { ++ return False; ++ } ++ ++ *q = '\0'; ++ ++ DEBUG(100,("ads_get_sid_from_extended_dn: sid string is %s\n", p)); ++ ++ switch (flags) { ++ ++ case ADS_EXTENDED_DN_STRING: ++ if (!string_to_sid(sid, p)) { ++ return False; ++ } ++ break; ++ case ADS_EXTENDED_DN_HEX_STRING: { ++ pstring buf; ++ size_t buf_len; ++ ++ buf_len = strhex_to_str(buf, strlen(p), p); ++ if (buf_len == 0) { ++ return False; ++ } ++ ++ if (!sid_parse(buf, buf_len, sid)) { ++ DEBUG(10,("failed to parse sid\n")); ++ return False; ++ } ++ break; ++ } ++ default: ++ DEBUG(10,("unknown extended dn format\n")); ++ return False; ++ } ++ ++ return True; ++} ++ ++/** ++ * pull an array of DOM_SIDs from a ADS result ++ * @param ads connection to ads server ++ * @param mem_ctx TALLOC_CTX for allocating sid array ++ * @param msg Results of search ++ * @param field Attribute to retrieve ++ * @param flags string type of extended_dn ++ * @param sids pointer to sid array to allocate ++ * @return the count of SIDs pulled ++ **/ ++int ads_pull_sids_from_extendeddn(ADS_STRUCT *ads, ++ TALLOC_CTX *mem_ctx, ++ void *msg, ++ const char *field, ++ enum ads_extended_dn_flags flags, ++ DOM_SID **sids) ++{ ++ int i; ++ size_t dn_count; ++ char **dn_strings; ++ ++ if ((dn_strings = ads_pull_strings(ads, mem_ctx, msg, field, ++ &dn_count)) == NULL) { ++ return 0; ++ } ++ ++ (*sids) = TALLOC_ZERO_ARRAY(mem_ctx, DOM_SID, dn_count + 1); ++ if (!(*sids)) { ++ TALLOC_FREE(dn_strings); ++ return 0; ++ } ++ ++ for (i=0; i<dn_count; i++) { ++ ++ if (!ads_get_sid_from_extended_dn(mem_ctx, dn_strings[i], ++ flags, &(*sids)[i])) { ++ TALLOC_FREE(*sids); ++ TALLOC_FREE(dn_strings); ++ return 0; ++ } ++ } ++ ++ TALLOC_FREE(dn_strings); ++ ++ return dn_count; ++} ++ + #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/samba.org/15822 new/patches/samba.org/15822 --- old/patches/samba.org/15822 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/15822 2006-05-22 22:44:16.000000000 +0200 @@ -0,0 +1,19 @@ +------------------------------------------------------------------------ +r15822 | lmuelle | 2006-05-22 22:35:55 +0200 (Mo, 22 Mai 2006) | 2 lines + +Add suggestion made by Ralf Haferkamp. + +------------------------------------------------------------------------ +Index: source/libads/ldap.c +=================================================================== +--- source/libads/ldap.c (Revision 15821) ++++ source/libads/ldap.c (Revision 15822) +@@ -531,7 +531,7 @@ + + } else { + ExtendedDn.ldctl_value.bv_len = 0; +- ExtendedDn.ldctl_value.bv_val = CONST_DISCARD(char *, ""); ++ ExtendedDn.ldctl_value.bv_val = NULL; + } + + controls[0] = &NoReferrals; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/series new/patches/series --- old/patches/series 2006-05-19 21:06:17.000000000 +0200 +++ new/patches/series 2006-05-22 22:44:59.000000000 +0200 @@ -39,9 +39,13 @@ samba.org/15136 -p0 samba.org/15194 -p0 samba.org/15293 -p0 +samba.org/15306 -p0 samba.org/15438 -p0 samba.org/15460 -p0 +samba.org/15492 -p0 samba.org/15542 -p0 +samba.org/15698 -p0 +samba.org/15822 -p0 # SuSE specific changes # disabled -> WIP lmuelle diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/suse/samba3-pam_winbind.diff new/patches/suse/samba3-pam_winbind.diff --- old/patches/suse/samba3-pam_winbind.diff 2006-05-16 16:53:35.000000000 +0200 +++ new/patches/suse/samba3-pam_winbind.diff 2006-05-22 17:55:27.000000000 +0200 @@ -123,14 +123,13 @@ #define ADS_SERVER_SORT_OID "1.2.840.113556.1.4.473" #define ADS_PERMIT_MODIFY_OID "1.2.840.113556.1.4.1413" +#define ADS_ASQ_OID "1.2.840.113556.1.4.1504" + #define ADS_EXTENDED_DN_OID "1.2.840.113556.1.4.529" /* ldap attribute oids (Services for Unix) */ - #define ADS_ATTR_SFU_UIDNUMBER_OID "1.2.840.113556.1.6.18.1.310" -@@ -264,3 +266,19 @@ typedef void **ADS_MODLIST; - +@@ -266,6 +268,22 @@ typedef void **ADS_MODLIST; #define WELL_KNOWN_GUID_COMPUTERS "AA312825768811D1ADED00C04FD8D5CD" #define WELL_KNOWN_GUID_USERS "A9D1CA15768811D1ADED00C04FD8D5CD" -+ + +#ifndef KRB5_ADDR_NETBIOS +#define KRB5_ADDR_NETBIOS 0x14 +#endif @@ -146,6 +145,10 @@ +#endif +} smb_krb5_addresses; +#endif ++ + enum ads_extended_dn_flags { + ADS_EXTENDED_DN_HEX_STRING = 0, + ADS_EXTENDED_DN_STRING = 1 /* not supported on win2k */ Index: source/include/doserr.h =================================================================== --- source/include/doserr.h.orig @@ -2840,7 +2843,7 @@ status = ads_connect(ads); if (!ADS_ERR_OK(status) || !ads->config.realm) { extern struct winbindd_methods msrpc_methods, cache_methods; -@@ -889,8 +891,7 @@ static NTSTATUS trusted_domains(struct w +@@ -993,8 +995,7 @@ static NTSTATUS trusted_domains(struct w struct ds_domain_trust *domains = NULL; int count = 0; int i; @@ -2850,7 +2853,7 @@ struct rpc_pipe_client *cli; DEBUG(3,("ads: trusted_domains\n")); -@@ -963,6 +964,8 @@ struct winbindd_methods ads_methods = { +@@ -1067,6 +1068,8 @@ struct winbindd_methods ads_methods = { msrpc_lookup_useraliases, lookup_groupmem, sequence_number, @@ -5639,7 +5642,7 @@ =================================================================== --- source/nsswitch/winbindd_rpc.c.orig +++ source/nsswitch/winbindd_rpc.c -@@ -883,6 +883,71 @@ static NTSTATUS trusted_domains(struct w +@@ -869,6 +869,71 @@ static NTSTATUS trusted_domains(struct w return result; } @@ -5711,7 +5714,7 @@ /* the rpc backend methods are exposed via this structure */ struct winbindd_methods msrpc_methods = { False, -@@ -896,5 +961,7 @@ struct winbindd_methods msrpc_methods = +@@ -882,5 +947,7 @@ struct winbindd_methods msrpc_methods = msrpc_lookup_useraliases, lookup_groupmem, sequence_number, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/suse/winbind-offline.diff new/patches/suse/winbind-offline.diff --- old/patches/suse/winbind-offline.diff 2006-05-02 15:05:39.000000000 +0200 +++ new/patches/suse/winbind-offline.diff 2006-05-22 17:56:01.000000000 +0200 @@ -293,7 +293,7 @@ if ( !domain->online && ( !NT_STATUS_IS_OK(check_negative_conn_cache(domain->name, domain->dcname))) ) { DEBUG(10,("centry_expired: Key %s for domain %s valid as domain is offline.\n", -@@ -1830,8 +1845,9 @@ static BOOL init_wcache(void) +@@ -1870,8 +1885,9 @@ static BOOL init_wcache(void) return True; /* when working offline we must not clear the cache on restart */ @@ -305,7 +305,7 @@ if (wcache->tdb == NULL) { DEBUG(0,("Failed to open winbindd_cache.tdb!\n")); -@@ -2078,8 +2094,9 @@ void wcache_flush_cache(void) +@@ -2113,8 +2129,9 @@ void wcache_flush_cache(void) return; /* when working offline we must not clear the cache on restart */ @@ -317,7 +317,7 @@ if (!wcache->tdb) { DEBUG(0,("Failed to open winbindd_cache.tdb!\n")); -@@ -2230,6 +2247,74 @@ done: +@@ -2265,6 +2282,74 @@ done: return status; } @@ -690,7 +690,7 @@ INSTALLCMD=@INSTALL@ INSTALLLIBCMD_SH=@INSTALLLIBCMD_SH@ -@@ -1202,7 +1203,7 @@ bin/librpc_echo.@SHLIBEXT@: $(RPC_ECHO_O +@@ -1204,7 +1205,7 @@ bin/librpc_echo.@SHLIBEXT@: $(RPC_ECHO_O bin/winbindd@EXEEXT@: $(WINBINDD_OBJ) @BUILD_POPT@ bin/.dummy @echo "Linking $@" @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(WINBINDD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \ @@ -711,7 +711,7 @@ # Set defaults PIE_CFLAGS="" -@@ -3529,6 +3530,8 @@ AC_ARG_WITH(automount, +@@ -3533,6 +3534,8 @@ AC_ARG_WITH(automount, AC_MSG_RESULT(no) ) @@ -724,9 +724,9 @@ =================================================================== --- source/nsswitch/winbindd.h.orig +++ source/nsswitch/winbindd.h -@@ -29,6 +29,10 @@ - - #include "winbindd_nss.h" +@@ -33,6 +33,10 @@ + #include <sys/mman.h> + #endif +#ifdef HAVE_LIBNSCD +#include "libnscd.h" @@ -739,9 +739,9 @@ =================================================================== --- source/nsswitch/winbindd_util.c.orig +++ source/nsswitch/winbindd_util.c -@@ -1217,3 +1217,25 @@ BOOL winbindd_upgrade_idmap(void) +@@ -1266,3 +1266,25 @@ NTSTATUS lookup_usergroups_cached(struct - return idmap_convert(idmap_name); + return status; } + +void winbindd_flush_nscd_cache(void) ++++++ vendor-files.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vendor-files/tools/get_printing_ticket.c new/vendor-files/tools/get_printing_ticket.c --- old/vendor-files/tools/get_printing_ticket.c 2006-05-21 14:11:50.000000000 +0200 +++ new/vendor-files/tools/get_printing_ticket.c 2006-05-22 22:31:02.000000000 +0200 @@ -56,12 +56,14 @@ } #endif +char *null_envp[] = { NULL }; + int main (int argc, char **argv) { uid_t uid, LP_UID; gid_t gid, LP_GID; struct passwd *pw; - + /* Get uid and gid of user lp */ pw = getpwnam( "lp"); if (!pw) { @@ -136,10 +138,15 @@ return 1; } + /* Clear the environment to ensure nothing can + be loaded via LD_PRELOAD. Thanks to Sebastian Krahmer + from the SuSE security Team for reviewing this. */ + clearenv(); + /* * We are now the requested user. * From cups arg[0] is the smb:// uri and smbspool expects this */ - return execv ("/usr/bin/smbspool", argv); + return execve ("/usr/bin/smbspool", argv, null_envp); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vendor-files/tools/samba-winbindd new/vendor-files/tools/samba-winbindd --- old/vendor-files/tools/samba-winbindd 2006-04-23 13:39:15.000000000 +0200 +++ new/vendor-files/tools/samba-winbindd 2006-05-22 20:26:00.000000000 +0200 @@ -14,7 +14,7 @@ # this program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA # -# Author: Lars Mueller <lmuelle at samba dot org> +# Author: Lars Mueller <lars at samba dot org> # samba-winbindd # @@ -59,6 +59,15 @@ log_msg=$( rcnmb start 2>&1) log_dbg "${log_msg}" fi + for configfile in dhcp "ifcfg-${configname}"; do + test -f "/etc/sysconfig/network/${configfile}" && \ + . "/etc/sysconfig/network/${configfile}" + done + DHCLIENT_SET_HOSTNAME=$( echo "${DHCLIENT_SET_HOSTNAME}" | tr '[:upper:]' '[:lower:]') + if test "${DHCLIENT_SET_HOSTNAME}" != "no" && chkconfig -c winbind; then + log_msg=$( rcwinbind restart 2>&1) + log_dbg "${log_msg}" + fi log_msg=$( smbcontrol winbindd online 2>&1) log_dbg "${log_msg}" ;; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit sax2
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package sax2 checked in at Tue May 23 01:32:52 CEST 2006. -------- --- sax2/sax2.changes 2006-05-19 08:45:33.000000000 +0200 +++ sax2/sax2.changes 2006-05-22 18:43:54.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 22 14:01:13 CEST 2006 - ms(a)suse.de + +- fixed Identity entries for DELL ATI devices (#177561) +- fixed perl syntax using defined (#177476) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sax2.spec ++++++ --- /var/tmp/diff_new_pack.LoEoZK/_old 2006-05-23 01:23:54.000000000 +0200 +++ /var/tmp/diff_new_pack.LoEoZK/_new 2006-05-23 01:23:54.000000000 +0200 @@ -10,6 +10,7 @@ Name: sax2 +URL: http://sax.berlios.de %if %{?suse_version:1}0 # SuSE Build Requires... BuildRequires: doxygen ghostscript-fonts-std graphviz hal-devel java2-devel-packages python-devel qt3-devel readline-devel swig sysfsutils update-desktop-files @@ -39,7 +40,7 @@ %endif Summary: SuSE advanced X Window System-configuration Version: 8.1 -Release: 2 +Release: 3 Group: System/X11/Utilities License: Other License(s), see package, GPL Source: sax2.tar.bz2 @@ -61,7 +62,7 @@ %package -n sax2-tools Version: 8.1 -Release: 2 +Release: 3 Summary: X Window System tools for SaX2 Group: System/X11/Utilities Requires: coreutils @@ -90,7 +91,7 @@ %package -n sax2-ident Version: 8.1 -Release: 2 +Release: 3 Summary: SaX2 identity and profile information Group: System/X11/Utilities Requires: sax2-libsax-perl @@ -109,7 +110,7 @@ %package -n sax2-gui Version: 8.1 -Release: 2 +Release: 3 %if %{?suse_version:1}0 # SuSE Requires... Requires: netpbm sax2-tools qt3 fvwm2 sax2 @@ -131,7 +132,7 @@ %package -n sax2-libsax Version: 8.1 -Release: 2 +Release: 3 %if %{?suse_version:1}0 # SuSE Requires... Requires: sax2-tools qt3 fvwm2 sax2 @@ -157,7 +158,7 @@ %package -n sax2-libsax-devel Version: 8.1 -Release: 2 +Release: 3 Requires: sax2-libsax Summary: SaX management library header files for X Window System-configuration development Group: Development/Libraries/X11 @@ -174,7 +175,7 @@ %package -n sax2-libsax-perl Version: 8.1 -Release: 2 +Release: 3 Requires: sax2-libsax Summary: Language binding to use libsax with perl Group: Development/Libraries/X11 @@ -191,7 +192,7 @@ %package -n sax2-libsax-python Version: 8.1 -Release: 2 +Release: 3 Requires: sax2-libsax %if %{?suse_version:1}0 # SuSE Requires... @@ -214,7 +215,7 @@ %ifnarch ppc64 s390x %package -n sax2-libsax-java Version: 8.1 -Release: 2 +Release: 3 Requires: sax2-libsax jre1.2.x Summary: Language binding to use libsax with java Group: Development/Libraries/X11 @@ -501,6 +502,9 @@ %endif %changelog -n sax2 +* Mon May 22 2006 - ms(a)suse.de +- fixed Identity entries for DELL ATI devices (#177561) +- fixed perl syntax using defined (#177476) * Wed May 17 2006 - ms(a)suse.de - fixed handling of "KernelModuleParm" option (#170698) * Wed May 17 2006 - ms(a)suse.de ++++++ sax2.tar.bz2 ++++++ sax2/sax2.tar.bz2 sax2/sax2.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit rug
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package rug checked in at Tue May 23 01:23:34 CEST 2006. -------- --- rug/rug.changes 2006-05-16 23:23:11.000000000 +0200 +++ rug/rug.changes 2006-05-22 23:22:01.000000000 +0200 @@ -1,0 +2,8 @@ +Mon May 22 23:21:21 CEST 2006 - maw(a)suse.de + +- New source drop (r28766) which: +- Eats "permission denied" exception if the argument isn't a + local file. +- Hames rug bl -i show the bundle's lock status. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rug.spec ++++++ --- /var/tmp/diff_new_pack.GStnSQ/_old 2006-05-23 01:23:24.000000000 +0200 +++ /var/tmp/diff_new_pack.GStnSQ/_new 2006-05-23 01:23:24.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: gtkdoc mono-basic mono-data-sqlite mono-devel zmd-devel URL: http://www.novell.com Version: 7.1.1.0 -Release: 18 +Release: 19 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Command Line Client for zmd @@ -78,6 +78,11 @@ %_mandir/*/*/*.gz %changelog -n rug +* Mon May 22 2006 - maw(a)suse.de +- New source drop (r28766) which: +- Eats "permission denied" exception if the argument isn't a + local file. +- Hames rug bl -i show the bundle's lock status. * Tue May 16 2006 - maw(a)suse.de - New source drop (r28427) which: - Handles zypp atoms correctly ++++++ rug-7.1.1.0.tar.bz2 ++++++ ++++ 7859 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit rekall
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package rekall checked in at Tue May 23 01:23:28 CEST 2006. -------- --- KDE/rekall/rekall.changes 2006-02-15 11:23:45.000000000 +0100 +++ rekall/rekall.changes 2006-05-22 16:30:04.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 22 16:29:49 CEST 2006 - dmueller(a)suse.de + +- avoid crashes due to strict aliasing errors (#175613) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rekall.spec ++++++ --- /var/tmp/diff_new_pack.AbBnr6/_old 2006-05-23 01:23:19.000000000 +0200 +++ /var/tmp/diff_new_pack.AbBnr6/_new 2006-05-23 01:23:19.000000000 +0200 @@ -17,7 +17,7 @@ Group: Productivity/Databases/Clients Summary: Universal Database Application Version: 2.2.6 -Release: 6 +Release: 17 %define rversion %version Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) Requires: %name-database-backend = %version @@ -133,6 +133,7 @@ %build . /etc/opt/kde3/common_options +export CPPFLAGS="$CPPFLAGS -fno-strict-aliasing" ./configure $configkde \ --disable-final \ --with-mysql-libraries=%_libdir/mysql \ @@ -270,6 +271,8 @@ /opt/kde3/share/apps/rekall/examples %changelog -n rekall +* Mon May 22 2006 - dmueller(a)suse.de +- avoid crashes due to strict aliasing errors (#175613) * Wed Feb 15 2006 - stbinner(a)suse.de - add GenericName to .desktop file * Wed Jan 25 2006 - mls(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit pwdutils
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package pwdutils checked in at Tue May 23 01:23:17 CEST 2006. -------- --- pwdutils/pwdutils.changes 2006-05-19 15:46:25.000000000 +0200 +++ pwdutils/pwdutils.changes 2006-05-22 09:47:40.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 22 09:47:22 CEST 2006 - kukuk(a)suse.de + +- Fix usermod -L/-U [#177144] + +------------------------------------------------------------------- New: ---- pwdutils-usermod-bnc177144.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pwdutils.spec ++++++ --- /var/tmp/diff_new_pack.MCsazG/_old 2006-05-23 01:22:41.000000000 +0200 +++ /var/tmp/diff_new_pack.MCsazG/_new 2006-05-23 01:22:41.000000000 +0200 @@ -17,7 +17,7 @@ Group: System/Base Autoreqprov: on Version: 3.0.7.1 -Release: 18 +Release: 19 Summary: Utilities to Manage User and Group Accounts PreReq: grep /bin/cp /bin/mv Requires: pam-modules @@ -42,6 +42,7 @@ Patch3: pwdutils-ldap-rfc2307bis.diff Patch4: pam_login-3.31.diff Patch5: pam_login-3.31-suppress_hostname.patch +Patch6: pwdutils-usermod-bnc177144.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -76,6 +77,8 @@ %patch5 -p1 popd %patch3 +%patch6 +chmod 755 src/tst-usermod %build CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ @@ -211,6 +214,8 @@ %{_libdir}/pwdutils/liblog_audit.so.1* %changelog -n pwdutils +* Mon May 22 2006 - kukuk(a)suse.de +- Fix usermod -L/-U [#177144] * Fri May 19 2006 - kssingvo(a)suse.de - added option -H to suppress hostname (bugzilla#175376) * Thu May 18 2006 - schwab(a)suse.de ++++++ pwdutils-usermod-bnc177144.diff ++++++ 2006-05-21 Thorsten Kukuk <kukuk(a)thkukuk.de> * src/usermod.8: Document -L and -U option. * src/usermod.c (main): Implement lock/unlock of password. * src/tst-chage: Adjust for latest chage fixes. * src/tst-usermod: New test. * src/Makefile.am: Add tst-usermod. --- src/Makefile.am 27 Dec 2005 21:09:10 -0000 1.83 +++ src/Makefile.am 21 May 2006 20:04:56 -0000 @@ -21,7 +21,7 @@ CLEANFILES = *~ tst-chage.* tst-passwd.* tst-group.* tst-groupadd.* \ tst-long-group-entry.* tst-32bit-uid-gid.* tst-userdel.* \ tst-groupmod.* tst-pwconv.* tst-pwunconv.* tst-pwck.* \ - tst-grpck.* ${EXTRA_PRGRAMS} + tst-grpck.* tst-usermod.* ${EXTRA_PRGRAMS} bin_PROGRAMS = chage chfn chsh expiry gpasswd newgrp passwd rpasswd @@ -36,7 +36,7 @@ TESTS = tst-useradd tst-chage tst-passwd tst-groupadd tst-long-group-entry \ tst-32bit-uid-gid tst-userdel tst-groupmod tst-pwconv tst-pwunconv \ - tst-pwck tst-grpck + tst-pwck tst-grpck tst-usermod EXTRA_DIST = ${MANS} ${EXTRA_MANS} ${TESTS} rpasswd-client.c --- src/Makefile.in 27 Dec 2005 21:09:10 -0000 1.132 +++ src/Makefile.in 21 May 2006 20:04:56 -0000 @@ -329,12 +329,12 @@ CLEANFILES = *~ tst-chage.* tst-passwd.* tst-group.* tst-groupadd.* \ tst-long-group-entry.* tst-32bit-uid-gid.* tst-userdel.* \ tst-groupmod.* tst-pwconv.* tst-pwunconv.* tst-pwck.* \ - tst-grpck.* ${EXTRA_PRGRAMS} + tst-grpck.* tst-usermod.* ${EXTRA_PRGRAMS} EXTRA_MANS = pam_rpasswd.8 TESTS = tst-useradd tst-chage tst-passwd tst-groupadd tst-long-group-entry \ tst-32bit-uid-gid tst-userdel tst-groupmod tst-pwconv tst-pwunconv \ - tst-pwck tst-grpck + tst-pwck tst-grpck tst-usermod EXTRA_DIST = ${MANS} ${EXTRA_MANS} ${TESTS} rpasswd-client.c man_MANS = chfn.1 chsh.1 expiry.1 passwd.1 rpasswd.conf.5 rpasswd.1 sg.1 \ --- src/tst-chage 12 Jul 2005 21:17:15 -0000 1.7 +++ src/tst-chage 21 May 2006 20:04:56 -0000 @@ -7,8 +7,11 @@ touch $TEMPDIR/passwd touch $TEMPDIR/shadow ./useradd -G "" -P $TEMPDIR chagetest1 -c "Test account" -./chage -P $TEMPDIR -m 7 -M 92 -d 2000-02-29 -E 2004-02-29 -I 7 -W 14 --service files chagetest1 > tst-chage.run 2>&1 +RET1=$? +./chage -P $TEMPDIR -m 7 -M 92 -d 2000-02-29 -E 2004-02-29 -I 7 -W 14 --service files chagetest1 > tst-chage.out 2>&1 +RET2=$? ./chage -P $TEMPDIR -l chagetest1 > tst-chage.out1 +RET3=$? cat << EOT > tst-chage.expect1 Minimum: 7 Maximum: 92 @@ -20,9 +23,12 @@ Account Expires: Feb 29, 2004 EOT diff -q -u tst-chage.expect1 tst-chage.out1 +RET4=$? + ./chage -P $TEMPDIR -m 7 -M 92 -d 2000-02-29 -E 2004-02-29 -I 0 -W 14 --service files chagetest1 > tst-chage.out 2>&1 +RET5=$? ./chage -P $TEMPDIR -l chagetest1 > tst-chage.out2 -RET1=$? +RET6=$? cat << EOT > tst-chage.expect2 Minimum: 7 Maximum: 92 @@ -30,13 +36,31 @@ Inactive: 0 Last Change: Feb 29, 2000 Password Expires: May 31, 2000 -Password Inactive: Never +Password Inactive: May 31, 2000 Account Expires: Feb 29, 2004 EOT diff -q -u tst-chage.expect2 tst-chage.out2 -RET2=$? +RET7=$? + +./chage -P $TEMPDIR -m 7 -M 92 -d 2000-02-29 -E 2004-02-29 -I -1 -W 14 --service files chagetest1 > tst-chage.out 2>&1 +RET8=$? +./chage -P $TEMPDIR -l chagetest1 > tst-chage.out3 +RET9=$? +cat << EOT > tst-chage.expect3 +Minimum: 7 +Maximum: 92 +Warning: 14 +Inactive: -1 +Last Change: Feb 29, 2000 +Password Expires: May 31, 2000 +Password Inactive: Never +Account Expires: Feb 29, 2004 +EOT +diff -q -u tst-chage.expect3 tst-chage.out3 +RET10=$? rm -rf $TEMPDIR -if [ $RET1 != 0 -o $RET2 != 0 ] ; then +if [ $RET1 != 0 -o $RET2 != 0 -o $RET3 != 0 -o $RET4 != 0 -o $RET5 != 0 -o $RET6 != 0 \ + -o $RET7 != 0 -o $RET8 != 0 -o $RET9 != 0 -o $RET10 != 0 ] ; then exit 1 else exit 0 --- src/usermod.8 15 Aug 2005 11:13:30 -0000 1.2 +++ src/usermod.8 21 May 2006 20:04:56 -0000 @@ -1,5 +1,5 @@ .\" -*- nroff -*- -.\" Copyright (C) 2003, 2005 Thorsten Kukuk +.\" Copyright (C) 2003, 2005, 2006 Thorsten Kukuk .\" Author: Thorsten Kukuk <kukuk(a)suse.de> .\" .\" This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ .\" along with this program; if not, write to the Free Software Foundation, .\" Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. .\" -.TH usermod 8 "Nobember 2003" "pwdutils" +.TH usermod 8 "May 2006" "pwdutils" .SH NAME usermod \- modify a user account .SH SYNOPSIS @@ -99,6 +99,14 @@ Use the Distinguished Name binddn to bind to the LDAP directory. The user will be prompted for a password for simple authentication. .TP +.BI "\-L, \-\-lock" +A system administrator can lock the account of the specified user. +.TP +.B "\-U, \-\-unlock" +A system administrator can unlock the specified account, if the +account is not passwordless afterwards (it will not unlock an +account that has only "!" as a password). +.TP .BI "\-P, \-\-path" " path" The \fIpasswd\fR and \fIshadow\fR files are located below the specified directory path. --- src/usermod.c 15 Aug 2005 11:13:30 -0000 1.33 +++ src/usermod.c 21 May 2006 20:04:56 -0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2003, 2004, 2005 Thorsten Kukuk +/* Copyright (C) 2003, 2004, 2005, 2006 Thorsten Kukuk Author: Thorsten Kukuk <kukuk(a)suse.de> This program is free software; you can redistribute it and/or modify @@ -983,7 +983,7 @@ print_help (program); return 0; case 'v': - print_version (program, "2005"); + print_version (program, "2006"); return 0; case '\254': print_usage (stdout, program); @@ -1070,6 +1070,64 @@ old_home = strdupa (pw_data->pw.pw_dir); + /* -L, -U and -p are exclusive. */ + if ((lock_password + unlock_password > 1) || + ((lock_password + unlock_password) && new_password)) + { + print_error (program); + return E_USAGE; + } + + + if (lock_password) + { + const char *pwdp; + + if (pw_data->use_shadow) + pwdp = pw_data->sp.sp_pwdp; + else + pwdp = pw_data->pw.pw_passwd; + + if (pwdp == NULL) + pw_data->newpassword = strdup ("!"); + else if (pwdp[0] != '!') + { + pw_data->newpassword = malloc (strlen (pwdp) + 2); + if (pw_data->newpassword == NULL) + return E_FAILURE; + strcpy (&pw_data->newpassword[1], pwdp); + pw_data->newpassword[0] = '!'; + } + else + { + fprintf (stderr, _("Password for `%s' is already locked!\n"), + pw_data->pw.pw_name); + free_user_t (pw_data); + return E_FAILURE; + } + } + + if (unlock_password) + { + const char *pwdp; + + if (pw_data->use_shadow) + pwdp = pw_data->sp.sp_pwdp; + else + pwdp = pw_data->pw.pw_passwd; + + /* If the password is only "!", don't unlock it. */ + if (pwdp && pwdp[0] == '!' && strlen (pwdp) > 1) + pw_data->newpassword = strdup (&pwdp[1]); + else + { + fprintf (stderr, _("Cannot unlock the password for `%s'!\n"), + pw_data->pw.pw_name); + free_user_t (pw_data); + return E_FAILURE; + } + } + if (new_group) { if ((retval = convert_grpopt_to_name (new_group, NULL, @@ -1316,7 +1374,7 @@ } else if (new_login || new_password || know_uid || new_group || new_comment || new_home || new_shell || know_inactive || - know_expire) + know_expire || lock_password || unlock_password) { /* Only change passwd/shadow file if there are really changes. */ --- src/tst-usermod 1 Jan 1970 00:00:00 -0000 +++ src/tst-usermod 21 May 2006 20:16:50 -0000 @@ -0,0 +1,38 @@ +#!/bin/bash + +export LANG=C + +TEMPDIR=`mktemp -d tests.XXXXXX` + +echo "root:x:0:0:root:/root:/bin/bash" > tst-usermod.passwd +echo "root:valid:0:0:root:/root:/bin/bash" > tst-usermod.noshadow +echo "root:!valid:0:0:root:/root:/bin/bash" > tst-usermod.noshadow.locked +echo "root::0:0:root:/root:/bin/bash" > tst-usermod.noshadow.deleted +echo "root:valid:12116:0:10000::::" > tst-usermod.shadow +echo "root:!valid:12116:0:10000::::" > tst-usermod.locked +echo "root::12116:0:10000::::" > tst-usermod.deleted + +cp -p tst-usermod.noshadow $TEMPDIR/passwd +./usermod -P $TEMPDIR -L root > tst-usermod.run 2>&1 +diff -q -u tst-usermod.noshadow.locked $TEMPDIR/passwd +RET1=$? +./usermod -P $TEMPDIR -U root >> tst-usermod.run 2>&1 +diff -q -u tst-usermod.noshadow $TEMPDIR/passwd +RET2=$? + +cp -p tst-usermod.passwd $TEMPDIR/passwd +cp -p tst-usermod.shadow $TEMPDIR/shadow +./usermod -P $TEMPDIR -L root >> tst-usermod.run 2>&1 +diff -q -u tst-usermod.locked $TEMPDIR/shadow +RET3=$? +./usermod -P $TEMPDIR -U root >> tst-usermod.run 2>&1 +diff -q -u tst-usermod.shadow $TEMPDIR/shadow +RET4=$? + + +rm -rf $TEMPDIR +if [ $RET1 != 0 -o $RET2 != 0 -o $RET3 != 0 -o $RET4 != 0 ] ; then + exit 1 +else + exit 0 +fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit po-utils
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package po-utils checked in at Tue May 23 01:22:32 CEST 2006. -------- --- po-utils/po-utils.changes 2006-01-25 21:40:28.000000000 +0100 +++ po-utils/po-utils.changes 2006-05-22 20:34:14.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 22 20:34:07 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ po-utils.spec ++++++ --- /var/tmp/diff_new_pack.TbdZT6/_old 2006-05-23 01:22:27.000000000 +0200 +++ /var/tmp/diff_new_pack.TbdZT6/_new 2006-05-23 01:22:27.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package po-utils (Version 0.5) # -# Copyright (c) 2004 SUSE LINUX AG, Nuernberg, Germany. +# Copyright (c) 2006 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. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -14,7 +14,7 @@ BuildRequires: emacs-nox Summary: Free PO Utilities Version: 0.5 -Release: 784 +Release: 799 Group: Development/Tools/Other License: GPL Autoreqprov: on @@ -51,8 +51,7 @@ make %install -rm -fr $RPM_BUILD_ROOT -make install-strip DESTDIR="$RPM_BUILD_ROOT" +make install DESTDIR="$RPM_BUILD_ROOT" rm -f $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/po-mode.el* %files @@ -63,6 +62,8 @@ # /usr/share/emacs/site-lisp/po-mode.elc %changelog -n po-utils +* Mon May 22 2006 - schwab(a)suse.de +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Wed Sep 08 2004 - schwab(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit perl-Bootloader
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package perl-Bootloader checked in at Tue May 23 01:22:20 CEST 2006. -------- --- perl-Bootloader/perl-Bootloader.changes 2006-05-19 16:12:53.000000000 +0200 +++ perl-Bootloader/perl-Bootloader.changes 2006-05-22 18:20:07.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 22 18:09:07 CEST 2006 - jplack(a)suse.de + +- fix broken selection list (#167390) +- bump version to 0.2.24 + +------------------------------------------------------------------- Old: ---- perl-Bootloader-0.2.23.tar.bz2 New: ---- perl-Bootloader-0.2.24.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.8jywBP/_old 2006-05-23 01:22:14.000000000 +0200 +++ /var/tmp/diff_new_pack.8jywBP/_new 2006-05-23 01:22:14.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package perl-Bootloader (Version 0.2.23) +# spec file for package perl-Bootloader (Version 0.2.24) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,7 +11,7 @@ # norootforbuild Name: perl-Bootloader -Version: 0.2.23 +Version: 0.2.24 Release: 1 Requires: perl >= %{perl_version} Requires: perl-gettext @@ -56,6 +56,9 @@ /sbin/update-bootloader %changelog -n perl-Bootloader +* Mon May 22 2006 - jplack(a)suse.de +- fix broken selection list (#167390) +- bump version to 0.2.24 * Fri May 19 2006 - jplack(a)suse.de - fix xen section counting when adding (#161559) - omit bogus warning (#165158) ++++++ perl-Bootloader-0.2.23.tar.bz2 -> perl-Bootloader-0.2.24.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.2.23/lib/Bootloader/Core/PowerLILO.pm new/perl-Bootloader-0.2.24/lib/Bootloader/Core/PowerLILO.pm --- old/perl-Bootloader-0.2.23/lib/Bootloader/Core/PowerLILO.pm 2006-05-15 17:50:27.000000000 +0200 +++ new/perl-Bootloader-0.2.24/lib/Bootloader/Core/PowerLILO.pm 2006-05-22 18:11:08.000000000 +0200 @@ -186,7 +186,7 @@ $go->{boot_slot} = "select:Write to boot slot:B:" . "A:B:C:D"; $go->{boot_file} = "path:Create boot image in file:/tmp/suse_boot_image"; $go->{boot_iseries_custom} - = "select:PReP partition:" . $boot_partitions; + = "select:PReP partition::" . $boot_partitions; } elsif ( "$arch" eq "pmac" ) { # only on pmac_new and pmac_old ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit pciutils
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package pciutils checked in at Tue May 23 01:22:19 CEST 2006. -------- --- AUTO/all/pciutils/pciutils.changes 2006-04-24 11:29:33.000000000 +0200 +++ pciutils/pciutils.changes 2006-05-22 21:44:41.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 22 21:44:38 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- New: ---- pciutils-2.2.1-strip.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pciutils.spec ++++++ --- /var/tmp/diff_new_pack.xDk9qr/_old 2006-05-23 01:22:13.000000000 +0200 +++ /var/tmp/diff_new_pack.xDk9qr/_new 2006-05-23 01:22:13.000000000 +0200 @@ -12,7 +12,7 @@ Name: pciutils Version: 2.2.1 -Release: 8 +Release: 16 %define ver 2.2.1 Autoreqprov: on Group: Hardware/Other @@ -23,6 +23,7 @@ Source1: http://pciids.sourceforge.net/pci.ids.bz2 Patch0: %{name}-%{ver}-class.diff Patch1: %{name}-%{ver}-noabort.diff +Patch2: %{name}-%{ver}-strip.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -61,6 +62,7 @@ bzcat %{S:1} >pci.ids %patch0 %patch1 +%patch2 %build make OPT="$RPM_OPT_FLAGS -Wall" PREFIX=%{_prefix} SBINDIR=/sbin @@ -91,6 +93,8 @@ %{_libdir}/libpci.a %changelog -n pciutils +* Mon May 22 2006 - schwab(a)suse.de +- Don't strip binaries. * Wed Mar 22 2006 - kukuk(a)suse.de - Remove pciids-suse patch (has to be fixed upstream) * Wed Mar 22 2006 - kukuk(a)suse.de ++++++ pciutils-2.2.1-strip.diff ++++++ --- Makefile +++ Makefile @@ -66,7 +66,7 @@ install: all # -c is ignored on Linux, but required on FreeBSD $(DIRINSTALL) -m 755 $(SBINDIR) $(IDSDIR) $(MANDIR)/man8 - $(INSTALL) -c -m 755 -s lspci setpci $(SBINDIR) + $(INSTALL) -c -m 755 lspci setpci $(SBINDIR) $(INSTALL) -c -m 755 update-pciids $(SBINDIR) $(INSTALL) -c -m 644 pci.ids $(IDSDIR) $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(MANDIR)/man8 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit netdate
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package netdate checked in at Tue May 23 01:21:02 CEST 2006. -------- --- netdate/netdate.changes 2006-01-25 21:38:39.000000000 +0100 +++ netdate/netdate.changes 2006-05-22 20:55:53.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 22 20:55:50 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netdate.spec ++++++ --- /var/tmp/diff_new_pack.PqSt2c/_old 2006-05-23 01:20:58.000000000 +0200 +++ /var/tmp/diff_new_pack.PqSt2c/_new 2006-05-23 01:20:58.000000000 +0200 @@ -1,15 +1,14 @@ # # spec file for package netdate (Version 1.2) # -# Copyright (c) 2004 SuSE Linux AG, Nuernberg, Germany. +# Copyright (c) 2006 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. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild -# usedforbuild aaa_base acl attr bash bind-utils bison bzip2 coreutils cpio cpp cracklib cvs cyrus-sasl db devs diffutils e2fsprogs file filesystem fillup findutils flex gawk gdbm-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv kbd less libacl libattr libgcc libselinux libstdc++ libxcrypt m4 make man mktemp module-init-tools ncurses ncurses-devel net-tools netcfg openldap2-client openssl pam pam-modules patch permissions popt ps pwdutils rcs readline sed sendmail strace syslogd sysvinit tar texinfo timezone unzip util-linux vim zlib zlib-devel autoconf automake binutils gcc gdbm gettext libtool perl rpm Name: netdate License: distributable @@ -17,7 +16,7 @@ Provides: nkitb:/usr/sbin/netdate Autoreqprov: on Version: 1.2 -Release: 533 +Release: 591 Summary: Set Date and Time by ARPA Internet RFC 868 URL: http://www.ibiblio.org/pub/linux/system/network/sunacm/Other/netdate/ Source: %{name}-%{version}.tar.bz2 @@ -26,7 +25,7 @@ %description Netdate takes a list of names of Internet hosts as arguments, selects -the one which supplies the best time, and sets the system time +the one that supplies the best time, and sets the system time accordingly. The "best" time is chosen by polling the named hosts once each to find @@ -47,8 +46,6 @@ make %install -[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; -mkdir $RPM_BUILD_ROOT install -d -m 755 $RPM_BUILD_ROOT/usr/sbin install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man8 make DESTDIR=$RPM_BUILD_ROOT/ install @@ -63,6 +60,8 @@ /usr/sbin/netdate %changelog -n netdate +* Mon May 22 2006 - schwab(a)suse.de +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Tue Feb 10 2004 - postadal(a)suse.cz ++++++ netdate-1.2.dif ++++++ --- /var/tmp/diff_new_pack.PqSt2c/_old 2006-05-23 01:20:58.000000000 +0200 +++ /var/tmp/diff_new_pack.PqSt2c/_new 2006-05-23 01:20:58.000000000 +0200 @@ -1,5 +1,5 @@ --- Makefile -+++ Makefile 2002/11/13 14:24:33 ++++ Makefile @@ -1,13 +1,20 @@ CC=gcc @@ -16,7 +16,7 @@ install: netdate - install -s -m 0755 netdate /usr/local/sbin/netdate - install -m 0644 netdate.8 /usr/local/man/man8 -+ install -s -m 0755 netdate ${DESTDIR}/usr/sbin/netdate ++ install -m 0755 netdate ${DESTDIR}/usr/sbin/netdate + install -m 0644 netdate.8 ${DESTDIR}/usr/share/man/man8 clean: @@ -25,7 +25,7 @@ + --- netdate.8 -+++ netdate.8 2002/11/13 14:24:33 ++++ netdate.8 @@ -53,40 +53,40 @@ if that host supplies it. .SH EXAMPLE @@ -91,7 +91,7 @@ ARPANET Request for Comments 868, gettimeofday(2), date(1), WWV (USA): --- netdate.c -+++ netdate.c 2002/11/13 14:27:52 ++++ netdate.c @@ -1,4 +1,4 @@ -/* +/* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit nautilus-ifolder3
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package nautilus-ifolder3 checked in at Tue May 23 01:20:53 CEST 2006. -------- --- arch/i386/nautilus-ifolder3/nautilus-ifolder3.changes 2006-05-08 17:21:13.000000000 +0200 +++ nautilus-ifolder3/nautilus-ifolder3.changes 2006-05-22 16:30:55.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 22 16:30:20 CEST 2006 - jhargadon(a)novell.com + +- resubmitting package to keep in sync with iFolder3 package. + +------------------------------------------------------------------- Old: ---- nautilus-ifolder3-3.4.6128.1.tar.gz New: ---- nautilus-ifolder3-3.4.6142.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nautilus-ifolder3.spec ++++++ --- /var/tmp/diff_new_pack.VVj43e/_old 2006-05-23 01:19:54.000000000 +0200 +++ /var/tmp/diff_new_pack.VVj43e/_new 2006-05-23 01:19:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package nautilus-ifolder3 (Version 3.4.6128.1) +# spec file for package nautilus-ifolder3 (Version 3.4.6142.1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,14 +12,14 @@ Name: nautilus-ifolder3 BuildRequires: eel-devel gconf2 gconf2-devel gdk-pixbuf glib-sharp2 gtk-sharp2-complete ifolder3 intltool libgnomeui-devel mDNSResponder-devel nautilus-devel perl-XML-Parser update-desktop-files -%define buildnum 6128 +%define buildnum 6142 URL: http://www.ifolder.com %define prefix /opt/novell/ifolder3 %define gnome_root /opt/gnome License: GPL Group: System/GUI/Other -Version: 3.4.6128.1 -Release: 2 +Version: 3.4.6142.1 +Release: 1 Autoreqprov: on Requires: nautilus >= 2.10.0 Requires: simias >= 1.4 @@ -78,6 +78,8 @@ /opt/gnome/share/nautilus-ifolder3/pixmaps/ifolder-folder.png %changelog -n nautilus-ifolder3 +* Mon May 22 2006 - jhargadon(a)novell.com +- resubmitting package to keep in sync with iFolder3 package. * Mon May 08 2006 - jhargadon(a)novell.com - resubmitting package to keep in sync with iFolder3 package. * Thu Apr 20 2006 - jhargadon(a)novell.com ++++++ nautilus-ifolder3-3.4.6128.1.tar.gz -> nautilus-ifolder3-3.4.6142.1.tar.gz ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit nautilus
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package nautilus checked in at Tue May 23 01:20:51 CEST 2006. -------- --- GNOME/nautilus/nautilus.changes 2006-05-17 19:29:25.000000000 +0200 +++ nautilus/nautilus.changes 2006-05-23 00:17:42.000000000 +0200 @@ -1,0 +2,14 @@ +Tue May 23 00:17:28 CEST 2006 - federico(a)novell.com + +- Updated nautilus-158158-ignore-foreign-desktop-files.diff to fix + https://bugzilla.novell.com/show_bug.cgi?id=177777. All .desktop + files were being filtered erroneously if they didn't have + OnlyShowIn/NotShowIn keys. + +------------------------------------------------------------------- +Mon May 22 22:34:54 CEST 2006 - joeshaw(a)suse.de + +- Only patch in the nautilus-search.desktop file on SL, not SLE, + since the new main menu has search built-in. (bnc #177551) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nautilus.spec ++++++ --- /var/tmp/diff_new_pack.0cdbTd/_old 2006-05-23 01:19:45.000000000 +0200 +++ /var/tmp/diff_new_pack.0cdbTd/_new 2006-05-23 01:19:45.000000000 +0200 @@ -18,7 +18,7 @@ Group: Productivity/File utilities Autoreqprov: on Version: 2.12.2 -Release: 69 +Release: 70 Summary: The GNOME 2.x Desktop File Manager Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.11/%{name}-%{version}.tar.… URL: http://www.gnome.org @@ -86,7 +86,9 @@ %patch13 -p0 %patch20 -p1 %patch23 -p1 +%if ! %sles_version %patch24 +%endif %patch25 -p1 %patch27 -p1 %patch28 -p1 @@ -193,6 +195,14 @@ %{prefix}/%_lib/pkgconfig/*.pc %changelog -n nautilus +* Tue May 23 2006 - federico(a)novell.com +- Updated nautilus-158158-ignore-foreign-desktop-files.diff to fix + https://bugzilla.novell.com/show_bug.cgi?id=177777. All .desktop + files were being filtered erroneously if they didn't have + OnlyShowIn/NotShowIn keys. +* Mon May 22 2006 - joeshaw(a)suse.de +- Only patch in the nautilus-search.desktop file on SL, not SLE, + since the new main menu has search built-in. (bnc #177551) * Wed May 17 2006 - sbrabec(a)suse.cz - nautilus-search-bar.c added to POTFILES.in. * Wed May 17 2006 - sbrabec(a)suse.cz ++++++ nautilus-158158-ignore-foreign-desktop-files.diff ++++++ --- /var/tmp/diff_new_pack.0cdbTd/_old 2006-05-23 01:19:45.000000000 +0200 +++ /var/tmp/diff_new_pack.0cdbTd/_new 2006-05-23 01:19:45.000000000 +0200 @@ -1,3 +1,11 @@ +2006-05-22 Federico Mena Quintero <federico(a)novell.com> + + * libnautilus-private/nautilus-directory-async.c + (is_foreign_desktop_file): Argh, check that the OnlyShowIn / + NotShowIn strings exist before testing their contents. Fixes + https://bugzilla.novell.com/show_bug.cgi?id=177777; this was + filtering all .desktop files! + 2006-05-16 Federico Mena Quintero <federico(a)novell.com> * libnautilus-private/nautilus-directory-async.c @@ -75,13 +83,13 @@ + char **not_show_in; + + only_show_in = gnome_desktop_item_get_strings (ditem, GNOME_DESKTOP_ITEM_ONLY_SHOW_IN); -+ if (!string_array_contains (only_show_in, "GNOME")) { ++ if (only_show_in && !string_array_contains (only_show_in, "GNOME")) { + retval = TRUE; + } + g_strfreev (only_show_in); + + not_show_in = gnome_desktop_item_get_strings (ditem, "NotShowIn"); -+ if (string_array_contains (not_show_in, "GNOME")) { ++ if (not_show_in && string_array_contains (not_show_in, "GNOME")) { + retval = TRUE; + } + g_strfreev (not_show_in); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit multipath-tools
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package multipath-tools checked in at Tue May 23 01:19:47 CEST 2006. -------- --- multipath-tools/multipath-tools.changes 2006-05-02 14:39:51.000000000 +0200 +++ multipath-tools/multipath-tools.changes 2006-05-22 17:16:06.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 22 17:16:00 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- New: ---- multipath-tools-strip.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ multipath-tools.spec ++++++ --- /var/tmp/diff_new_pack.zTSWDr/_old 2006-05-23 01:19:41.000000000 +0200 +++ /var/tmp/diff_new_pack.zTSWDr/_new 2006-05-23 01:19:41.000000000 +0200 @@ -20,7 +20,7 @@ %endif Autoreqprov: on Version: 0.4.6 -Release: 23 +Release: 25 Summary: Tools to Manage Multipathed Devices with the device-mapper Source: multipath-tools-%{version}.tar.bz2 Source1: multipathd @@ -36,6 +36,7 @@ Patch11: %{name}-no-gz-for-manpage Patch12: %{name}-split-off-DS6000 Patch13: %{name}-remove-obsolete-option-from-manpage +Patch14: %{name}-strip.patch %description This package provides the tools to manage multipathed devices by @@ -58,7 +59,6 @@ -------- Christophe Varoqui <christophe.varoqui(a)free.fr> -%{name} provides the tools to manage multipathed devices by %prep %setup -n multipath-tools-%{version} %patch0 -p1 @@ -67,6 +67,7 @@ %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 %build make OPTFLAGS="$RPM_OPT_FLAGS" BUILD=glibc @@ -121,6 +122,8 @@ %{_mandir}/man8/mpath_prio_alua.8* %changelog -n multipath-tools +* Mon May 22 2006 - schwab(a)suse.de +- Don't strip binaries. * Tue May 02 2006 - hare(a)suse.de - Merge in fixes from upstream - Merged local patches ++++++ multipath-tools-strip.patch ++++++ --- devmap_name/Makefile +++ devmap_name/Makefile @@ -28,7 +28,7 @@ install: install -d $(DESTDIR)$(bindir) - install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/ + install -m 755 $(EXEC) $(DESTDIR)$(bindir)/ install -d $(DESTDIR)$(mandir) install -m 644 $(EXEC).8 $(DESTDIR)$(mandir) --- kpartx/Makefile +++ kpartx/Makefile @@ -36,7 +36,7 @@ install: install -d $(DESTDIR)$(bindir) - install -s -m 755 $(EXEC) $(DESTDIR)$(bindir) + install -m 755 $(EXEC) $(DESTDIR)$(bindir) install -d $(DESTDIR)$(mandir) install -m 644 $(EXEC).8 $(DESTDIR)$(mandir) --- multipath/Makefile +++ multipath/Makefile @@ -37,7 +37,7 @@ install: install -d $(DESTDIR)$(bindir) - install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/ + install -m 755 $(EXEC) $(DESTDIR)$(bindir)/ install -d $(DESTDIR)/etc/udev/rules.d install -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/ install -d $(DESTDIR)$(mandir) --- multipathd/Makefile +++ multipathd/Makefile @@ -44,7 +44,7 @@ install: install -d $(DESTDIR)$(bindir) - install -s -m 755 $(EXEC) $(DESTDIR)$(bindir) + install -m 755 $(EXEC) $(DESTDIR)$(bindir) install -d $(DESTDIR)$(rcdir) install -d $(DESTDIR)$(mandir) install -m 644 $(EXEC).8 $(DESTDIR)$(mandir) --- path_priority/pp_alua/Makefile +++ path_priority/pp_alua/Makefile @@ -36,7 +36,7 @@ $(CC) -static -o $(EXEC) $(OBJS) install: $(BUILD) $(EXEC).8 - $(INSTALL) -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC) + $(INSTALL) -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC) $(INSTALL) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)/$(EXEC).8 uninstall: --- path_priority/pp_balance_units/Makefile +++ path_priority/pp_balance_units/Makefile @@ -35,7 +35,7 @@ install: install -d $(DESTDIR)$(bindir) - install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/ + install -m 755 $(EXEC) $(DESTDIR)$(bindir)/ uninstall: rm $(DESTDIR)$(bindir)/$(EXEC) --- path_priority/pp_emc/Makefile +++ path_priority/pp_emc/Makefile @@ -14,7 +14,7 @@ $(CC) -static -o $(EXEC) $(OBJS) install: $(EXEC) - install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC) + install -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC) uninstall: rm $(DESTDIR)$(bindir)/$(EXEC) --- path_priority/pp_hds_modular/Makefile +++ path_priority/pp_hds_modular/Makefile @@ -14,7 +14,7 @@ $(CC) -static -o $(EXEC) $(OBJS) install: $(EXEC) - install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC) + install -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC) uninstall: rm $(DESTDIR)$(bindir)/$(EXEC) --- path_priority/pp_netapp/Makefile +++ path_priority/pp_netapp/Makefile @@ -14,7 +14,7 @@ $(CC) -static -o $(EXEC) $(OBJS) install: $(EXEC) - install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC) + install -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC) uninstall: rm $(DESTDIR)$(bindir)/$(EXEC) --- path_priority/pp_random/Makefile +++ path_priority/pp_random/Makefile @@ -14,7 +14,7 @@ $(CC) -static -o $(EXEC) $(OBJS) install: $(EXEC) - install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC) + install -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC) uninstall: rm $(DESTDIR)$(bindir)/$(EXEC) --- path_priority/pp_tpc/Makefile +++ path_priority/pp_tpc/Makefile @@ -14,7 +14,7 @@ $(CC) -static -o $(EXEC) $(OBJS) install: $(EXEC) - install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC) + install -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC) uninstall: rm $(DESTDIR)$(bindir)/$(EXEC) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit mkinitrd
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package mkinitrd checked in at Tue May 23 01:19:36 CEST 2006. -------- --- mkinitrd/mkinitrd.changes 2006-05-19 17:08:48.000000000 +0200 +++ mkinitrd/mkinitrd.changes 2006-05-22 10:00:40.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 22 09:58:22 CEST 2006 - hare(a)suse.de + +- Handle persistent device names correctly if + LVM is activated (#175972) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.owlMXf/_old 2006-05-23 01:16:24.000000000 +0200 +++ /var/tmp/diff_new_pack.owlMXf/_new 2006-05-23 01:16:24.000000000 +0200 @@ -18,7 +18,7 @@ # bootsplash required only if creating splash initrd's. Autoreqprov: on Version: 1.2 -Release: 108 +Release: 109 Summary: Creates an Initial RAM Disk Image for Preloading Modules BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mkinitrd @@ -85,6 +85,9 @@ %doc %{_mandir}/man8/mkinitrd.8.gz %changelog -n mkinitrd +* Mon May 22 2006 - hare(a)suse.de +- Handle persistent device names correctly if + LVM is activated (#175972) * Fri May 19 2006 - hare(a)suse.de - Configure network interfaces automatically if root device is an iSCSI device (#176804) ++++++ mkinitrd ++++++ --- mkinitrd/mkinitrd 2006-05-19 17:08:43.000000000 +0200 +++ mkinitrd/mkinitrd 2006-05-22 10:00:37.000000000 +0200 @@ -23,7 +23,7 @@ # This file is kept in the following CVS repository: # # $Source: /suse/yast2/cvsroot/mkinitrd/mkinitrd,v $ -# $Revision: 1.298 $ +# $Revision: 1.299 $ usage() { cat<<EOF @@ -1718,30 +1718,30 @@ | ;; | LABEL=*) | label=\${rootdev#LABEL=} - | echo "SUBSYSTEM=\"block\", SYSFS{start}=\"*\", PROGRAM=\"/sbin/vol_id -l %N\", RESULT=\"\$label\", SYMLINK=\"root\"" > /etc/udev/rules.d/01-label.rules - | echo "KERNEL=\"dm-[0-9]*\", PROGRAM=\"/sbin/vol_id -l %N\", RESULT=\"\$label\", SYMLINK=\"root\"" >> /etc/udev/rules.d/01-label.rules + | echo "SUBSYSTEM=\"block\", SYSFS{start}=\"*\", PROGRAM=\"/sbin/vol_id -l %N\", RESULT=\"\$label\", SYMLINK+=\"root\"" > /etc/udev/rules.d/01-label.rules + | echo "KERNEL=\"dm-[0-9]*\", PROGRAM=\"/sbin/vol_id -l %N\", RESULT=\"\$label\", SYMLINK+=\"root\"" >> /etc/udev/rules.d/01-label.rules | rootdev=/dev/root | ;; | UUID=*) | uuid=\${rootdev#UUID=} - | echo "SUBSYSTEM=\"block\", SYSFS{start}=\"*\", PROGRAM=\"/sbin/vol_id -u %N\", RESULT=\"\$uuid\", SYMLINK=\"root\"" > /etc/udev/rules.d/02-uuid.rules - | echo "KERNEL=\"dm-[0-9]*\", PROGRAM=\"/sbin/vol_id -u %N\", RESULT=\"\$uuid\", SYMLINK=\"root\"" >> /etc/udev/rules.d/02-uuid.rules + | echo "SUBSYSTEM=\"block\", SYSFS{start}=\"*\", PROGRAM=\"/sbin/vol_id -u %N\", RESULT=\"\$uuid\", SYMLINK+=\"root\"" > /etc/udev/rules.d/02-uuid.rules + | echo "KERNEL=\"dm-[0-9]*\", PROGRAM=\"/sbin/vol_id -u %N\", RESULT=\"\$uuid\", SYMLINK+=\"root\"" >> /etc/udev/rules.d/02-uuid.rules | rootdev=/dev/root | ;; | [0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]) | maj=\$((0x0\$rootdev >> 8)) | min=\$((0x0\$rootdev & 0xff)) - | echo "SUBSYSTEM=\"block\", SYSFS{dev}=\"\$maj:\$min\", SYMLINK=\"root\"" > /etc/udev/rules.d/05-lilo.rules + | echo "SUBSYSTEM=\"block\", SYSFS{dev}=\"\$maj:\$min\", SYMLINK+=\"root\"" > /etc/udev/rules.d/05-lilo.rules | rootdev=/dev/root ;; | [0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]) | maj=\$((0x\$rootdev >> 8)) | min=\$((0x\$rootdev & 0xff)) - | echo "SUBSYSTEM=\"block\", SYSFS{dev}=\"\$maj:\$min\", SYMLINK=\"root\"" > /etc/udev/rules.d/05-lilo.rules + | echo "SUBSYSTEM=\"block\", SYSFS{dev}=\"\$maj:\$min\", SYMLINK+=\"root\"" > /etc/udev/rules.d/05-lilo.rules | rootdev=/dev/root ;; | 0x[0-9a-fA-F][0-9a-fA-F]*) | maj=\$((\$rootdev >> 8)) | min=\$((\$rootdev & 0xff)) - | echo "SUBSYSTEM=\"block\", SYSFS{dev}=\"\$maj:\$min\", SYMLINK=\"root\"" > /etc/udev/rules.d/05-lilo.rules + | echo "SUBSYSTEM=\"block\", SYSFS{dev}=\"\$maj:\$min\", SYMLINK+=\"root\"" > /etc/udev/rules.d/05-lilo.rules | rootdev=/dev/root ;; | *:*) | rootfstype="nfs" @@ -2556,6 +2556,13 @@ | |for o in \$(cat /proc/cmdline); do | case \$o in + | root=/dev/disk/by-*/*) + | vg_root= + | ;; + | root=/dev/mapper/*) + | set -- \$(IFS=- ; echo \$o) + | vg_root=\$2 + | ;; | root=/dev/*) | set -- \$(IFS=/ ; echo \$o) | vg_root=\$3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit lsb-desktop
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package lsb-desktop checked in at Tue May 23 01:16:13 CEST 2006. -------- --- lsb-desktop/lsb-desktop.changes 2006-05-16 16:14:24.000000000 +0200 +++ lsb-desktop/lsb-desktop.changes 2006-05-18 15:26:11.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 18 15:26:03 CEST 2006 - kukuk(a)suse.de + +- Add lsb-graphics + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lsb-desktop.spec ++++++ --- /var/tmp/diff_new_pack.ETnaGf/_old 2006-05-23 01:16:07.000000000 +0200 +++ /var/tmp/diff_new_pack.ETnaGf/_new 2006-05-23 01:16:07.000000000 +0200 @@ -14,28 +14,40 @@ BuildRequires: glibc-devel-32bit Summary: Linux Standard Base Desktop Version: 3.1 -Release: 12 +Release: 13 Requires: lsb = %{version} +Provides: lsb-graphics-noarch = 2.0 lsb-graphics-noarch = %{version} Provides: lsb-desktop-noarch %ifarch %ix86 +Provides: lsb-graphics-ia32 = 2.0 lsb-graphics-ia32 = %{version} Provides: lsb-desktop-ia32 %else %ifarch x86_64 +Provides: lsb-graphics-ia32 = 2.0 lsb-graphics-ia32 = %{version} +Provides: lsb-desktop-ia32 +Provides: lsb-graphics-amd64 = 2.0 lsb-graphics-amd64 = %{version} Provides: lsb-desktop-amd64 %else %ifarch s390x +Provides: lsb-graphics-s390 = 2.0 lsb-graphics-s390 = %{version} Provides: lsb-desktop-s390 %endif %ifarch ppc64 ppc +Provides: lsb-graphics-ppc32 = 2.0 lsb-graphics-ppc32 = %{version} Provides: lsb-desktop-ppc32 %ifarch ppc64 +Provides: lsb-graphics-ppc64 = 2.0 +Provides: lsb-graphics-ppc64 = %{version} Provides: lsb-desktop-ppc64 %endif %else +Provides: lsb-graphics-%{_target_cpu} = 2.0 +Provides: lsb-graphics-%{_target_cpu} = %{version} Provides: lsb-desktop-%{_target_cpu} %endif %endif %endif +Requires: xorg-x11-libs Mesa Requires: fontconfig Requires: libpng >= 1.2 Requires: glib2 >= 2.8 @@ -62,22 +74,36 @@ %install mkdir -p $RPM_BUILD_ROOT/etc/lsb-release.d +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-2.0-noarch +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-%{version}-noarch touch $RPM_BUILD_ROOT/etc/lsb-release.d/desktop-%{version}-noarch %ifarch %ix86 +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-2.0-ia32 +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-%{version}-ia32 touch $RPM_BUILD_ROOT/etc/lsb-release.d/desktop-%{version}-ia32 %else %ifarch x86_64 +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-2.0-amd64 +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-%{version}-amd64 touch $RPM_BUILD_ROOT/etc/lsb-release.d/desktop-%{version}-amd64 %else %ifarch s390x +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-2.0-s390 +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-%{version}-s390 touch $RPM_BUILD_ROOT/etc/lsb-release.d/desktop-%{version}-s390 %endif %ifarch ppc64 ppc +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-2.0-ppc32 +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-%{version}-ppc32 touch $RPM_BUILD_ROOT/etc/lsb-release.d/desktop-%{version}-ppc32 %ifarch ppc64 +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-2.0-ppc64 +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-%{version}-ppc64 touch $RPM_BUILD_ROOT/etc/lsb-release.d/desktop-%{version}-ppc64 %endif %else +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-2.0-%{_target_cpu} +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-%{version}-%{_target_cpu} touch $RPM_BUILD_ROOT/etc/lsb-release.d/desktop-%{version}-%{_target_cpu} %endif %endif @@ -92,6 +118,8 @@ /etc/lsb-release.d/* %changelog -n lsb-desktop +* Thu May 18 2006 - kukuk(a)suse.de +- Add lsb-graphics * Tue May 16 2006 - kukuk(a)suse.de - Replace QT4 with QT3 * Fri Feb 10 2006 - kukuk(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit lilo
by root＠suse.de 22 May '06

22 May '06

Hello community, here is the log from the commit of package lilo checked in at Tue May 23 01:16:04 CEST 2006. -------- --- arch/ppc/lilo/lilo.changes 2006-05-03 19:37:53.000000000 +0200 +++ lilo/lilo.changes 2006-05-22 10:05:00.000000000 +0200 @@ -1,0 +2,27 @@ +Mon May 22 10:04:43 CEST 2006 - olh(a)suse.de + +- add a man page for show_of_path.sh + +------------------------------------------------------------------- +Wed May 17 20:33:36 CEST 2006 - olh(a)suse.de + +- record vmlinux/initrd in /chosen/yaboot,image and yaboot,initrd + +------------------------------------------------------------------- +Wed May 17 19:14:05 CEST 2006 - olh(a)suse.de + +- number logical msdos partitions correctly in yaboot + if there is more than one logical partition, only the first one + was considered because the loop was exited early + +------------------------------------------------------------------- +Fri May 12 14:37:08 CEST 2006 - jplack(a)suse.de + +- Mark Emulex FC HBA/0xFD00 as tested (#163786) + +------------------------------------------------------------------- +Sat May 6 15:03:39 CEST 2006 - olh(a)suse.de + +- do not print a NUL char after every newline in yaboot + +------------------------------------------------------------------- Old: ---- lilo-10.1.11.tar.bz2 yaboot-10.1.11-r710.tar.bz2 New: ---- lilo-10.1.12.tar.bz2 yaboot-10.1.12-r716.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lilo.spec ++++++ --- /var/tmp/diff_new_pack.VAWsDk/_old 2006-05-23 01:15:07.000000000 +0200 +++ /var/tmp/diff_new_pack.VAWsDk/_new 2006-05-23 01:15:07.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package lilo (Version 10.1.11) +# spec file for package lilo (Version 10.1.12) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,7 +11,7 @@ # norootforbuild Name: lilo -%define yaboot_vers 10.1.11-r710 +%define yaboot_vers 10.1.12-r716 Group: System/Boot License: BSD, Other License(s), see package Summary: The Linux Loader, a Boot Menu @@ -22,11 +22,11 @@ Requires: gawk sed coreutils Requires: powerpc-utils Requires: binutils -Version: 10.1.11 -Release: 2 +Version: 10.1.12 +Release: 1 Source0: lilo-%{version}.tar.bz2 Source1: http://penguinppc.org/projects/yaboot/yaboot-%{yaboot_vers}.tar.bz2 -# $Id: lilo.spec 696 2006-04-18 23:00:04Z olh $ +# $Id: lilo.spec 717 2006-05-22 08:05:00Z olh $ %description LILO boots Linux from your hard drive. It can also boot other operating @@ -107,6 +107,7 @@ cp -av COPYING $RPM_BUILD_ROOT%{_docdir}/lilo/ cp -av man/lilo.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5 cp -av man/lilo.8 $RPM_BUILD_ROOT%{_mandir}/man8 +cp -av man/show_of_path.sh.8 $RPM_BUILD_ROOT%{_mandir}/man8 cd bootheader make install DESTDIR=$RPM_BUILD_ROOT cd .. @@ -159,6 +160,18 @@ %doc %{_mandir}/*/* %changelog -n lilo +* Mon May 22 2006 - olh(a)suse.de +- add a man page for show_of_path.sh +* Wed May 17 2006 - olh(a)suse.de +- record vmlinux/initrd in /chosen/yaboot,image and yaboot,initrd +* Wed May 17 2006 - olh(a)suse.de +- number logical msdos partitions correctly in yaboot + if there is more than one logical partition, only the first one + was considered because the loop was exited early +* Fri May 12 2006 - jplack(a)suse.de +- Mark Emulex FC HBA/0xFD00 as tested (#163786) +* Sat May 06 2006 - olh(a)suse.de +- do not print a NUL char after every newline in yaboot * Wed May 03 2006 - olh(a)suse.de - let yaboot start vmlinux download even if no filename is specified allows load files from network via 'net:' ++++++ lilo-10.1.11.tar.bz2 -> lilo-10.1.12.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.11/lilo.new new/lilo-10.1.12/lilo.new --- old/lilo-10.1.11/lilo.new 2006-04-18 23:22:39.000000000 +0200 +++ new/lilo-10.1.12/lilo.new 2006-04-18 23:22:39.000000000 +0200 @@ -63,7 +63,7 @@ function Usage() { cat <<EOHELP -lilo for PowerPC 10.1.11 +lilo for PowerPC 10.1.12 configures the Linux Loader on a few different PowerPC board types, based on the configuration file /etc/lilo.conf. This includes IBM RS/6000 and pSeries models, IBM legacy iSeries, @@ -453,7 +453,7 @@ get_arch=1 ;; --version|-v) - echo "lilo for PowerPC 10.1.11" + echo "lilo for PowerPC 10.1.12" exit 0 ;; --help) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.11/man/show_of_path.sh.8 new/lilo-10.1.12/man/show_of_path.sh.8 --- old/lilo-10.1.11/man/show_of_path.sh.8 1970-01-01 01:00:00.000000000 +0100 +++ new/lilo-10.1.12/man/show_of_path.sh.8 2006-05-22 10:05:00.000000000 +0200 @@ -0,0 +1,26 @@ +.\" $Id: show_of_path.sh.8 717 2006-05-22 08:05:00Z olh $ \" +.\" vim: syntax=nroff +.TH show_of_path.sh 8 +.SH NAME +\fBshow_of_path.sh\fR \- construct an OpenFirmware device path +.SH SYNOPSIS +\fBshow_of_path.sh\fR [filename] +.SH DESCRIPTION +.BR show_of_path.sh (8) +generates an OpenFirmware device path for the given filename. If a block device node is specified, the path for the device behind this node will be generated. When called without options, the path for / will be generated. This path is used by the OpenFirmware itself to load the bootloader, and by \fByaboot(8)\fR to load files specified in \fByaboot.conf(5)\fR. + +\fBshow_of_path.sh\fR does a stat on the given file to get the major:minor pair. Then this pair is searched in \fBdev\fR files below /sys/block/. If the main block device has a \fIdevice\fR symlink, this symlink is followed to get to the real hardware backing the block device. If no device symlink exists, the block device is most likely a "virtual" device like loop, lvm, software raid or device-mapper based. Neither OpenFirmware nor yaboot can do anything with such devices. The full path name of the directory where the \fIdevice\fR symlink points to is used to make assumptions about the hardware bus type and the topology on the bus. Then a file named \fBdevspec\fR is searched in the parent directories. Its content is the OpenFirmware path to the hardware controller. A copy of the firmware device tree is stored in \fB/proc/device-tree\fR, the \fBdevspec\fR content can be appended to get to the directory of device node. A few properties exist there which are used to construct the final path. + +Currently all on-board SCSI and IDE controllers, Emulex and Qlogic fibrechannel controllers and Apple PowerMac firewire controllers are supported. Paths to network devices are not supported, use the "\fBbootlist(8)\fR -m normal eth0" command to set the boot-device on IBM pSeries systems. + +.SH AUTHORS +.B show_of_path.sh +was written by Olaf Hering <olh(a)suse.de>. It is now maintained and improved further by Joachim Plack <jplack(a)suse.de> +.SH REPORTING BUGS +Bugs in \fBshow_of_path.sh\fR should be reported to <olaf(a)suse.de> +.SH SEE ALSO +.BR lilo (8), +.BR lilo.conf (5), +.BR bootstrap (8), +.BR yaboot (8), +.BR yaboot.conf (5) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.11/show_of_path.sh new/lilo-10.1.12/show_of_path.sh --- old/lilo-10.1.11/show_of_path.sh 2006-03-24 12:15:07.000000000 +0100 +++ new/lilo-10.1.12/show_of_path.sh 2006-05-12 14:37:04.000000000 +0200 @@ -2,7 +2,7 @@ # vim: syntax=off # set -ex # -# $Id: show_of_path.sh 627 2006-03-24 11:15:07Z jplack $ +# $Id: show_of_path.sh 713 2006-05-12 12:37:04Z jplack $ # find a OF bootpath on Apple PowerMacintosh Newworld machines # Copyright (C) 2000, 2004 Olaf Hering <olh(a)suse.de>, # 2005 Joachim Plack <jplack(a)suse.de> @@ -62,7 +62,7 @@ shopt -s extglob -read d myversion d <<< "$Date: 2006-03-24 11:15:07 +0000 (Fri, 24 Mar 2006) $" +read d myversion d <<< "$Date: 2006-05-12 12:37:04 +0000 (Fri, 12 May 2006) $" function error() { @@ -407,7 +407,7 @@ if (( vendor_id == 0x10df )); then # PCI_VENDOR_ID_EMULEX==0x10df id=$(printf "%04x" $device_id) - if [[ $id == @(f901|f981|f982|fa00|fa01|fd00) ]]; then + if [[ $id == @(f901|f981|f982|fa00|fa01) ]]; then warning "Emulex FC HBA with device id 0x$id not yet tested." \ "Reboot may fail." fi ++++++ yaboot-10.1.11-r710.tar.bz2 -> yaboot-10.1.12-r716.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.11-r710/Changelog.SuSE new/yaboot-10.1.12-r716/Changelog.SuSE --- old/yaboot-10.1.11-r710/Changelog.SuSE 2006-05-03 19:46:58.000000000 +0200 +++ new/yaboot-10.1.12-r716/Changelog.SuSE 2006-05-22 10:05:45.000000000 +0200 @@ -1,4 +1,37 @@ ------------------------------------------------------------------------ +r716 | olh | 2006-05-17 18:34:50 +0000 (Wed, 17 May 2006) | 2 lines +Changed paths: + M /trunk/lilo.changes + M /trunk/yaboot/second/yaboot.c + ++- record vmlinux/initrd in /chosen/yaboot,image and yaboot,initrd + +------------------------------------------------------------------------ +r715 | olh | 2006-05-17 18:04:34 +0000 (Wed, 17 May 2006) | 2 lines +Changed paths: + M /trunk/yaboot/second/yaboot.c + +use path_description_to_string on vmlinux/initrd load errors + +------------------------------------------------------------------------ +r714 | olh | 2006-05-17 17:17:05 +0000 (Wed, 17 May 2006) | 4 lines +Changed paths: + M /trunk/lilo.changes + M /trunk/yaboot/second/partition.c + ++- number logical msdos partitions correctly in yaboot ++ if there is more than one logical partition, only the first one ++ was considered because the loop was exited early + +------------------------------------------------------------------------ +r712 | olh | 2006-05-06 13:04:22 +0000 (Sat, 06 May 2006) | 2 lines +Changed paths: + M /trunk/lilo.changes + M /trunk/yaboot/second/prom.c + ++- do not print a NUL char after every newline in yaboot + +------------------------------------------------------------------------ r710 | olh | 2006-05-03 17:37:53 +0000 (Wed, 03 May 2006) | 3 lines Changed paths: M /trunk/lilo.changes diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.11-r710/Makefile new/yaboot-10.1.12-r716/Makefile --- old/yaboot-10.1.11-r710/Makefile 2006-05-03 19:46:58.000000000 +0200 +++ new/yaboot-10.1.12-r716/Makefile 2006-05-22 10:05:45.000000000 +0200 @@ -6,7 +6,7 @@ include Config -VERSION = 10.1.11-r710 +VERSION = 10.1.12-r716 # Debug mode (spam/verbose) DEBUG = 0 # make install vars diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.11-r710/second/partition.c new/yaboot-10.1.12-r716/second/partition.c --- old/yaboot-10.1.11-r710/second/partition.c 2006-04-29 22:04:58.000000000 +0200 +++ new/yaboot-10.1.12-r716/second/partition.c 2006-05-17 19:17:05.000000000 +0200 @@ -160,8 +160,6 @@ next = partition_start + offset; if (!le32_to_cpu(part->size) || msdos_is_extended_partition(part->sys_ind)) continue; - if (!msdos_is_linux_partition(part->sys_ind)) - break; if (i >= 2) { if (offset + length > partition_size) continue; @@ -170,7 +168,8 @@ if (next + length > partition_start + partition_size) continue; } - add_new_partition(list, partition, next, length, LABEL_MSDOS, 512, part->sys_ind); + if (msdos_is_linux_partition(part->sys_ind)) + add_new_partition(list, partition, next, length, LABEL_MSDOS, 512, part->sys_ind); partition++; } part -= 4; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.11-r710/second/prom.c new/yaboot-10.1.12-r716/second/prom.c --- old/yaboot-10.1.11-r710/second/prom.c 2006-03-27 21:38:58.000000000 +0200 +++ new/yaboot-10.1.12-r716/second/prom.c 2006-05-06 15:04:22.000000000 +0200 @@ -361,9 +361,9 @@ static void prom_putnewline(prom_handle file) { if (stdout_is_screen) - call_prom("write", 3, 1, file, newline_indent, sizeof(newline_indent)); + call_prom("write", 3, 1, file, newline_indent, sizeof(newline_indent) - 1); else - call_prom("write", 3, 1, file, newline, sizeof(newline)); + call_prom("write", 3, 1, file, newline, sizeof(newline) - 1); } void prom_putchar(char c) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.11-r710/second/yaboot.c new/yaboot-10.1.12-r716/second/yaboot.c --- old/yaboot-10.1.11-r710/second/yaboot.c 2006-05-03 19:37:53.000000000 +0200 +++ new/yaboot-10.1.12-r716/second/yaboot.c 2006-05-17 20:34:50.000000000 +0200 @@ -704,6 +704,7 @@ loadinfo_t loadinfo; void *initrd_more,*initrd_want; unsigned long initrd_read; + char *msg; loadinfo.load_loc = 0; @@ -716,10 +717,13 @@ prom_printf("Please wait, loading kernel...\n"); + msg = path_description_to_string(&params.kernel); result = open_file(&params.kernel, &file); if (result != FILE_ERR_OK) { - prom_printf("%s:%d,", params.kernel.device, params.kernel.part); - prom_perror(result, params.kernel.filename); + if (msg) { + prom_perror(result, msg); + free(msg); + } continue; } @@ -750,6 +754,10 @@ continue; } file.fs->close(&file); + if (msg) { + prom_set_chosen ("yaboot,image", msg, strlen(msg) + 1); + free(msg); + } /* If ramdisk, load it (only if booting a vmlinux). For now, we * can't tell the size it will be so we claim an arbitrary amount @@ -757,10 +765,13 @@ */ if (params.rd.filename) { prom_printf("Loading ramdisk...\n"); + msg = path_description_to_string(&params.rd); result = open_file(&params.rd, &file); if (result != FILE_ERR_OK) { - prom_printf("%s:%d,", params.rd.device, params.rd.part); - prom_perror(result, params.rd.filename); + if (msg) { + prom_perror(result, msg); + free(msg); + } } else { #define INITRD_CHUNKSIZE 0x400000 @@ -801,10 +812,14 @@ } file.fs->close(&file); } - if (initrd_base) - prom_printf("ramdisk loaded %08lx @ %p\n", - initrd_size, initrd_base); - else { + if (initrd_base) { + if (msg) { + prom_set_chosen ("yaboot,initrd", msg, strlen(msg) + 1); + free(msg); + } + prom_printf("ramdisk loaded %08lx @ %p\n", initrd_size, initrd_base); + + } else { prom_printf("ramdisk load failed !\n"); prom_pause(); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0