- updated to 1.0.0.rc16-3

- updated optflags,unsigned patches
- removed obsolete fix,as-needed patches
- added format patch (fixes build with -Werror=format-security)

diff --git a/dmraid-as-needed.patch b/dmraid-as-needed.patch
deleted file mode 100644 (file)
index 720131f..0000000
--- a/dmraid-as-needed.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- dmraid/lib/Makefile.in     2006-07-30 22:48:53.000000000 +0000
-+++ dmraid.as-needed/lib/Makefile.in   2006-07-30 22:52:10.000000000 +0000
-@@ -53,6 +53,24 @@
-   endif
- endif
- 
-+ifeq ("@KLIBC@", "yes")
-+      DMRAIDLIBS += -ldevmapper_klibc
-+else
-+      ifeq ("@DIETLIBC@", "yes")
-+              DMRAIDLIBS += -ldevmapper_dietc
-+      else
-+              DMRAIDLIBS += -ldevmapper -lz -ludev -lrt
-+      endif
-+
-+#     ifeq ("@LIBSELINUX@", "yes")
-+#             DMRAIDLIBS += -lselinux
-+#     endif
-+#
-+#     ifeq ("@LIBSEPOL@", "yes")
-+#             DMRAIDLIBS += -lsepol
-+#     endif
-+endif
-+
- all:
-       @echo "$(TARGETS) $(INSTALL_TARGETS)"
- 
---- dmraid/make.tmpl.in        2006-07-30 22:55:01.000000000 +0000
-+++ dmraid.as-needed/make.tmpl.in      2006-07-30 22:57:38.000000000 +0000
-@@ -129,7 +129,7 @@
- 
- %.so: $(OBJECTS)
-       $(CC) -shared -Wl,-soname,$(notdir $@).$(DMRAID_LIB_VERSION) \
--      -Wl,--version-script,.export.sym $(OBJECTS) -o $@
-+      -Wl,--version-script,.export.sym $(LDFLAGS) -o $@ $(OBJECTS) $(DMRAIDLIBS)
- 
- $(LIB_STATIC): $(OBJECTS)
-       $(RM) $@
---- dmraid/tools/Makefile.in~  2012-04-28 19:52:38.890744695 +0200
-+++ dmraid/tools/Makefile.in   2012-04-28 21:10:18.659323226 +0200
-@@ -30,7 +30,7 @@
-       ifeq ("@DIETLIBC@", "yes")
-               DMRAIDLIBS += -ldevmapper_dietc
-       else
--              DMRAIDLIBS += -ldevmapper
-+              DMRAIDLIBS += -ldevmapper -ludev -lrt
-       endif
- 
-       ifeq ("@LIBSELINUX@", "yes")

diff --git a/dmraid-fix.patch b/dmraid-fix.patch
deleted file mode 100644 (file)
index 770441a..0000000
--- a/dmraid-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dmraid/lib/Makefile.in.orig        2006-02-17 17:19:25.000000000 +0100
-+++ dmraid/lib/Makefile.in     2006-05-23 00:19:13.798639000 +0200
-@@ -66,7 +65,7 @@
-       for f in $(INSTALL_TARGETS); \
-       do \
-               n=$$(basename $${f}) ; \
--              if [[ "$$n" =~ '.so$$' ]]; then \
-+              if echo "$$n" | grep -q '.so$$'; then \
-                       $(INSTALL) -m 555 $(STRIP) \
-                               $$f $(libdir)/$${n}.@DMRAID_LIB_VERSION@; \
-                       $(LN_S) -f $${n}.@DMRAID_LIB_VERSION@ $(libdir)/$${n}; \

diff --git a/dmraid-format.patch b/dmraid-format.patch
new file mode 100644 (file)
index 0000000..ec00c0b
--- /dev/null
+++ b/dmraid-format.patch
@@ -0,0 +1,18 @@
+--- dmraid/lib/events/libdmraid-events-isw.c.orig      2010-03-18 17:53:17.000000000 +0100
++++ dmraid/lib/events/libdmraid-events-isw.c   2013-10-16 18:53:56.614062315 +0200
+@@ -824,13 +824,13 @@
+ 
+       sz = _log_all_devs(log_type, rs, NULL, 0);
+       if (!sz) {
+-              syslog(LOG_ERR, msg[0]);
++              syslog(LOG_ERR, "%s", msg[0]);
+               return;
+       }
+ 
+       str = dm_malloc(++sz);
+       if (!str) {
+-              syslog(LOG_ERR, msg[1]);
++              syslog(LOG_ERR, "%s", msg[1]);
+               return;
+       }
+ 

diff --git a/dmraid-optflags.patch b/dmraid-optflags.patch
index 97f7069d3475f44c01daa4d92b5cd1f97b035fa5..b105fac8128b34e79a43a02aa0272bd2a9fa0b55 100644 (file)
--- a/dmraid-optflags.patch
+++ b/dmraid-optflags.patch
@@ -1,12 +1,12 @@
---- dmraid/configure.in.orig   2006-02-17 21:15:43.000000000 +0100
-+++ dmraid/configure.in        2006-05-23 00:35:44.244538000 +0200
-@@ -52,7 +52,6 @@
- if test x$KLIBC != xyes; then
+--- dmraid/configure.in.orig   2013-10-16 17:12:55.254316687 +0200
++++ dmraid/configure.in        2013-10-16 17:27:29.530946663 +0200
+@@ -76,7 +76,6 @@
+ if test "$KLIBC" != yes; then
        case "$host_os" in
                linux*)
 -                      CFLAGS=-O2
-                       CLDFLAGS="-Wl,--version-script,.export.sym"
-                       LD_DEPS=".export.sym"
+                       CLDFLAGS='-Wl,--version-script,$(top_srcdir)/lib/.export.sym'
+                       LD_DEPS='$(top_srcdir)/lib/.export.sym'
                        SOFLAG="-shared" ;;
 --- dmraid/make.tmpl.in.orig   2006-02-17 17:18:27.000000000 +0100
 +++ dmraid/make.tmpl.in        2006-05-23 00:38:24.990584000 +0200
@@ -30,13 +30,13 @@
      CFLAGS+=-Os
    endif
  endif
---- dmraid/lib/Makefile.in.orig        2006-05-23 00:31:05.387110000 +0200
-+++ dmraid/lib/Makefile.in     2006-05-23 00:38:49.340105750 +0200
-@@ -46,6 +46,7 @@
- 
+--- dmraid/lib/Makefile.in.orig        2013-10-16 17:12:55.267650018 +0200
++++ dmraid/lib/Makefile.in     2013-10-16 17:46:41.204231665 +0200
+@@ -65,6 +65,7 @@
  ifeq ("@KLIBC@", "no")
-   ifeq ("@LIB_SO@", "yes")
-+    CFLAGS += -fPIC
-     LIB_SHARED=$(top_srcdir)/lib/libdmraid.so
-     TARGETS += $(LIB_SHARED)
-     INSTALL_TARGETS += $(LIB_SHARED)
+       ifeq ("@STATIC_LINK@", "no")
+               TARGETS += $(LIB_SHARED) $(LIB_EVENTS_SHARED)
++              CFLAGS += -fPIC
+       endif
+ endif
+ 

diff --git a/dmraid-unsigned.patch b/dmraid-unsigned.patch
index 3297314079ae2e1b695c9ed52a754532b63575cd..09019dc77cb1b16268cbc76111601c1ee8c99ef6 100644 (file)
--- a/dmraid-unsigned.patch
+++ b/dmraid-unsigned.patch
@@ -1,12 +1,11 @@
-diff -ur dmraid/lib/activate/devmapper.c dmraid-diet/lib/activate/devmapper.c
---- dmraid/lib/activate/devmapper.c    2008-06-20 18:03:04.000000000 +0200
-+++ dmraid-diet/lib/activate/devmapper.c       2009-03-18 13:06:21.000000000 +0100
+--- dmraid/lib/activate/devmapper.c.orig       2013-10-16 17:54:02.540879810 +0200
++++ dmraid/lib/activate/devmapper.c    2013-10-16 18:24:23.520803391 +0200
 @@ -164,7 +164,7 @@
   * Return 1 for sucess; 0 for failure*/
  static int
  dmraid_uuid(struct lib_context *lc, struct raid_set *rs,
--          char *uuid, uint uuid_len)
-+          char *uuid, unsigned int uuid_len)
+-          char *uuid, uint uuid_len, char *name)
++          char *uuid, unsigned int uuid_len, char *name)
  {
        int r;
  

diff --git a/dmraid.spec b/dmraid.spec
index c01df4ec60afbfce7dc5b03a5c359024984226c7..89a06af9c02af42645e130c17f89243b916c1301 100644 (file)
--- a/dmraid.spec
+++ b/dmraid.spec
@@ -8,18 +8,17 @@ Summary:      Device-mapper RAID tool
 Summary(pl.UTF-8):     Narzędzie do RAID-u opartego o device-mapper
 Name:          dmraid
 Version:       1.0.0
-%define        _rc     rc15
-Release:       0.%{_rc}.6
-License:       GPL
+%define        subver  rc16.3
+Release:       0.%{subver}.1
+License:       GPL v2+
 Group:         Base
-Source0:       http://people.redhat.com/~heinzm/sw/dmraid/src/%{name}-%{version}.%{_rc}.tar.bz2
-# Source0-md5: 2602887205a35f89b59eeba3a868150f
+Source0:       http://people.redhat.com/~heinzm/sw/dmraid/src/%{name}-%{version}.rc16-3.tar.bz2
+# Source0-md5: 819338fcef98e8e25819f0516722beeb
 Patch0:                %{name}-selinux-static.patch
-Patch1:                %{name}-fix.patch
-Patch2:                %{name}-optflags.patch
-Patch3:                %{name}-as-needed.patch
-Patch4:                %{name}-unsigned.patch
-Patch5:                %{name}-diet.patch
+Patch1:                %{name}-optflags.patch
+Patch2:                %{name}-unsigned.patch
+Patch3:                %{name}-diet.patch
+Patch4:                %{name}-format.patch
 URL:           http://people.redhat.com/~heinzm/sw/dmraid/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -100,13 +99,12 @@ Statycznie skonsolidowana wersja programu narzędziowego dmraid.
 
 %prep
 %setup -q -n %{name}
-mv */* ./
+mv %{version}.*/dmraid/* .
 %{?with_selinux:%patch0 -p2}
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %build
 cp -f /usr/share/automake/config.sub autoconf
@@ -141,10 +139,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/%{_lib}
 
 %{__make} install \
-       includedir=$RPM_BUILD_ROOT%{_includedir} \
-       libdir=$RPM_BUILD_ROOT%{_libdir} \
-       mandir=$RPM_BUILD_ROOT%{_mandir} \
-       sbindir=$RPM_BUILD_ROOT%{_sbindir}
+       DESTDIR=$RPM_BUILD_ROOT
 
 mv $RPM_BUILD_ROOT%{_libdir}/libdmraid.so.* $RPM_BUILD_ROOT/%{_lib}
 ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib} ; echo libdmraid.so.*.*.*) \
@@ -163,10 +158,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README TODO doc/dmraid_design.txt
+%doc CHANGELOG CREDITS KNOWN_BUGS README TODO doc/dmraid_design.txt
+%attr(755,root,root) %{_sbindir}/dmevent_tool
 %attr(755,root,root) %{_sbindir}/dmraid
 %attr(755,root,root) /%{_lib}/libdmraid.so.*.*.*
-%{_mandir}/man8/*
+%attr(755,root,root) %ghost /%{_lib}/libdmraid.so.1
+%attr(755,root,root) %{_libdir}/libdmraid-events-isw.so
+%attr(755,root,root) %{_libdir}/device-mapper/libdmraid-events-isw.so
+%{_mandir}/man8/dmevent_tool.8*
+%{_mandir}/man8/dmraid.8*
 
 %files devel
 %defattr(644,root,root,755)