commit scpm for openSUSE:Factory
Hello community,
here is the log from the commit of package scpm for openSUSE:Factory checked in
at 2014-11-26 10:33:40
Comparing /work/SRC/openSUSE:Factory/scpm (Old)
and /work/SRC/openSUSE:Factory/.scpm.new (New)
Package is "scpm"
Changes:
--- /work/SRC/openSUSE:Factory/scpm/scpm.changes2014-05-02
14:03:13.0 +0200
+++ /work/SRC/openSUSE:Factory/.scpm.new/scpm.changes 2014-11-26
10:33:43.0 +0100
@@ -1,0 +2,7 @@
+Sun Nov 23 06:04:00 UTC 2014 - Led
+
+- fix shebang in scripts that contains bash-specific constructions
+- add patches:
+ * scpm-1.1.7-fix-shebang.patch
+
+---
New:
scpm-1.1.7-fix-shebang.patch
Other differences:
--
++ scpm.spec ++
--- /var/tmp/diff_new_pack.qbrd83/_old 2014-11-26 10:33:44.0 +0100
+++ /var/tmp/diff_new_pack.qbrd83/_new 2014-11-26 10:33:44.0 +0100
@@ -45,6 +45,7 @@
Patch8: scpm-constification.patch
Patch9: scpm-doc_config.patch
Patch10:scpm-md5.patch
+Patch11:scpm-1.1.7-fix-shebang.patch
Requires: diffutils
Requires: textutils
Requires(post): awk
@@ -90,6 +91,8 @@
%patch8
%patch9
%patch10 -p1
+%patch11 -p1
+
%build
export CXXFLAGS="%{optflags} -fvisibility-inlines-hidden"
echo -e "#!/bin/bash\n$(which %__cxx) \"\$@\"" >g++
++ scpm-1.1.7-fix-shebang.patch ++
diff -Ndur scpm-1.1.7/lib/file_get_all scpm-1.1.7-fix-shebang/lib/file_get_all
--- scpm-1.1.7/lib/file_get_all 2005-12-13 18:30:15.0 +0200
+++ scpm-1.1.7-fix-shebang/lib/file_get_all 2014-11-23 08:00:47.307548981
+0200
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# $Id: file_get_all,v 1.2 2005/12/13 16:30:15 gleissner Exp $
#
diff -Ndur scpm-1.1.7/lib/run_script scpm-1.1.7-fix-shebang/lib/run_script
--- scpm-1.1.7/lib/run_script 2005-05-11 12:03:12.0 +0300
+++ scpm-1.1.7-fix-shebang/lib/run_script 2014-11-23 07:58:57.365543036
+0200
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# $Id: run_script,v 1.1.1.1 2005/05/11 09:03:12 gleissner Exp $
#
diff -Ndur scpm-1.1.7/lib/service_get_all
scpm-1.1.7-fix-shebang/lib/service_get_all
--- scpm-1.1.7/lib/service_get_all 2005-12-13 18:30:15.0 +0200
+++ scpm-1.1.7-fix-shebang/lib/service_get_all 2014-11-23 08:01:11.942550313
+0200
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# $Id: service_get_all,v 1.2 2005/12/13 16:30:15 gleissner Exp $
#
diff -Ndur scpm-1.1.7/lib/service_get_deps
scpm-1.1.7-fix-shebang/lib/service_get_deps
--- scpm-1.1.7/lib/service_get_deps 2005-12-13 18:30:15.0 +0200
+++ scpm-1.1.7-fix-shebang/lib/service_get_deps 2014-11-23 08:02:33.395554717
+0200
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# $Id: service_get_deps,v 1.2 2005/12/13 16:30:15 gleissner Exp $
#
diff -Ndur scpm-1.1.7/lib/write_boot_message
scpm-1.1.7-fix-shebang/lib/write_boot_message
--- scpm-1.1.7/lib/write_boot_message 2005-05-11 12:03:12.0 +0300
+++ scpm-1.1.7-fix-shebang/lib/write_boot_message 2014-11-23
07:59:15.335544008 +0200
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# $Id: write_boot_message,v 1.1.1.1 2005/05/11 09:03:12 gleissner Exp $
#
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit scpm for openSUSE:Factory
Hello community,
here is the log from the commit of package scpm for openSUSE:Factory checked in
at 2014-05-02 14:03:13
Comparing /work/SRC/openSUSE:Factory/scpm (Old)
and /work/SRC/openSUSE:Factory/.scpm.new (New)
Package is "scpm"
Changes:
--- /work/SRC/openSUSE:Factory/scpm/scpm.changes2012-09-13
00:06:54.0 +0200
+++ /work/SRC/openSUSE:Factory/.scpm.new/scpm.changes 2014-05-02
14:03:13.0 +0200
@@ -1,0 +2,8 @@
+Thu Apr 17 03:30:37 UTC 2014 - crrodrig...@opensuse.org
+
+- Use -fvisiblity-inlines-hidden
+- scpm-md5.patch: This is one of the remaining two packages
+ that still require abandonware library "mhash", replace
+ its usage with cryptopp so we can drop the package in question.
+
+---
New:
scpm-md5.patch
Other differences:
--
++ scpm.spec ++
--- /var/tmp/diff_new_pack.6fGbKJ/_old 2014-05-02 14:03:14.0 +0200
+++ /var/tmp/diff_new_pack.6fGbKJ/_new 2014-05-02 14:03:14.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package scpm
#
-# 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
@@ -23,8 +23,8 @@
BuildRequires: graphviz-gnome
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
-BuildRequires: mhash-devel
BuildRequires: xz
+BuildRequires: pkgconfig(cryptopp)
%if 0%{suse_version} > 1220
BuildRequires: makeinfo
%endif
@@ -44,6 +44,7 @@
Patch7: scpm-no_using_in_header.patch
Patch8: scpm-constification.patch
Patch9: scpm-doc_config.patch
+Patch10:scpm-md5.patch
Requires: diffutils
Requires: textutils
Requires(post): awk
@@ -88,9 +89,9 @@
%patch7
%patch8
%patch9
-
+%patch10 -p1
%build
-export CXXFLAGS="%{optflags}"
+export CXXFLAGS="%{optflags} -fvisibility-inlines-hidden"
echo -e "#!/bin/bash\n$(which %__cxx) \"\$@\"" >g++
chmod 755 g++
export PATH=`pwd`:$PATH
++ scpm-md5.patch ++
--- scpm-1.1.7.orig/src/main/modlib.cc
+++ scpm-1.1.7/src/main/modlib.cc
@@ -21,79 +21,44 @@
#include
#include
#include
-#include
#include
#include
#include
#include
#include
+#define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1
+#include
+#include
+#include
+#include
+
using namespace std;
+using namespace CryptoPP::Weak1;
+using namespace CryptoPP;
#define module_name "modlib"
string Modlib::GetMD5sum( string filename )
{
- int c;
- int fd;
- MHASH td;
- unsigned char buffer[4096];
- unsigned char *hash;
- static char hash_string[33];
- string hash_s;
-
- td = mhash_init(MHASH_MD5);
-
- if (td == MHASH_FAILED) return("__unknown");
-
- if ( (fd=open( filename.c_str(), O_RDONLY )) == -1 ) {
- return("__unknown");
- }
-
- while ( (c=read(fd, &buffer, 4096)) >0) {
- mhash(td, &buffer, c);
- }
-
- hash = (unsigned char *) mhash_end(td);
-
- for ( unsigned int i = 0; i < mhash_get_block_size(MHASH_MD5); i++) {
- sprintf(&hash_string[i*2], "%.2x", hash[i]);
- }
-
- close(fd);
- hash_s = hash_string;
+MD5 hash;
+byte buffer[2 * MD5::DIGESTSIZE];
+
+FileSource f(filename.c_str(), true,
+ new HashFilter(hash,
+ new HexEncoder(new ArraySink(buffer,2 * MD5::DIGESTSIZE),
false)));
- return hash_s;
+return string((const char*)buffer,2 * MD5::DIGESTSIZE);
}
string Modlib::GetMD5sum( istream &input )
{
- int c;
- MHASH td;
- unsigned char buffer[4096];
- unsigned char *hash;
- static char hash_string[33];
- string hash_s;
-
- td = mhash_init(MHASH_MD5);
-
- if (td == MHASH_FAILED) return("__unknown");
-
- while ( input.get( (char*)buffer, 4096, '\0' ) ) {
- c = input.gcount();
- mhash(td, &buffer, c);
- }
-
- hash = (unsigned char *) mhash_end(td);
-
- for ( unsigned int i = 0; i < mhash_get_block_size(MHASH_MD5); i++) {
- sprintf(&hash_string[i*2], "%.2x", hash[i]);
- }
-
+MD5 hash;
+byte buffer[2 * MD5::DIGESTSIZE];
+FileSource f(input, true, new HashFilter(hash, new HexEncoder(new
ArraySink(buffer,2 * MD5::DIGESTSIZE), false)));
+return string((const char*)buffer,2 * MD5::DIGESTSIZE);
- hash_s = hash_string;
- return hash_s;
}
int Modlib::CallHandler( string resource_type, string resource_name,
--- scpm-1.1.7.orig/src/libscpm/Makefile
+
commit scpm for openSUSE:Factory
Hello community,
here is the log from the commit of package scpm for openSUSE:Factory checked in
at 2012-09-13 00:06:53
Comparing /work/SRC/openSUSE:Factory/scpm (Old)
and /work/SRC/openSUSE:Factory/.scpm.new (New)
Package is "scpm", Maintainer is "hsc...@novell.com"
Changes:
--- /work/SRC/openSUSE:Factory/scpm/scpm.changes2012-07-06
09:52:36.0 +0200
+++ /work/SRC/openSUSE:Factory/.scpm.new/scpm.changes 2012-09-13
00:06:54.0 +0200
@@ -1,0 +2,5 @@
+Wed Sep 12 05:07:02 UTC 2012 - co...@suse.com
+
+- add makeinfo as explicit buildrequire
+
+---
Other differences:
--
++ scpm.spec ++
--- /var/tmp/diff_new_pack.edTRBQ/_old 2012-09-13 00:06:55.0 +0200
+++ /var/tmp/diff_new_pack.edTRBQ/_new 2012-09-13 00:06:55.0 +0200
@@ -25,6 +25,9 @@
BuildRequires: libpng-devel
BuildRequires: mhash-devel
BuildRequires: xz
+%if 0%{suse_version} > 1220
+BuildRequires: makeinfo
+%endif
Summary:System Configuration Profile Management
License:GPL-2.0+
Group: System/Base
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit scpm for openSUSE:Factory
Hello community,
here is the log from the commit of package scpm for openSUSE:Factory checked in
at 2012-07-06 09:52:32
Comparing /work/SRC/openSUSE:Factory/scpm (Old)
and /work/SRC/openSUSE:Factory/.scpm.new (New)
Package is "scpm", Maintainer is "hsc...@novell.com"
Changes:
--- /work/SRC/openSUSE:Factory/scpm/scpm.changes2011-10-21
16:36:09.0 +0200
+++ /work/SRC/openSUSE:Factory/.scpm.new/scpm.changes 2012-07-06
09:52:36.0 +0200
@@ -1,0 +2,17 @@
+Thu Jul 5 11:53:42 CEST 2012 - p...@suse.de
+
+- Remove obsolete buildrequires for lzma.
+- Remove the empty %%clean line.
+
+---
+Wed Jul 4 12:37:46 CEST 2012 - p...@suse.de
+
+- Do the work SuSEconfig.scpm in post and thus get rid of this
+ SuSEconfig module (openfate#313547).
+- Require awk for post code to work.
+- Repackage as xz.
+- Don't use 'using namespace' in headers.
+- Remove useless typedefs that are ignored.
+- Buildrequire graphviz-gnome for png output.
+
+---
Old:
scpm-1.1.7.tar.lzma
New:
scpm-1.1.7.tar.xz
scpm-constification.patch
scpm-doc_config.patch
scpm-no_using_in_header.patch
scpm-remove_unneeded_typedef.patch
Other differences:
--
++ scpm.spec ++
--- /var/tmp/diff_new_pack.JnCmCQ/_old 2012-07-06 09:52:37.0 +0200
+++ /var/tmp/diff_new_pack.JnCmCQ/_new 2012-07-06 09:52:37.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package scpm
#
-# 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
@@ -15,24 +15,35 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: scpm
-BuildRequires: doxygen gcc-c++ graphviz libjpeg-devel libpng-devel lzma
mhash-devel
+BuildRequires: doxygen
+BuildRequires: gcc-c++
+BuildRequires: graphviz
+BuildRequires: graphviz-gnome
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: mhash-devel
+BuildRequires: xz
Summary:System Configuration Profile Management
-Version:1.1.7
-Release:10
-Group: System/Base
License:GPL-2.0+
-Source: scpm-%{version}.tar.lzma
+Group: System/Base
+Version:1.1.7
+Release:0
+Source: %{name}-%{version}.tar.xz
Source1:logrotate-scpm
Patch1: scpm-fix_boot_script.patch
Patch2: scpm-1.1.7-gcc44.patch
Patch3: scpm-1.1.7-no_static_linking.patch
Patch4: scpm-fix_link_order.patch
Patch5: scpm-header.patch
-Requires: diffutils textutils
+Patch6: scpm-remove_unneeded_typedef.patch
+Patch7: scpm-no_using_in_header.patch
+Patch8: scpm-constification.patch
+Patch9: scpm-doc_config.patch
+Requires: diffutils
+Requires: textutils
+Requires(post): awk
Recommends: logrotate
Suggests: %{name}-lang
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -44,42 +55,25 @@
time. It is the successor of scheme management.
-
-Authors:
-
-Joachim Gleissner
-
%package devel
-License:GPL-2.0+
Summary:Header files and API documentation for SCPM
-Provides: scpm:/usr/include/scpm.h
-Requires: scpm
Group: Development/Libraries/C and C++
+Provides: scpm:/usr/include/scpm.h
+Requires: %{name} = %{version}
%description devel
This package is only needed if you want to compile applications that
make use of libscpm.
-
-Authors:
-
-Joachim Gleissner
-
%packagelang
-License:GPL-2.0+
Summary:Localized messages for scpm
-Requires: scpm = %{version}
Group: Development/Libraries/C and C++
+Requires: scpm = %{version}
%description lang
This package contains the localized messages for scpm.
-
-Authors:
-
-Joachim Gleissner
-
%prep
%setup -q
%patch1 -p0
@@ -87,39 +81,40 @@
%patch3
%patch4
%patch5 -p1
+%patch6
+%patch7
+%patch8
+%patch9
%build
-export CXXFLAGS="$RPM_OPT_FLAGS"
-echo -e "#!/bin/bash\n`which %__cxx` \"\$@\"" >g++
+export CXXFLAGS="%{optflags}"
+echo -e "#!/bin/bash\n$(which %__cxx) \"\$@\"" >g++
chmod 755 g++
export PATH=`pwd`:$PATH
make
%install
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}
-mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
-mkdir -p $RPM_BUILD_ROOT/%{_var}/lib
-mkdir -p $RPM_BUILD_ROOT/%{_prefix}/include
-mkdir -p $RPM_BUILD_ROOT/%{_prefix}/share/locale/de/LC_MESSAGES
-mkdir -p $RPM_BUILD_RO
commit scpm for openSUSE:Factory
Hello community,
here is the log from the commit of package scpm for openSUSE:Factory checked in
at 2011-12-06 19:02:43
Comparing /work/SRC/openSUSE:Factory/scpm (Old)
and /work/SRC/openSUSE:Factory/.scpm.new (New)
Package is "scpm", Maintainer is "hsc...@novell.com"
Changes:
Other differences:
--
++ scpm.spec ++
--- /var/tmp/diff_new_pack.Nt5g5X/_old 2011-12-06 19:35:56.0 +0100
+++ /var/tmp/diff_new_pack.Nt5g5X/_new 2011-12-06 19:35:56.0 +0100
@@ -24,7 +24,7 @@
Version:1.1.7
Release:10
Group: System/Base
-License:GPLv2+
+License:GPL-2.0+
Source: scpm-%{version}.tar.lzma
Source1:logrotate-scpm
Patch1: scpm-fix_boot_script.patch
@@ -50,7 +50,7 @@
Joachim Gleissner
%package devel
-License:GPLv2+
+License:GPL-2.0+
Summary:Header files and API documentation for SCPM
Provides: scpm:/usr/include/scpm.h
Requires: scpm
@@ -67,7 +67,7 @@
Joachim Gleissner
%packagelang
-License:GPLv2+
+License:GPL-2.0+
Summary:Localized messages for scpm
Requires: scpm = %{version}
Group: Development/Libraries/C and C++
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit scpm for openSUSE:Factory
Hello community,
here is the log from the commit of package scpm for openSUSE:Factory
checked in at Tue Jun 21 09:38:55 CEST 2011.
--- scpm/scpm.changes 2010-09-15 16:09:48.0 +0200
+++ /mounts/work_src_done/STABLE/scpm/scpm.changes 2011-06-17
16:00:53.0 +0200
@@ -1,0 +2,5 @@
+Fri Jun 17 13:58:54 UTC 2011 - a...@suse.de
+
+- Fix build due to missing header file (scpm-header.patch).
+
+---
calling whatdependson for head-i586
New:
scpm-header.patch
Other differences:
--
++ scpm.spec ++
--- /var/tmp/diff_new_pack.vDtfqN/_old 2011-06-21 09:28:57.0 +0200
+++ /var/tmp/diff_new_pack.vDtfqN/_new 2011-06-21 09:28:57.0 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package scpm (Version 1.1.7)
+# spec file for package scpm
#
-# 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
@@ -22,7 +22,7 @@
BuildRequires: doxygen gcc-c++ graphviz libjpeg-devel libpng-devel lzma
mhash-devel
Summary:System Configuration Profile Management
Version:1.1.7
-Release:6
+Release:10
Group: System/Base
License:GPLv2+
Source: scpm-%{version}.tar.lzma
@@ -31,6 +31,7 @@
Patch2: scpm-1.1.7-gcc44.patch
Patch3: scpm-1.1.7-no_static_linking.patch
Patch4: scpm-fix_link_order.patch
+Patch5: scpm-header.patch
Requires: diffutils textutils
Recommends: logrotate
Suggests: %{name}-lang
@@ -85,6 +86,7 @@
%patch2
%patch3
%patch4
+%patch5 -p1
%build
export CXXFLAGS="$RPM_OPT_FLAGS"
++ scpm-header.patch ++
Index: scpm-1.1.7/src/main/executor.cc
===
--- scpm-1.1.7.orig/src/main/executor.cc
+++ scpm-1.1.7/src/main/executor.cc
@@ -30,6 +30,7 @@
#include
#include
#include
+#include
#define module_name "executor"
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
