Bug#552857: caudium: patch used in Ubuntu to fix this problem

[Fabrice Coutadeur]

Package: caudium
Version: 3:1.4.12-12
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu karmic ubuntu-patch

Hi,

This is the patch that has been used by Ubuntu to fixthis problem.

Thanks,
Fabrice

*** /tmp/tmpUpxse4
In Ubuntu, we've applied the attached patch to achieve the following:

  * fix.local.getline.dpatch: renamed local defined getline to local_getline
    to get rid of a compilation error with gcc 4.4

We thought you might be interested in doing the same. 


-- System Information:
Debian Release: squeeze/sid
  APT prefers karmic-updates
  APT policy: (500, 'karmic-updates'), (500, 'karmic-security'), (500, 'karmic')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.31-14-generic (SMP w/2 CPU cores)
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/dash

--- caudium-1.4.12/debian/patches/00list
+++ caudium-1.4.12/debian/patches/00list
@@ -5,0 +6 @@
+fix.local.getline.dpatch
only in patch2:
unchanged:
--- caudium-1.4.12.orig/debian/patches/fix.local.getline.dpatch
+++ caudium-1.4.12/debian/patches/fix.local.getline.dpatch
@@ -0,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix.local.getline.dpatch by Fabrice Coutadeur <fabric...@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Rename getline to local_getline, as getline is already defined in
+## DP: /usr/include/stdio.h
+
+...@dpatch@
+diff -urNad caudium-1.4.12~/src/tools/htpasswd.c 
caudium-1.4.12/src/tools/htpasswd.c
+--- caudium-1.4.12~/src/tools/htpasswd.c       2000-10-14 09:23:17.000000000 
+0000
++++ caudium-1.4.12/src/tools/htpasswd.c        2009-10-16 18:58:56.000000000 
+0000
+@@ -53,7 +53,7 @@
+     ;
+ }
+ 
+-int getline(char *s, int n, FILE *f) {
++int local_getline(char *s, int n, FILE *f) {
+   register int i=0;
+ 
+   while(1) {
+@@ -165,7 +165,7 @@
+   strcpy(user,argv[2]);
+ 
+   found = 0;
+-  while(!(getline(line,MAX_STRING_LEN,f))) {
++  while(!(local_getline(line,MAX_STRING_LEN,f))) {
+     if(found || (line[0] == '#') || (!line[0])) {
+       putline(tfp,line);
+       continue;
+diff -urNad caudium-1.4.12~/src/tools/htpasswd.h 
caudium-1.4.12/src/tools/htpasswd.h
+--- caudium-1.4.12~/src/tools/htpasswd.h       2000-08-07 02:17:10.000000000 
+0000
++++ caudium-1.4.12/src/tools/htpasswd.h        2009-10-16 18:58:26.000000000 
+0000
+@@ -2,7 +2,7 @@
+ #define HTPASSWD_H
+ char *strd(char *s);
+ void getword(char *word, char *line, char stop);
+-int getline(char *s, int n, FILE *f);
++int local_getline(char *s, int n, FILE *f);
+ void putline(FILE *f,char *l);
+ void to64(register char *s, register long v, register int n);
+ void add_password(char *user, FILE *f);