Hello community,
here is the log from the commit of package snipl for openSUSE:Factory checked
in at 2015-05-06 07:48:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/snipl (Old)
and /work/SRC/openSUSE:Factory/.snipl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "snipl"
Changes:
--------
--- /work/SRC/openSUSE:Factory/snipl/snipl.changes 2014-01-23
15:56:45.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.snipl.new/snipl.changes 2015-05-06
07:48:37.000000000 +0200
@@ -1,0 +2,11 @@
+Mon Mar 23 23:20:15 UTC 2015 - dims...@opensuse.org
+
+- BuildRequire libnet-devel instead of libnet: the library was
+ repackaged according the shared library packaging policy.
+
+-------------------------------------------------------------------
+Tue Jan 21 03:45:30 UTC 2014 - mp...@suse.com
+
+- Changed the license information in the spec file to CPL-1.0 and SUSE-NonFree.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ snipl.spec ++++++
--- /var/tmp/diff_new_pack.oW4Hb3/_old 2015-05-06 07:48:38.000000000 +0200
+++ /var/tmp/diff_new_pack.oW4Hb3/_new 2015-05-06 07:48:38.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package snipl
#
-# Copyright (c) 2009-2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -21,12 +21,12 @@
Version: 0.2.3.1
Release: 0
Summary: Simple Network IPL
-License: CPL-1.0
+License: CPL-1.0 and SUSE-NonFree
Group: System/Management
BuildRequires: dos2unix
BuildRequires: glib2-devel
BuildRequires: libglue-devel
-BuildRequires: libnet
+BuildRequires: libnet-devel
BuildRequires: unzip
%if 0%{?suse_version} >= 1130
BuildRequires: libnet-devel
@@ -40,6 +40,7 @@
Source4: dmsvsma.x
Source5: Z125-5589-05.txt
Source6: hwmcaapi.x86_64.zip
+Source99: hwmcaapi.download
Patch1: snipl-0.2.3.1-hwmcaapidir.patch
Patch2: snipl-enable-x86_64-arch.patch
++++++ snipl-0.2.3.1-hwmcaapidir.patch ++++++
--- /var/tmp/diff_new_pack.oW4Hb3/_old 2015-05-06 07:48:38.000000000 +0200
+++ /var/tmp/diff_new_pack.oW4Hb3/_new 2015-05-06 07:48:38.000000000 +0200
@@ -4,8 +4,8 @@
GROUP = $(shell id -gn)
GLIB2_HEADERS = `pkg-config --cflags glib-2.0`
--CFLAGS += -DUNIX=1 -DST_TEXTDOMAIN='"stonith"' -g -O2 -Wall -I. -I$(INCDIR)
-I$(STONITHINCDIR) -I$(HEARTBEATINCDIR)
-+CFLAGS += -DUNIX=1 -DST_TEXTDOMAIN='"stonith"' -g -O2 -Wall -I. -I$(INCDIR)
-I$(HWMCAAPI_DIR)/usr/include -I$(STONITHINCDIR) -I$(HEARTBEATINCDIR)
+-CFLAGS += -DUNIX=1 -DST_TEXTDOMAIN='"stonith"' -g -O2 -Wall -I. -I$(INCDIR)
-I$(STONITHINCDIR) -I$(HEARTBEATINCDIR) -D_FORTIFY_SOURCE=2
++CFLAGS += -DUNIX=1 -DST_TEXTDOMAIN='"stonith"' -g -O2 -Wall -I. -I$(INCDIR)
-I$(HWMCAAPI_DIR)/usr/include -I$(STONITHINCDIR) -D_FORTIFY_SOURCE=2
-I$(HEARTBEATINCDIR)
all: all_snconfig all_sniplapi all_vmsmapi all_snipl all_sncap all_stonith
install: install_subdirs install_snconfig install_sniplapi install_vmsmapi
install_snipl install_sncap install_stonith
++++++ snipl-0.2.3.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snipl-0.2.3.1/Makefile new/snipl-0.2.3.1/Makefile
--- old/snipl-0.2.3.1/Makefile 2014-01-17 09:25:33.000000000 +0100
+++ new/snipl-0.2.3.1/Makefile 2014-01-23 10:22:42.000000000 +0100
@@ -42,7 +42,7 @@
GROUP = $(shell id -gn)
GLIB2_HEADERS = `pkg-config --cflags glib-2.0`
-CFLAGS += -DUNIX=1 -DST_TEXTDOMAIN='"stonith"' -g -O2 -Wall -I. -I$(INCDIR)
-I$(STONITHINCDIR) -I$(HEARTBEATINCDIR)
+CFLAGS += -DUNIX=1 -DST_TEXTDOMAIN='"stonith"' -g -O2 -Wall -I. -I$(INCDIR)
-I$(STONITHINCDIR) -I$(HEARTBEATINCDIR) -D_FORTIFY_SOURCE=2
all: all_snconfig all_sniplapi all_vmsmapi all_snipl all_sncap all_stonith
install: install_subdirs install_snconfig install_sniplapi install_vmsmapi
install_snipl install_sncap install_stonith
@@ -168,7 +168,7 @@
$(LINK.c) -o snipl -L. -L${LIBDIR} snipl.o prepare.o -lnsl -ldl
-lsnconfig $(LIB_VM) $(LIB_ZVM) $(LIB_LPAR)
snipl.o: snipl.h snipl.c
- $(CC) $(CFLAGS) $(LPAR_INCLUDED) $(VM_INCLUDED) -c snipl.c
+ $(CC) $(CFLAGS) -Wno-unused $(LPAR_INCLUDED) $(VM_INCLUDED) -c snipl.c
prepare.o: snipl.h prepare.c
$(CC) $(CFLAGS) -c prepare.c
@@ -233,7 +233,7 @@
$(CC) $(CFLAGS) -c sncap.c
sncapjob.o: sncapjob.c sncapjob.h sncaputil.h sncapconf.h
- $(CC) $(CFLAGS) -c sncapjob.c
+ $(CC) $(CFLAGS) -c -Wno-unused sncapjob.c
sncaputil.o: sncaputil.c sncaputil.h
$(CC) $(CFLAGS) -c sncaputil.c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snipl-0.2.3.1/README.snipl
new/snipl-0.2.3.1/README.snipl
--- old/snipl-0.2.3.1/README.snipl 2014-01-17 09:25:33.000000000 +0100
+++ new/snipl-0.2.3.1/README.snipl 2014-01-23 10:22:42.000000000 +0100
@@ -85,6 +85,7 @@
- rename config.c into snconfig.c and libconfig.so into libsnconfig.so
to avoid name clash with other package
- Makefile adaptions for gcc-4.8
+ - adapt lic_vps.c to libglue-devel-1.0.12
2.3.0
Changes:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snipl-0.2.3.1/lic_vps.c new/snipl-0.2.3.1/lic_vps.c
--- old/snipl-0.2.3.1/lic_vps.c 2014-01-17 09:25:33.000000000 +0100
+++ new/snipl-0.2.3.1/lic_vps.c 2014-01-23 10:22:42.000000000 +0100
@@ -39,7 +39,7 @@
static StonithPlugin * lic_vps_new(const char *);
static void lic_vps_destroy(StonithPlugin *);
static const char * lic_vps_getinfo(StonithPlugin * s, int InfoType);
-static const char** lic_vps_get_confignames(StonithPlugin *);
+static const char* const* lic_vps_get_confignames(StonithPlugin *);
static int lic_vps_set_config(StonithPlugin *, StonithNVpair *);
static int lic_vps_status(StonithPlugin * );
static int lic_vps_reset_req(StonithPlugin * s,
@@ -615,7 +615,7 @@
return ret;
}
-static const char**
+static const char* const*
lic_vps_get_confignames(StonithPlugin* p)
{
static const char * names[] = {LIC_COMPAT, LIC_CONFIG, NULL};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snipl-0.2.3.1/sncapjob.c new/snipl-0.2.3.1/sncapjob.c
--- old/snipl-0.2.3.1/sncapjob.c 2014-01-17 09:25:33.000000000 +0100
+++ new/snipl-0.2.3.1/sncapjob.c 2014-01-23 10:22:42.000000000 +0100
@@ -750,6 +750,7 @@
struct config_property *CPC_id_property = NULL;
char *CPC_id_alias = NULL;
char password[81];
+ char *c;
struct termios initialrsettings;
struct termios newrsettings;
@@ -832,7 +833,7 @@
goto cleanup;
} else {
printf("Enter password: ");
- fgets(password, 80, stdin);
+ c = fgets(password, 80, stdin);
tcsetattr(fileno(stdin),
TCSAFLUSH | TCSANOW,
&initialrsettings);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snipl-0.2.3.1/snipl.8 new/snipl-0.2.3.1/snipl.8
--- old/snipl-0.2.3.1/snipl.8 2014-01-17 09:25:33.000000000 +0100
+++ new/snipl-0.2.3.1/snipl.8 2014-01-23 10:22:42.000000000 +0100
@@ -177,7 +177,7 @@
.TP
\fB\-\-load_timeout\fR \fI<timeout>\fR
specifies the maximum time for load completion in seconds. The timeout must be
-between 60 and 600 seconds. The default tiemout is 60 seconds.
+between 60 and 600 seconds. The default timeout is 60 seconds.
If the timeout expires, control is returned without an indication
about the success of the IPL operation.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snipl-0.2.3.1/snipl.c new/snipl-0.2.3.1/snipl.c
--- old/snipl-0.2.3.1/snipl.c 2014-01-17 09:25:33.000000000 +0100
+++ new/snipl-0.2.3.1/snipl.c 2014-01-23 10:22:42.000000000 +0100
@@ -261,6 +261,7 @@
static void prompt_for_password (char *password)
{
struct termios initialrsettings, newrsettings;
+ char *c;
tcgetattr(fileno(stdin), &initialrsettings);
newrsettings = initialrsettings;
@@ -269,7 +270,7 @@
fprintf(stderr, "Could not set attributes\n");
} else {
printf("Enter password: ");
- fgets(password, 80, stdin);
+ c = fgets(password, 80, stdin);
tcsetattr(fileno(stdin), TCSAFLUSH | TCSANOW,
&initialrsettings);
printf("\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snipl-0.2.3.1/sniplapi.c new/snipl-0.2.3.1/sniplapi.c
--- old/snipl-0.2.3.1/sniplapi.c 2014-01-17 09:25:33.000000000 +0100
+++ new/snipl-0.2.3.1/sniplapi.c 2014-01-23 10:22:42.000000000 +0100
@@ -1603,7 +1603,7 @@
fprintf(stderr, errstr);
fflush(stderr);
if (image->server->priv->msgfile)
- write(image->server->priv->msgfile,
+ rc = write(image->server->priv->msgfile,
errstr, strlen(errstr));
rc =
HwmcaTerminate(&image->server->priv->snmp_notify,
image->server->timeout);
