Hello community, here is the log from the commit of package thttpd for openSUSE:Factory checked in at Tue Jun 9 17:51:18 CEST 2009. -------- --- thttpd/thttpd.changes 2009-05-26 15:19:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/thttpd/thttpd.changes 2009-06-08 00:42:10.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jun 8 00:41:37 CEST 2009 - ro@suse.de + +- rename getline to my_getline to avoid collision with function + from glibc + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- thttpd-2.25b-getline.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ thttpd.spec ++++++ --- /var/tmp/diff_new_pack.G32551/_old 2009-06-09 17:51:02.000000000 +0200 +++ /var/tmp/diff_new_pack.G32551/_new 2009-06-09 17:51:02.000000000 +0200 @@ -24,7 +24,7 @@ PreReq: %fillup_prereq %insserv_prereq permissions AutoReqProv: on Version: 2.25b -Release: 172 +Release: 173 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-SuSE.tar.bz2 Patch0: %{name}-%{version}-configure.patch @@ -39,6 +39,7 @@ Patch9: %{name}-%{version}-chown.diff Patch10: %{name}-%{version}-zerolen.patch Patch11: %{name}-%{version}-strcpy.patch +Patch12: thttpd-2.25b-getline.patch Url: http://www.acme.com/software/thttpd/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Small and very simple webserver @@ -73,6 +74,7 @@ %patch9 %patch10 %patch11 +%patch12 %build # update server root path @@ -143,6 +145,9 @@ %config(noreplace) /etc/thttpd.conf %changelog +* Mon Jun 08 2009 ro@suse.de +- rename getline to my_getline to avoid collision with function + from glibc * Tue May 26 2009 anicka@suse.cz - add new branding (bnc#492693) * Mon Jun 11 2007 pcerny@suse.cz ++++++ thttpd-2.25b-getline.patch ++++++ --- extras/htpasswd.c +++ extras/htpasswd.c @@ -49,7 +49,7 @@ while((line[y++] = line[x++])); } -static int getline(char *s, int n, FILE *f) { +static int my_getline(char *s, int n, FILE *f) { register int i=0; while(1) { @@ -189,7 +189,7 @@ strncpy(user,argv[2],MAX_STRING_LEN); user[MAX_STRING_LEN-1]='\0'; found = 0; - while(!(getline(line,MAX_STRING_LEN,f))) { + while(!(my_getline(line,MAX_STRING_LEN,f))) { if(found || (line[0] == '#') || (!line[0])) { putline(tfp,line); continue; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org