[hnb] update to a 1.9.19

Dominik Mierzejewski rathann at fedoraproject.org
Thu Feb 27 22:05:26 UTC 2014 

commit 0036abd0c1f86e549fa96fb2bc0f050417fed5cd
Author: Dominik Mierzejewski <rpm at greysector.net>
Date:   Thu Feb 27 23:06:06 2014 +0100

    update to a 1.9.19
    
    - switch to fork from http://nomi.cz/download/releases/lhnb/
    - drop obsolete patches
    - drop obsolete specfile parts
    - fix -Werror=format-security errors (bug #1037122)
    - fix bogus date in changelog

 .gitignore                |    1 +
 hnb-compile.patch         |   23 -
 hnb-debian.patch          | 2243 ---------------------------------------------
 hnb-format-security.patch |   12 +
 hnb-rpm.patch             |   18 +-
 hnb.spec                  |   37 +-
 sources                   |    1 +
 7 files changed, 42 insertions(+), 2293 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 84e8605..e769611 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 hnb-1.9.18.pre7.tar.gz
 hnbrc.vi
+/lhnb-1.9.19.tar.gz
diff --git a/hnb-format-security.patch b/hnb-format-security.patch
new file mode 100644
index 0000000..e99515d
--- /dev/null
+++ b/hnb-format-security.patch
@@ -0,0 +1,12 @@
+diff -up hnb-1.9.18.pre7/src/libcli/cli.c.format-security hnb-1.9.18.pre7/src/libcli/cli.c
+--- hnb-1.9.18.pre7/src/libcli/cli.c.format-security	2004-05-09 17:28:11.000000000 +0200
++++ hnb-1.9.18.pre7/src/libcli/cli.c	2014-02-27 18:47:32.433436484 +0100
+@@ -57,7 +57,7 @@ static void default_output(char *data){
+ 				wp=word;
+ 				*wp='\0';
+ 			} else {
+-				printf(tbuf);printf("\n");
++				printf("%s",tbuf);printf("\n");
+ 				bp=tbuf;
+ 				*bp='\0';
+ 				strcpy(bp,word);
diff --git a/hnb-rpm.patch b/hnb-rpm.patch
index e300ad5..39b0d14 100644
--- a/hnb-rpm.patch
+++ b/hnb-rpm.patch
@@ -1,17 +1,19 @@
---- hnb-1.9.18/src/libcli/Makefile.r	2004-09-22 16:19:52.000000000 +0200
-+++ hnb-1.9.18/src/libcli/Makefile	2004-09-22 16:19:42.000000000 +0200
+diff -up lhnb-1.9.19/src/libcli/Makefile.r lhnb-1.9.19/src/libcli/Makefile
+--- lhnb-1.9.19/src/libcli/Makefile.r	2014-02-27 19:14:08.642033647 +0100
++++ lhnb-1.9.19/src/libcli/Makefile	2014-02-27 19:15:02.737189499 +0100
 @@ -1,4 +1,4 @@
--CFLAGS = -Wall
-+CFLAGS = -Wall $(RPM_OPT_FLAGS)
+-CFLAGS = -Wall -Werror -g
++CFLAGS = -Wall -g $(RPM_OPT_FLAGS)
  
  OBJS = cli.o cli_history.o cli_tokenize.o
  
---- hnb-1.9.18/src/Makefile.r	2003-08-27 04:50:58.000000000 +0200
-+++ hnb-1.9.18/src/Makefile	2004-09-22 16:19:20.000000000 +0200
+diff -up lhnb-1.9.19/src/Makefile.r lhnb-1.9.19/src/Makefile
+--- lhnb-1.9.19/src/Makefile.r	2014-02-27 19:14:08.642033647 +0100
++++ lhnb-1.9.19/src/Makefile	2014-02-27 19:14:47.935146852 +0100
 @@ -1,5 +1,5 @@
  LIBS=-lncurses libcli/libcli.a
--CFLAGS=-I.. -Ilibcli -DHAVE_CONFIG_H -Wall -pedantic -g
-+CFLAGS=-I.. -Ilibcli -DHAVE_CONFIG_H -Wall -pedantic $(RPM_OPT_FLAGS)
+-CFLAGS=-I.. -Ilibcli -DHAVE_CONFIG_H -Wall -Werror -g
++CFLAGS=-I.. -Ilibcli -DHAVE_CONFIG_H -Wall -g $(RPM_OPT_FLAGS)
  
  CFILES=$(wildcard *.c)
  OBJS=$(patsubst %.c,%.o,$(CFILES))
diff --git a/hnb.spec b/hnb.spec
index 7533b16..07fb123 100644
--- a/hnb.spec
+++ b/hnb.spec
@@ -1,17 +1,14 @@
 Summary: Hierarchical Notebook
 Name: hnb
-Version: 1.9.18
-Release: 12%{?dist}
+Version: 1.9.19
+Release: 1%{?dist}
 License: GPLv2+
-URL: http://hnb.sourceforge.net
-Group: Applications/Productivity
-Source0: http://hnb.sourceforge.net/.files/%{name}-%{version}.pre7.tar.gz
+URL: https://github.com/liskin/lhnb
+Source0: http://nomi.cz/download/releases/lhnb/lhnb-%{version}.tar.gz
 Source1: hnbrc.vi
 Patch0: %{name}-rpm.patch
-Patch1: %{name}-compile.patch
-# based on http://ftp.debian.org/debian/pool/main/h/hnb/hnb_1.9.18-3.diff.gz
-Patch2: hnb-debian.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# fix -Werror=format-security errors
+Patch3: hnb-format-security.patch
 BuildRequires: ncurses-devel
 
 %description
@@ -25,30 +22,32 @@ External programs may be used for more advanced conversions of the XML
 data.
 
 %prep
-%setup -q -n %{name}-%{version}.pre7
+%setup -q -n lhnb-%{version}
 %patch0 -p1 -b .r
-%patch1 -p1 -b .compile
-%patch2 -p1 -b .debian
+%patch3 -p1 -b .format-security
 cp -p %{SOURCE1} doc/
 
 %build
 %{__make} OPTFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 install -D -p src/hnb $RPM_BUILD_ROOT%{_bindir}/hnb
 install -D -pm644 doc/hnb.1 $RPM_BUILD_ROOT%{_mandir}/man1/hnb.1
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(644,root,root,755)
+%defattr(-,root,root,-)
 %doc COPYING README doc/Documentation.html doc/hnbrc*
-%attr(755,root,root) %{_bindir}/%{name}
+%{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Thu Feb 27 2014 Dominik Mierzejewski <rpm at greysector.net> 1.9.19-1
+- update to a 1.9.19 fork from http://nomi.cz/download/releases/lhnb/
+- drop obsolete patches
+- drop obsolete specfile parts
+- fix -Werror=format-security errors (bug #1037122)
+- fix bogus date in changelog
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.18-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -73,7 +72,7 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.9.18-5
 - Autorebuild for GCC 4.3
 
-* Sun Aug 25 2007 Dominik Mierzejewski <rpm at greysector.net> 1.9.18-4
+* Sat Aug 25 2007 Dominik Mierzejewski <rpm at greysector.net> 1.9.18-4
 - apparently .pre7 tarball contains newer code
 - integrate Debian patch
 - update license tag
diff --git a/sources b/sources
index d7fce89..f941927 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 65196f236b40ecc8bfccf8aec36e91f6  hnb-1.9.18.pre7.tar.gz
 7a15f4888d144c087b91ae585ed06cca  hnbrc.vi
+1650bf341169f82579b13fbfd2250fb7  lhnb-1.9.19.tar.gz

More information about the scm-commits mailing list