- rel.2 - c_cleanup and limits patches from gentoo

Changed files:
    TODO -> 1.1
    cancd-c_cleanup.patch -> 1.1
    cancd-limits.patch -> 1.1
    cancd.spec -> 1.11

diff --git a/TODO b/TODO
new file mode 100644 (file)
index 0000000..0fa4ff0
--- /dev/null
+++ b/TODO
@@ -0,0 +1,6 @@
+# TODO:
+- fix alpha build:
+  alpha-pld-linux-gcc -Wall -O2 -mieee  -DVERSION="\"0.1.0\""   -c -o cancd.o cancd.c
+  cancd.c: In function `setup_signals':
+  cancd.c:95: error: structure has no member named `sa_restorer'
+  make: *** [cancd.o] Error 1

diff --git a/cancd-c_cleanup.patch b/cancd-c_cleanup.patch
new file mode 100644 (file)
index 0000000..47defb3
--- /dev/null
+++ b/cancd-c_cleanup.patch
@@ -0,0 +1,65 @@
+diff -Nuar --exclude '*~' --exclude '*.orig' --exclude Makefile cancd-0.1.0/cancd.c cancd-0.1.0.new/cancd.c
+--- cancd-0.1.0/cancd.c        2005-08-18 11:47:48.000000000 -0700
++++ cancd-0.1.0.new/cancd.c    2006-03-17 17:09:46.402025517 -0800
+@@ -199,7 +199,7 @@
+     char *path;
+ };
+ 
+-static int make_tree(const char *path, int mode)
++static int make_tree(const char *path, mode_t mode)
+ {
+     struct stat stat_buf;
+     char *ptr, *tmp;
+@@ -319,7 +319,7 @@
+ static int open_socket()
+ {
+     int rc;
+-    struct sockaddr_in servaddr = {0, };
++    struct sockaddr_in servaddr;
+ 
+     sock_fd = socket(PF_INET, SOCK_DGRAM, 0);
+     if (sock_fd < 0)
+@@ -438,7 +438,7 @@
+     int rc;
+     static int block = 1;
+ 
+-    rc = recvfrom(sock_fd, buf, bufsize, 0,
++    rc = recvfrom(fd, buf, bufsize, 0,
+                   (struct sockaddr *)from, fromlen);
+     if (rc < 0)
+     {
+@@ -569,7 +569,7 @@
+ 
+ static int valid_format()
+ {
+-    struct in_addr addr = {0, };
++    struct in_addr addr;
+     char *name;
+     int rc;
+ 
+@@ -599,9 +599,11 @@
+     exit(rc);
+ }
+ 
++/*
+ extern char *optarg;
+ extern int optopt;
+ extern int opterr;
++*/
+ static int parse_options(int argc, char *argv[])
+ {
+     int c;
+@@ -641,11 +643,11 @@
+                             optarg);
+                     print_usage(-EINVAL);
+                 }
+-                log_prefix = optarg;
++                log_prefix = strdup(optarg);
+                 break;
+ 
+             case 'o':
+-                log_format = optarg;
++                log_format = strdup(optarg);
+                 if (!log_format || !*log_format || !valid_format())
+                 {
+                     fprintf(stderr,

diff --git a/cancd-limits.patch b/cancd-limits.patch
new file mode 100644 (file)
index 0000000..b1c99b1
--- /dev/null
+++ b/cancd-limits.patch
@@ -0,0 +1,14 @@
+fix building with newer glibc
+
+http://bugs.gentoo.org/246734
+
+--- cancd.c
++++ cancd.c
+@@ -36,6 +36,7 @@
+ #include <libgen.h>
+ #include <getopt.h>
+ #include <stdarg.h>
++#include <limits.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+ #include <netinet/in.h>

diff --git a/cancd.spec b/cancd.spec
index ee9bc374d0da2bbc06928b4c231e10cd5e034b79..a7b6abe114d55d098aaeb8746fe29c8eed1371cd 100644 (file)
--- a/cancd.spec
+++ b/cancd.spec
@@ -1,14 +1,8 @@
-# TODO
-# - fix alpha build:
-#  alpha-pld-linux-gcc -Wall -O2 -mieee  -DVERSION="\"0.1.0\""   -c -o cancd.o cancd.c
-#  cancd.c: In function `setup_signals':
-#  cancd.c:95: error: structure has no member named `sa_restorer'
-#  make: *** [cancd.o] Error 1
 Summary:       The CA NetConsole Daemon
 Summary(pl.UTF-8):     Demon CA NetConsole
 Name:          cancd
 Version:       0.1.0
-Release:       1
+Release:       2
 License:       GPL
 Group:         Applications/File
 Source0:       http://oss.oracle.com/projects/cancd/dist/files/source/%{name}-%{version}.tar.gz
@@ -17,6 +11,8 @@ Source1:      %{name}.init
 Source2:       %{name}.sysconfig
 Patch0:                %{name}-make.patch
 Patch1:                %{name}-nullterminate.patch
+Patch2:                %{name}-c_cleanup.patch
+Patch3:                %{name}-limits.patch
 URL:           http://oss.oracle.com/projects/cancd/
 BuildRequires: rpmbuild(macros) >= 1.228
 Requires(post,preun):  /sbin/chkconfig
@@ -45,6 +41,8 @@ sterownika netconsole (konsoli sieciowej).
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p0
 
 %build
 %{__make} \