commit fillup for openSUSE:Factory
Hello community, here is the log from the commit of package fillup for openSUSE:Factory checked in at 2020-01-23 16:07:36 Comparing /work/SRC/openSUSE:Factory/fillup (Old) and /work/SRC/openSUSE:Factory/.fillup.new.26092 (New) Package is "fillup" Thu Jan 23 16:07:36 2020 rev:26 rq:764586 version:1.42 Changes: --- /work/SRC/openSUSE:Factory/fillup/fillup.changes2017-11-30 12:31:46.983607051 +0100 +++ /work/SRC/openSUSE:Factory/.fillup.new.26092/fillup.changes 2020-01-23 16:07:38.839519690 +0100 @@ -1,0 +2,6 @@ +Wed Jan 15 09:38:33 UTC 2020 - Adam Majer + +- fillup-fno-common.patch: fix compilation on Tumbleweed + (boo#1160871) + +--- New: fillup-fno-common.patch Other differences: -- ++ fillup.spec ++ --- /var/tmp/diff_new_pack.1g2BjJ/_old 2020-01-23 16:07:40.455520648 +0100 +++ /var/tmp/diff_new_pack.1g2BjJ/_new 2020-01-23 16:07:40.455520648 +0100 @@ -1,7 +1,7 @@ # # spec file for package fillup # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -25,7 +25,7 @@ Version:1.42 Release:0 Summary:Tool for Merging Config Files -License:GPL-2.0+ +License:GPL-2.0-or-later Group: System/Base Url:http://github.com/openSUSE/fillup Source: fillup-%{version}.tar.bz2 @@ -35,6 +35,7 @@ Patch3: fillup-retval.dif Patch4: fillup-nodate.patch Patch5: fillup-1.42-cloexec.patch +Patch6: fillup-fno-common.patch Provides: aaa_base:/bin/fillup BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -52,6 +53,7 @@ %patch3 %patch4 %patch5 +%patch6 -p1 %build make %{?_smp_mflags} compile COMPILE_OPTION=OPTIMIZE OPTISPLUS="%{optflags}" ++ fillup-fno-common.patch ++ Index: fillup-1.42/SRC/fillup_cfg.h === --- fillup-1.42.orig/SRC/fillup_cfg.h +++ fillup-1.42/SRC/fillup_cfg.h @@ -23,9 +23,9 @@ /* VARIABLES -*/ -const char* cfg_delimiter; -const char* cfg_commentMarker; -const char* cfg_quotingMarker; +extern const char* cfg_delimiter; +extern const char* cfg_commentMarker; +extern const char* cfg_quotingMarker; /**/
commit fillup for openSUSE:Factory
Hello community, here is the log from the commit of package fillup for openSUSE:Factory checked in at 2017-11-30 12:31:45 Comparing /work/SRC/openSUSE:Factory/fillup (Old) and /work/SRC/openSUSE:Factory/.fillup.new (New) Package is "fillup" Thu Nov 30 12:31:45 2017 rev:25 rq:545038 version:1.42 Changes: --- /work/SRC/openSUSE:Factory/fillup/fillup.changes2014-11-07 14:07:15.0 +0100 +++ /work/SRC/openSUSE:Factory/.fillup.new/fillup.changes 2017-11-30 12:31:46.983607051 +0100 @@ -1,0 +2,6 @@ +Thu Nov 23 13:39:57 UTC 2017 - rbr...@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + +--- Other differences: -- ++ fillup.spec ++ --- /var/tmp/diff_new_pack.aEUYLg/_old 2017-11-30 12:31:47.883574323 +0100 +++ /var/tmp/diff_new_pack.aEUYLg/_new 2017-11-30 12:31:47.883574323 +0100 @@ -1,7 +1,7 @@ # # spec file for package fillup # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,11 @@ # +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + Name: fillup Version:1.42 Release:0 @@ -52,7 +57,7 @@ make %{?_smp_mflags} compile COMPILE_OPTION=OPTIMIZE OPTISPLUS="%{optflags}" %install -mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates +mkdir -p %{buildroot}%{_fillupdir} install -d -m 755 %{buildroot}/%{_bindir} install -m 755 BIN/fillup %{buildroot}/%{_bindir} install -d %{buildroot}/%{_mandir}/man8
commit fillup for openSUSE:Factory
Hello community, here is the log from the commit of package fillup for openSUSE:Factory checked in at 2014-11-07 14:07:13 Comparing /work/SRC/openSUSE:Factory/fillup (Old) and /work/SRC/openSUSE:Factory/.fillup.new (New) Package is "fillup" Changes: --- /work/SRC/openSUSE:Factory/fillup/fillup.changes2012-02-14 11:23:57.0 +0100 +++ /work/SRC/openSUSE:Factory/.fillup.new/fillup.changes 2014-11-07 14:07:15.0 +0100 @@ -1,0 +2,18 @@ +Mon Nov 3 13:09:25 UTC 2014 - tchva...@suse.com + +- Also return back the /bin/fillup provides line + +--- +Fri Oct 31 12:02:57 UTC 2014 - dims...@opensuse.org + +- Keep /bin/fillup as a symlink in the package: there are hundreds + of RPMs out there referencing it in the %post scriptlets, when + any of the %*fillup* macros was used. Even updating the macro + will not make the existing RPMs magically be fixed. + +--- +Sun Oct 26 09:10:04 UTC 2014 - tchva...@suse.com + +- Cleanup the mess in spec with spec-cleaner + +--- Other differences: -- ++ fillup.spec ++ --- /var/tmp/diff_new_pack.8SGpVI/_old 2014-11-07 14:07:16.0 +0100 +++ /var/tmp/diff_new_pack.8SGpVI/_new 2014-11-07 14:07:16.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package fillup # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,21 +17,21 @@ Name: fillup -Provides: aaa_base:/bin/fillup Version:1.42 Release:0 Summary:Tool for Merging Config Files License:GPL-2.0+ Group: System/Base +Url:http://github.com/openSUSE/fillup Source: fillup-%{version}.tar.bz2 -Patch: fillup-optflags.patch +Patch0: fillup-optflags.patch Patch1: fillup-warnings.dif Patch2: fillup-%{version}.dif Patch3: fillup-retval.dif Patch4: fillup-nodate.patch Patch5: fillup-1.42-cloexec.patch +Provides: aaa_base:/bin/fillup BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define fillup_info_entry * fillup: (fillup) fillup. SuSE-fillup-tool. %description fillup merges files that hold variables. A variable is defined by an @@ -41,54 +41,36 @@ %prep %setup -q -%patch +%patch0 %patch1 -p1 -%patch2 -p0 -%patch3 -p0 -%patch4 -p0 +%patch2 +%patch3 +%patch4 %patch5 %build -# -# Be sure that the tests for fillup are run in -# DEBUG mode for comparision with the references -# -# build time testing disabled when cross-compiling -%if !0%{?_crossbuild} -make %{?_smp_mflags} clean -make %{?_smp_mflags} testOPTISPLUS="$RPM_OPT_FLAGS" -# -# For the real world make clean and use the -# optimzed version. -# -make %{?_smp_mflags} clean -%else -# build system does not always honor CC; workaround: -echo -e "#!/bin/bash\nexec %__cc \"\$@\"" >gcc -chmod 755 gcc -export PATH=`pwd`:$PATH -%endif -make %{?_smp_mflags} compile COMPILE_OPTION=OPTIMIZE OPTISPLUS="$RPM_OPT_FLAGS" CC="%__cc" +make %{?_smp_mflags} compile COMPILE_OPTION=OPTIMIZE OPTISPLUS="%{optflags}" %install -mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates -# -# install fillup -# -install -d -m 755 $RPM_BUILD_ROOT/%{_bindir} -install -m 755 BIN/fillup $RPM_BUILD_ROOT/%{_bindir} -#UsrMerge +mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates +install -d -m 755 %{buildroot}/%{_bindir} +install -m 755 BIN/fillup %{buildroot}/%{_bindir} +install -d %{buildroot}/%{_mandir}/man8 +install -m 644 SGML/fillup.8.gz %{buildroot}/%{_mandir}/man8 + +#UsrMerge - There are literally hundreds of rpm scritps referencing /bin/fillup (suse macro) +# So let's at least keep the symlink there for now (DimStar - 2014-10-31) install -d -m 755 $RPM_BUILD_ROOT/bin ln -sf %{_bindir}/fillup $RPM_BUILD_ROOT/bin #EndUserMerge -install -d $RPM_BUILD_ROOT/%{_mandir}/man8 -install -m 644 SGML/fillup.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8 + +%check +make %{?_smp_mflags} testOPTISPLUS="%{optflags}" %files %defattr(-,root,root) -#UsrMerge +# rpm scriptlets still use this, based on %*fillup* macros /bin/fillup -#EndUserMerge %{_bindir}/fillup %{_mandir}/man8/fillup* -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fillup for openSUSE:Factory
Hello community, here is the log from the commit of package fillup for openSUSE:Factory checked in at 2012-02-14 11:23:53 Comparing /work/SRC/openSUSE:Factory/fillup (Old) and /work/SRC/openSUSE:Factory/.fillup.new (New) Package is "fillup", Maintainer is "mhruse...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/fillup/fillup.changes2011-10-04 18:09:28.0 +0200 +++ /work/SRC/openSUSE:Factory/.fillup.new/fillup.changes 2012-02-14 11:23:57.0 +0100 @@ -1,0 +2,5 @@ +Wed Feb 8 13:08:55 UTC 2012 - rschweik...@suse.com + +- place binary into /usr tree (UsrMerge project) + +--- Other differences: -- ++ fillup.spec ++ --- /var/tmp/diff_new_pack.AM8ycG/_old 2012-02-14 11:23:58.0 +0100 +++ /var/tmp/diff_new_pack.AM8ycG/_new 2012-02-14 11:23:58.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package fillup # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,14 +16,13 @@ # - Name: fillup -License:GPL-2.0+ -Group: System/Base Provides: aaa_base:/bin/fillup Version:1.42 -Release:257 +Release:0 Summary:Tool for Merging Config Files +License:GPL-2.0+ +Group: System/Base Source: fillup-%{version}.tar.bz2 Patch: fillup-optflags.patch Patch1: fillup-warnings.dif @@ -76,14 +75,21 @@ # # install fillup # +install -d -m 755 $RPM_BUILD_ROOT/%{_bindir} +install -m 755 BIN/fillup $RPM_BUILD_ROOT/%{_bindir} +#UsrMerge install -d -m 755 $RPM_BUILD_ROOT/bin -install -m 755 BIN/fillup $RPM_BUILD_ROOT/bin +ln -sf %{_bindir}/fillup $RPM_BUILD_ROOT/bin +#EndUserMerge install -d $RPM_BUILD_ROOT/%{_mandir}/man8 install -m 644 SGML/fillup.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8 %files %defattr(-,root,root) +#UsrMerge /bin/fillup +#EndUserMerge +%{_bindir}/fillup %{_mandir}/man8/fillup* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fillup for openSUSE:Factory
Hello community, here is the log from the commit of package fillup for openSUSE:Factory checked in at 2011-12-06 18:09:26 Comparing /work/SRC/openSUSE:Factory/fillup (Old) and /work/SRC/openSUSE:Factory/.fillup.new (New) Package is "fillup", Maintainer is "mhruse...@suse.com" Changes: Other differences: -- ++ fillup.spec ++ --- /var/tmp/diff_new_pack.qq1t1h/_old 2011-12-06 18:14:39.0 +0100 +++ /var/tmp/diff_new_pack.qq1t1h/_new 2011-12-06 18:14:39.0 +0100 @@ -18,7 +18,7 @@ Name: fillup -License:GPLv2+ +License:GPL-2.0+ Group: System/Base Provides: aaa_base:/bin/fillup Version:1.42 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fillup for openSUSE:Factory
Hello community, here is the log from the commit of package fillup for openSUSE:Factory checked in at Tue Oct 4 18:09:30 CEST 2011. --- openSUSE:Factory/fillup/fillup.changes 2011-09-23 01:57:43.0 +0200 +++ /mounts/work_src_done/STABLE/fillup/fillup.changes 2011-09-30 17:01:59.0 +0200 @@ -1,0 +2,6 @@ +Fri Sep 30 15:00:41 UTC 2011 - u...@suse.com + +- cross-build workarounds: disable %build section testing, use fake + gcc script to work around build system deficiencies + +--- calling whatdependson for head-i586 Other differences: -- ++ fillup.spec ++ --- /var/tmp/diff_new_pack.Am0mfT/_old 2011-10-04 18:09:28.0 +0200 +++ /var/tmp/diff_new_pack.Am0mfT/_new 2011-10-04 18:09:28.0 +0200 @@ -15,6 +15,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: fillup License:GPLv2+ Group: System/Base @@ -52,6 +54,8 @@ # Be sure that the tests for fillup are run in # DEBUG mode for comparision with the references # +# build time testing disabled when cross-compiling +%if !0%{?_crossbuild} make %{?_smp_mflags} clean make %{?_smp_mflags} testOPTISPLUS="$RPM_OPT_FLAGS" # @@ -59,7 +63,13 @@ # optimzed version. # make %{?_smp_mflags} clean -make %{?_smp_mflags} compile COMPILE_OPTION=OPTIMIZE OPTISPLUS="$RPM_OPT_FLAGS" +%else +# build system does not always honor CC; workaround: +echo -e "#!/bin/bash\nexec %__cc \"\$@\"" >gcc +chmod 755 gcc +export PATH=`pwd`:$PATH +%endif +make %{?_smp_mflags} compile COMPILE_OPTION=OPTIMIZE OPTISPLUS="$RPM_OPT_FLAGS" CC="%__cc" %install mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fillup for openSUSE:Factory
Hello community, here is the log from the commit of package fillup for openSUSE:Factory checked in at Tue Sep 20 12:54:33 CEST 2011. --- fillup/fillup.changes 2011-05-21 22:36:25.0 +0200 +++ /mounts/work_src_done/STABLE/fillup/fillup.changes 2011-09-19 02:14:48.0 +0200 @@ -1,0 +2,6 @@ +Sun Sep 18 17:17:12 UTC 2011 - jeng...@medozas.de + +- Apply packaging guidelines (remove redundant/obsolete + tags/sections from specfile, etc.) + +--- calling whatdependson for head-i586 Other differences: -- ++ fillup.spec ++ --- /var/tmp/diff_new_pack.tJBVFK/_old 2011-09-20 12:54:30.0 +0200 +++ /var/tmp/diff_new_pack.tJBVFK/_new 2011-09-20 12:54:30.0 +0200 @@ -15,14 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: fillup License:GPLv2+ Group: System/Base Provides: aaa_base:/bin/fillup -AutoReqProv:on Version:1.42 Release:257 Summary:Tool for Merging Config Files @@ -42,12 +38,6 @@ delimiter, and a related variable value. A variable is determined by its variable name. - - -Authors: - -Joerg Dippel - %prep %setup -q %patch @@ -81,9 +71,6 @@ install -d $RPM_BUILD_ROOT/%{_mandir}/man8 install -m 644 SGML/fillup.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8 -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) /bin/fillup Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fillup for openSUSE:Factory
Hello community, here is the log from the commit of package fillup for openSUSE:Factory checked in at Thu Jun 16 10:41:37 CEST 2011. --- fillup/fillup.changes 2010-06-28 08:48:33.0 +0200 +++ /mounts/work_src_done/STABLE/fillup/fillup.changes 2011-05-21 22:36:25.0 +0200 @@ -1,0 +2,6 @@ +Sat May 21 20:34:06 UTC 2011 - crrodrig...@opensuse.org + +- Open all file descriptors with O_CLOEXEC +- handle out-of-disk-space situations somewhat better. + +--- calling whatdependson for head-i586 New: fillup-1.42-cloexec.patch Other differences: -- ++ fillup.spec ++ --- /var/tmp/diff_new_pack.UX2KtZ/_old 2011-06-16 10:39:50.0 +0200 +++ /var/tmp/diff_new_pack.UX2KtZ/_new 2011-06-16 10:39:50.0 +0200 @@ -1,7 +1,7 @@ # -# spec file for package fillup (Version 1.42) +# spec file for package fillup # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ Provides: aaa_base:/bin/fillup AutoReqProv:on Version:1.42 -Release:246 +Release:257 Summary:Tool for Merging Config Files Source: fillup-%{version}.tar.bz2 Patch: fillup-optflags.patch @@ -32,6 +32,7 @@ Patch2: fillup-%{version}.dif Patch3: fillup-retval.dif Patch4: fillup-nodate.patch +Patch5: fillup-1.42-cloexec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define fillup_info_entry * fillup: (fillup) fillup. SuSE-fillup-tool. @@ -49,11 +50,12 @@ %prep %setup -q -%patch -p1 +%patch %patch1 -p1 %patch2 -p0 %patch3 -p0 %patch4 -p0 +%patch5 %build # ++ fillup-1.42-cloexec.patch ++ --- SRC/services.c.orig +++ SRC/services.c @@ -342,7 +342,7 @@ openFileForReading { Service_t returnValue; -*filePointer = fopen( filename, "r" ); +*filePointer = fopen( filename, "re" ); if( *filePointer == NULL ) { fillup_exception( __FILE__, __LINE__, ServiceException, @@ -368,7 +368,7 @@ openFileForWriting { Service_t returnValue; -*filePointer = fopen( filename, "w" ); +*filePointer = fopen( filename, "we" ); if( *filePointer == NULL ) { fillup_exception( __FILE__, __LINE__, ServiceException, ++ fillup-1.42.dif ++ --- /var/tmp/diff_new_pack.UX2KtZ/_old 2011-06-16 10:39:50.0 +0200 +++ /var/tmp/diff_new_pack.UX2KtZ/_new 2011-06-16 10:39:50.0 +0200 @@ -1,6 +1,6 @@ SRC/consume.c -+++ SRC/consume.c 2005-09-02 12:44:00.0 +0200 -@@ -140,7 +140,7 @@ +--- SRC/consume.c.orig SRC/consume.c +@@ -140,7 +140,7 @@ consumeUptoBreak { break; /* line break detected */ } @@ -9,9 +9,9 @@ { break; /* End-Of-File detected */ } SRC/file.c -+++ SRC/file.c 2005-09-02 12:44:00.0 +0200 -@@ -35,18 +35,34 @@ +--- SRC/file.c.orig SRC/file.c +@@ -35,18 +35,34 @@ readFile File_t returnValue; FILE * filePointer; longfileLength; @@ -52,9 +52,9 @@ addToWatchdog( fileLength ); associateBuffer( fileSpecifier, fileLength, &buffer ); returnValue = FileOperationsSuccessful; SRC/parameters.c -+++ SRC/parameters.c 2005-09-02 12:44:00.0 +0200 -@@ -368,6 +368,13 @@ +--- SRC/parameters.c.orig SRC/parameters.c +@@ -368,6 +368,13 @@ queryParameter } break; @@ -68,9 +68,18 @@ case IgnoreDefinites: if( parameterIgnoreDefinites == IsSet ) { SRC/parser.c -+++ SRC/parser.c 2005-09-02 12:44:00.0 +0200 -@@ -296,6 +296,7 @@ +--- SRC/parser.c.orig SRC/parser.c +@@ -19,7 +19,7 @@ + /*- IMPORTS --*/ + + #include +- ++#include + #include "portab.h" + #include "variableblock.h" + #include "parameters.h" +@@ -296,6 +296,7 @@ createAdministrationInfo unsigned long Size; char * delimiterString; char delimiterChar; @@ -78,7 +87,7 @@ queryStringParameter( Delimiter, &delimiterString ); delimiterChar = delimiterString[ 0 ]; -@@ -305,23 +306,25 @@ +@@ -305,23 +306,25 @@ createAdministrationInfo countDelimiters( delimiterChar, baseFileBuffer, baseFileBufferLength ); baseFileBlocksLength++;/* add possible trailing comment */ Size = baseFileBlocksLength * sizeof( VariableBlock_t ); @@ -106,7 +115,7 @@