[xml/sgml-commit] r2066 - in /packages/refdb/trunk/debian/patches: fixcomp.patch fixsvn.patch series

malat at users.alioth.debian.org malat at users.alioth.debian.org
Tue Oct 2 09:30:58 UTC 2012


Author: malat
Date: Tue Oct  2 09:30:57 2012
New Revision: 2066

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=2066
Log:
Update patches

Added:
    packages/refdb/trunk/debian/patches/fixcomp.patch
Modified:
    packages/refdb/trunk/debian/patches/fixsvn.patch
    packages/refdb/trunk/debian/patches/series

Added: packages/refdb/trunk/debian/patches/fixcomp.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/refdb/trunk/debian/patches/fixcomp.patch?rev=2066&op=file
==============================================================================
--- packages/refdb/trunk/debian/patches/fixcomp.patch (added)
+++ packages/refdb/trunk/debian/patches/fixcomp.patch Tue Oct  2 09:30:57 2012
@@ -1,0 +1,798 @@
+Description: Fix compilation on debian
+Author: Mathieu Malaterre <malat at debian.org>
+Bug: https://sourceforge.net/tracker/?func=detail&aid=3573740&group_id=26091&atid=385991
+Forwarded: not-needed
+
+--- refdb-1.0.orig/src/refdbd.c
++++ refdb-1.0/src/refdbd.c
+@@ -2263,7 +2263,7 @@ void log_print(int priority, const char*
+       n_reopen_log = 0;
+       LOG_PRINT(LOG_INFO, "reopened log file");
+     }
+-    syslog(priority, string);
++    syslog(priority, "%s", string);
+   }
+   else { /* output in user-defined logfile */
+     if (n_reopen_log) { /* log filename or destination has changed*/
+--- refdb-1.0.orig/src/cgi.c
++++ refdb-1.0/src/cgi.c
+@@ -87,11 +87,11 @@ int is_cgi(char** request_method, char**
+   ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
+ void write_err(char* message) {
+   if (!n_cgi) {
+-    fprintf(stderr, message);
++    fprintf(stderr, "%s", message);
+   }
+   else { /* send cgi type string */
+     printf("Content-type: text/plain\n\n");
+-    printf(message);
++    printf("%s", message);
+   }
+ }
+ 
+--- refdb-1.0.orig/src/refdbib.c
++++ refdb-1.0/src/refdbib.c
+@@ -655,8 +655,7 @@ int make_cookedbib(FILE* fp_infile, int
+   numbyte = tiwrite(slvals.n_sockfd, slvals.outbuffer, TERM_YES);
+   if (numbyte == -1) {
+     free(slvals.outbuffer);
+-    fprintf(stderr, get_status_msg(110));
+-    fprintf(stderr, "\n");
++    fprintf(stderr, "%s\n", get_status_msg(110));
+     LOG_PRINT(LOG_WARNING, get_status_msg(110));
+     close(slvals.n_sockfd);
+     return 1;
+@@ -666,8 +665,7 @@ int make_cookedbib(FILE* fp_infile, int
+ 
+   if (cs_status && cs_status != 402) {
+     free(slvals.outbuffer);
+-    fprintf(stderr, get_status_msg(cs_status));
+-    fprintf(stderr, "\n");
++    fprintf(stderr, "%s\n", get_status_msg(cs_status));
+     LOG_PRINT(LOG_WARNING, get_status_msg(cs_status));
+     close(slvals.n_sockfd);
+     return 1;
+@@ -714,8 +712,7 @@ int make_cookedbib(FILE* fp_infile, int
+     cs_status = read_status(slvals.n_sockfd);
+ 
+     if (cs_status) {
+-      fprintf(stderr, get_status_msg(cs_status));
+-      fprintf(stderr, "\n");
++      fprintf(stderr, "%s\n", get_status_msg(cs_status));
+       LOG_PRINT(LOG_WARNING, get_status_msg(cs_status));
+       free(slvals.outbuffer);
+       close(slvals.n_sockfd);
+@@ -752,7 +749,7 @@ int make_cookedbib(FILE* fp_infile, int
+ 	/*   	printf("phase4 server reply:%s<<\n", inbuffer); */
+ 	if (numbyte == -1) {
+ 	  /* timeout while reading */
+-	  fprintf(stderr, get_status_msg(109));
++	  fprintf(stderr, "%s\n", get_status_msg(109));
+ 	  return 1;
+ 	}
+ 	
+@@ -770,8 +767,7 @@ int make_cookedbib(FILE* fp_infile, int
+       } while (!n_read_done);
+     }
+     else {
+-      fprintf(stderr, get_status_msg(cs_status));
+-      fprintf(stderr, "\n");
++      fprintf(stderr, "%s\n", get_status_msg(cs_status));
+       return 1;
+     }
+   } /* end if cs_status */
+@@ -796,8 +792,7 @@ int make_cookedbib(FILE* fp_infile, int
+       n_done_refs++;
+     }
+     else if (cs_status != 404) {
+-      fprintf(stderr, get_status_msg(cs_status));
+-      fprintf(stderr, "\n");
++      fprintf(stderr, "%s\n", get_status_msg(cs_status));
+       LOG_PRINT(LOG_WARNING, get_status_msg(cs_status));
+       free(slvals.outbuffer);
+       close(slvals.n_sockfd);
+@@ -823,8 +818,7 @@ int make_cookedbib(FILE* fp_infile, int
+ 
+ 
+   if ((cs_status = read_status(slvals.n_sockfd)) != 0) {
+-    fprintf(stderr, get_status_msg(109));
+-    fprintf(stderr, "\n");
++    fprintf(stderr, "%s\n", get_status_msg(109));
+     LOG_PRINT(LOG_WARNING, get_status_msg(109));
+     free(slvals.outbuffer);
+     close(slvals.n_sockfd);
+@@ -995,8 +989,7 @@ int make_rawbib(FILE* fp_infile, int n_t
+   numbyte = 0;
+ 
+   if ((cs_status = read_status(slvals.n_sockfd)) != 0) { /* read step 2 */
+-    fprintf(stderr, get_status_msg(cs_status));
+-    fprintf(stderr, "\n");
++    fprintf(stderr, "%s\n", get_status_msg(cs_status));
+     close(slvals.n_sockfd);
+     free(slvals.outbuffer);
+     return 1;
+@@ -1030,7 +1023,7 @@ int make_rawbib(FILE* fp_infile, int n_t
+ 	/*   	printf("phase4 server reply:%s<<\n", inbuffer); */
+ 	if (numbyte == -1) {
+ 	  /* timeout while reading */
+-	  fprintf(stderr, get_status_msg(109));
++	  fprintf(stderr, "%s", get_status_msg(109));
+ 	  free(slvals.outbuffer);
+ 	  return 1;
+ 	}
+@@ -1049,8 +1042,7 @@ int make_rawbib(FILE* fp_infile, int n_t
+       } while (!n_read_done);
+     }
+     else {
+-      fprintf(stderr, get_status_msg(cs_status));
+-      fprintf(stderr, "\n");
++      fprintf(stderr, "%s\n", get_status_msg(cs_status));
+       free(slvals.outbuffer);
+       return 1;
+     }
+@@ -1083,8 +1075,7 @@ int make_rawbib(FILE* fp_infile, int n_t
+ 
+     if (cs_status != 402 /* last dataset */
+ 	&& cs_status != 404) { /* finished dataset */
+-      fprintf(stderr, get_status_msg(cs_status));
+-      fprintf(stderr, "\n");
++      fprintf(stderr, "%s\n", get_status_msg(cs_status));
+       if (slvals.n_file_open || slvals.n_file_append) {
+ 	close_outfile(pagerfp);
+       }
+@@ -1123,16 +1114,14 @@ int make_rawbib(FILE* fp_infile, int n_t
+ 	
+   if (cs_status != 0 /* success */
+       && cs_status != 803) { /* partial success */
+-    fprintf(stderr, get_status_msg(cs_status));
+-    fprintf(stderr, "\n");
++    fprintf(stderr, "%s\n", get_status_msg(cs_status));
+     free(slvals.outbuffer);
+     return 1;
+   }
+ 
+   numbyte = tread(slvals.n_sockfd, slvals.inbuffer, OUTBUF_LEN);
+   if (numbyte == -1) {
+-    fprintf(stderr, get_status_msg(109));
+-    fprintf(stderr, "\n");
++    fprintf(stderr, "%s\n", get_status_msg(109));
+     n_broken_pipe = 0;
+     free(slvals.outbuffer);
+     return 1;
+@@ -1156,7 +1145,7 @@ int make_rawbib(FILE* fp_infile, int n_t
+   free(slvals.outbuffer);
+   close(slvals.n_sockfd);
+ 
+-  fprintf(stderr, slvals.inbuffer);
++  fprintf(stderr, "%s", slvals.inbuffer);
+ 
+   return 0;
+ }
+@@ -1263,8 +1252,7 @@ int make_texbib(FILE* fp_infile) {
+   LOG_PRINT(LOG_DEBUG, cmd_buffer);
+ 
+   if (numbyte == -1) {
+-    fprintf(stderr, get_status_msg(110));
+-    fprintf(stderr, "\n");
++    fprintf(stderr, "%s\n", get_status_msg(110));
+     LOG_PRINT(LOG_WARNING, get_status_msg(110));
+     retval = 1;
+     goto Finish;
+@@ -1274,8 +1262,7 @@ int make_texbib(FILE* fp_infile) {
+   cs_status = read_status(slvals.n_sockfd); /* #2 */
+ 
+   if (cs_status) {
+-    fprintf(stderr, get_status_msg(cs_status));
+-    fprintf(stderr, "\n");
++    fprintf(stderr, "%s\n", get_status_msg(cs_status));
+     LOG_PRINT(LOG_WARNING, get_status_msg(cs_status));
+     retval = 1;
+     goto Finish;
+@@ -1287,8 +1274,7 @@ int make_texbib(FILE* fp_infile) {
+   LOG_PRINT(LOG_DEBUG, slvals.outbuffer);
+ 
+   if (numbyte == -1) {
+-    fprintf(stderr, get_status_msg(110));
+-    fprintf(stderr, "\n");
++    fprintf(stderr, "%s\n", get_status_msg(110));
+     LOG_PRINT(LOG_WARNING, get_status_msg(110));
+     retval = 1;
+     goto Finish;
+@@ -1318,8 +1304,7 @@ int make_texbib(FILE* fp_infile) {
+ 
+     if (cs_status != 402
+ 	&& cs_status != 404) {
+-      fprintf(stderr, get_status_msg(cs_status));
+-      fprintf(stderr, "\n");
++      fprintf(stderr, "%s\n", get_status_msg(cs_status));
+       LOG_PRINT(LOG_WARNING, get_status_msg(cs_status));
+       if (slvals.n_file_open || slvals.n_file_append) {
+ 	close_outfile(pagerfp);
+@@ -1340,8 +1325,7 @@ int make_texbib(FILE* fp_infile) {
+     do { /* loop until a terminated string is complete */
+       numbyte = tread(slvals.n_sockfd, slvals.inbuffer, OUTBUF_LEN); /* #6 ok */
+       if (numbyte == -1) {
+-	fprintf(stderr, get_status_msg(109));
+-	fprintf(stderr, "\n");
++	fprintf(stderr, "%s\n", get_status_msg(109));
+ 	if (slvals.n_file_open || slvals.n_file_append) {
+ 	  close_outfile(pagerfp);
+ 	}
+@@ -1397,8 +1381,7 @@ int make_texbib(FILE* fp_infile) {
+ 	
+   if (cs_status != 0 /* success */
+       && cs_status != 803) { /* partial success */
+-    fprintf(stderr, get_status_msg(cs_status));
+-    fprintf(stderr, "\n");
++    fprintf(stderr, "%s\n", get_status_msg(cs_status));
+     if (slvals.n_file_open || slvals.n_file_append) {
+       close_outfile(pagerfp);
+     }
+@@ -1411,8 +1394,7 @@ int make_texbib(FILE* fp_infile) {
+ 	
+   numbyte = tread(slvals.n_sockfd, slvals.inbuffer, OUTBUF_LEN); /* #8 ok */
+   if (numbyte == -1) {
+-    fprintf(stderr, get_status_msg(109));
+-    fprintf(stderr, "\n");
++    fprintf(stderr, "%s\n", get_status_msg(109));
+     n_broken_pipe = 0;
+     if (slvals.n_file_open || slvals.n_file_append) {
+       close_outfile(pagerfp);
+@@ -1434,7 +1416,7 @@ int make_texbib(FILE* fp_infile) {
+     closepager(pagerfp);
+   }
+ 
+-  fprintf(stderr, slvals.inbuffer);
++  fprintf(stderr, "%s", slvals.inbuffer);
+ 
+  Finish:
+   /* closing the socket in the background apparently does not work if
+@@ -1469,7 +1451,7 @@ void log_print(int priority, const char*
+     fprintf(stderr, "%s\n", string);
+   }
+   else if (n_log_dest == 1) { /* output via syslog */
+-    syslog(priority, string);
++    syslog(priority, "%s", string);
+   }
+   else { /* output in user-defined logfile */
+     time(&the_time);
+--- refdb-1.0.orig/src/refdb-client.c
++++ refdb-1.0/src/refdb-client.c
+@@ -134,8 +134,7 @@ int init_dialog(int n_sockfd, char* pass
+   /* read status */
+   if ((cs_status = read_status(n_sockfd))) {
+     cgi_header(CGI_PLAIN);
+-    fprintf(errstream, get_status_msg(cs_status));
+-    fprintf(errstream, "\n");
++    fprintf(errstream, "%s\n", get_status_msg(cs_status));
+     return 1;
+   }
+     
+@@ -221,7 +220,7 @@ int listvalue (char* arg, char* command,
+   if (!n_cgi) {
+     if (strncmp(arg, "-h", 2) == 0) {
+       cgi_header(CGI_PLAIN);
+-      fprintf(errstream, help_string);
++      fprintf(errstream, "%s", help_string);
+       free(slvals.outbuffer);
+       return 0;
+     }
+@@ -315,8 +314,7 @@ int getsimplelist(struct simplelistvals*
+   numbyte = tiwrite(slvals->n_sockfd, slvals->outbuffer, TERM_YES);
+   if (numbyte == -1) {
+     cgi_header(CGI_PLAIN);
+-    fprintf(errstream, get_status_msg(110));
+-    fprintf(errstream, "\n");
++    fprintf(errstream, "%s\n", get_status_msg(110));
+     return 1;
+   }
+ 
+@@ -328,8 +326,7 @@ int getsimplelist(struct simplelistvals*
+   if (cs_status != 0 /* success */
+       && cs_status != 803) { /* partial success */
+     cgi_header(CGI_PLAIN);
+-    fprintf(errstream, get_status_msg(cs_status));
+-    fprintf(errstream, "\n");
++    fprintf(errstream, "%s\n", get_status_msg(cs_status));
+     if (n_with_summary != 2) {
+       return 1;
+     }
+@@ -403,7 +400,7 @@ int getsimplelist(struct simplelistvals*
+       if (cs_status != 0 /* success */
+ 	  && cs_status != 803) { /* partial success */
+ 	cgi_header(CGI_PLAIN);
+-	fprintf(errstream, get_status_msg(cs_status));
++	fprintf(errstream, "%s", get_status_msg(cs_status));
+ 	return 1;
+       }
+ 
+@@ -566,8 +563,7 @@ int send_xml_data(FILE *infp, FILE *page
+ /*        fflush(stdout); */
+     if (n_result < n_chunksize && !feof(infp)) {
+       /* no more data available */
+-      fprintf(errstream, get_status_msg(401));
+-      fprintf(errstream, "\n");
++      fprintf(errstream, "%s\n", get_status_msg(401));
+       send_status(n_sockfd, 401, TERM_NO);
+       free(buffer);
+       return 1;
+@@ -595,8 +591,7 @@ int send_xml_data(FILE *infp, FILE *page
+       /* PHASE 2 */
+       /* wait for acknowledgement of database server */
+       if ((cs_status = read_status(n_sockfd))) {
+-	fprintf(errstream, get_status_msg(cs_status));
+-	fprintf(errstream, "\n");
++	fprintf(errstream, "%s\n", get_status_msg(cs_status));
+ 	return 1;
+       }
+ 
+@@ -624,7 +619,7 @@ int send_xml_data(FILE *infp, FILE *page
+ 	  /*   	printf("phase4 server reply:%s<<\n", inbuffer); */
+ 	  if (numbyte == -1) {
+ 	    /* timeout while reading */
+-	    fprintf(errstream, get_status_msg(109));
++	    fprintf(errstream, "%s", get_status_msg(109));
+ 	    return 3;
+ 	  }
+ 
+@@ -712,8 +707,7 @@ int send_ris_data(FILE *infp, FILE *page
+ 
+       if (n_result == 0) {
+ 	cgi_header(CGI_PLAIN);
+-	fprintf(errstream, get_status_msg(401));
+-	fprintf(errstream, "\n");
++	fprintf(errstream, "%s\n", get_status_msg(401));
+ 	send_status(n_sockfd, 401, TERM_NO);
+ 	return 1;
+       }
+@@ -743,8 +737,7 @@ int send_ris_data(FILE *infp, FILE *page
+       /* PHASE 2 */
+       /* wait for acknowledgement of database server */
+       if ((cs_status = read_status(n_sockfd))) {
+-	fprintf(errstream, get_status_msg(cs_status));
+-	fprintf(errstream, "\n");
++	fprintf(errstream, "%s\n", get_status_msg(cs_status));
+ 	return 1;
+       }
+ 
+@@ -775,7 +768,7 @@ int send_ris_data(FILE *infp, FILE *page
+ 	  numbyte = tread(n_sockfd, inbuffer, OUTBUF_LEN);
+ 	  if (numbyte == -1) {
+ 	    cgi_header(CGI_PLAIN);
+-	    fprintf(errstream, get_status_msg(109));
++	    fprintf(errstream, "%s", get_status_msg(109));
+ 	    return 3;
+ 	  }
+ 	  
+@@ -846,8 +839,7 @@ size_t read_terminated_string(struct sim
+       }
+ 
+       if (numbyte == -1) {
+-	fprintf(stderr, get_status_msg(109));
+-	fprintf(stderr, "\n");
++	fprintf(stderr, "%s\n", get_status_msg(109));
+ 	*ptr_error = 1;
+ 	return 0;
+       }
+--- refdb-1.0.orig/src/refdbc.c
++++ refdb-1.0/src/refdbc.c
+@@ -1203,8 +1203,7 @@ int com_deleteref (char* arg)
+   numbyte = 0;
+ 
+   if ((cs_status = read_status(slvals.n_sockfd)) != 0) {
+-    fprintf(errstream, get_status_msg(cs_status));
+-    fprintf(errstream, "\n");
++    fprintf(errstream, "%s\n", get_status_msg(cs_status));
+     close(slvals.n_sockfd);
+     delete_all_lilimem(&sentinel);
+     return 1;
+@@ -1608,8 +1607,7 @@ static int pickref (char* arg, int n_rem
+   numbyte = tiwrite(slvals.n_sockfd, cmd_buffer, TERM_YES);
+   LOG_PRINT(LOG_DEBUG, cmd_buffer);
+   if (numbyte == -1) {
+-    fprintf(stderr, get_status_msg(110));
+-    fprintf(stderr, "\n");
++    fprintf(stderr, "%s\n", get_status_msg(110));
+     close(slvals.n_sockfd);
+     delete_all_lilimem(&sentinel);
+     return 1;
+@@ -1619,8 +1617,7 @@ static int pickref (char* arg, int n_rem
+ 
+   /* read acknowledgement from application server */
+   if ((cs_status = read_status(slvals.n_sockfd)) != 0) {
+-    fprintf(errstream, get_status_msg(cs_status));
+-    fprintf(errstream, "\n");
++    fprintf(errstream, "%s\n", get_status_msg(cs_status));
+     close(slvals.n_sockfd);
+     delete_all_lilimem(&sentinel);
+     return 1;
+@@ -2244,8 +2241,7 @@ static int getref (char* arg, int send_d
+   numbyte = 0;
+ 
+   if ((cs_status = read_status(slvals.n_sockfd)) != 0) {
+-    fprintf(errstream, get_status_msg(cs_status));
+-    fprintf(errstream, "\n");
++    fprintf(errstream, "%s\n", get_status_msg(cs_status));
+     close(slvals.n_sockfd);
+     delete_all_lilimem(&sentinel);
+     return 1;
+@@ -2287,8 +2283,7 @@ static int getref (char* arg, int send_d
+     if (cs_status != 402 /* last dataset */
+ 	&& cs_status != 404) { /* finished dataset */
+       cgi_header(CGI_PLAIN);
+-      fprintf(errstream, get_status_msg(cs_status));
+-      fprintf(errstream, "\n");
++      fprintf(errstream, "%s\n", get_status_msg(cs_status));
+       if (slvals.n_file_open || slvals.n_file_append) {
+ 	close_outfile(pagerfp);
+       }
+@@ -2328,16 +2323,14 @@ static int getref (char* arg, int send_d
+   if (cs_status != 0 /* success */
+       && cs_status != 803) { /* partial success */
+     cgi_header(CGI_PLAIN);
+-    fprintf(errstream, get_status_msg(cs_status));
+-    fprintf(stderr, "\n");
++    fprintf(errstream, "%s\n", get_status_msg(cs_status));
+     delete_all_lilimem(&sentinel);
+     return 1;
+   }
+ 	
+   numbyte = tread(slvals.n_sockfd, slvals.inbuffer, OUTBUF_LEN);
+   if (numbyte == -1) {
+-    fprintf(stderr, get_status_msg(109));
+-    fprintf(stderr, "\n");
++    fprintf(stderr, "%s\n", get_status_msg(109));
+     n_broken_pipe = 0;
+     delete_all_lilimem(&sentinel);
+     return 1;
+@@ -2355,7 +2348,7 @@ static int getref (char* arg, int send_d
+ 
+   close(slvals.n_sockfd);
+ 
+-  fprintf(errstream, slvals.inbuffer);
++  fprintf(errstream, "%s", slvals.inbuffer);
+ 
+   delete_all_lilimem(&sentinel);
+ 
+@@ -3474,8 +3467,7 @@ static int addref (char* arg, int update
+ 
+   if (cs_status == 701) {
+     /* character conversion could not be initialized */
+-    fprintf(errstream, get_status_msg(701));
+-    fprintf(errstream, "\n");
++    fprintf(errstream, "%s\n", get_status_msg(701));
+   }
+   else if (cs_status) {
+     cgi_header(CGI_PLAIN);
+@@ -3568,7 +3560,7 @@ static int addref (char* arg, int update
+ 	/*   	printf("phase4 server reply:%s<<\n", inbuffer); */
+ 	if (numbyte == -1) {
+ 	  /* timeout while reading */
+-	  fprintf(stderr, get_status_msg(109));
++	  fprintf(stderr, "%s", get_status_msg(109));
+ 	  result = 1;
+ 	  goto cleanup;
+ 	}
+@@ -3590,8 +3582,7 @@ static int addref (char* arg, int update
+       /* 	goto cleanup; */
+     }
+     else {
+-      fprintf(stderr, get_status_msg(cs_status));
+-      fprintf(stderr, "\n");
++      fprintf(stderr, "%s\n", get_status_msg(cs_status));
+       result = 1;
+       goto cleanup;
+     }
+@@ -3606,7 +3597,7 @@ static int addref (char* arg, int update
+   if (cs_status != 0 /* success */
+       && cs_status != 803) { /* partial success */
+     cgi_header(CGI_PLAIN);
+-    fprintf(errstream, get_status_msg(cs_status));
++    fprintf(errstream, "%s", get_status_msg(cs_status));
+     return 1;
+   }
+ 
+@@ -4142,8 +4133,7 @@ static int addnote (char* arg, int updat
+   /* todo: is a 701 possible here? */
+   if (cs_status == 701) {
+     /* character conversion could not be initialized */
+-    fprintf(errstream, get_status_msg(701));
+-    fprintf(errstream, "\n");
++    fprintf(errstream, "%s\n", get_status_msg(701));
+   }
+   else if (cs_status) {
+     cgi_header(CGI_PLAIN);
+@@ -4226,7 +4216,7 @@ static int addnote (char* arg, int updat
+ 	/*   	printf("phase4 server reply:%s<<\n", inbuffer); */
+ 	if (numbyte == -1) {
+ 	  /* timeout while reading */
+-	  fprintf(stderr, get_status_msg(109));
++	  fprintf(stderr, "%s", get_status_msg(109));
+ 	  result = 1;
+ 	  goto cleanup;
+ 	}
+@@ -4248,8 +4238,7 @@ static int addnote (char* arg, int updat
+       /* 	goto cleanup; */
+     }
+     else {
+-      fprintf(stderr, get_status_msg(cs_status));
+-      fprintf(stderr, "\n");
++      fprintf(stderr, "%s\n", get_status_msg(cs_status));
+       result = 1;
+       goto cleanup;
+     }
+@@ -4259,7 +4248,7 @@ static int addnote (char* arg, int updat
+   do {
+     numbyte = tread(n_sockfd, inbuffer, OUTBUF_LEN);
+     if (numbyte == -1) {
+-      fprintf(stderr, get_status_msg(109));
++      fprintf(stderr, "%s", get_status_msg(109));
+       if (n_file_open || n_file_append) {
+ 	close_outfile(pagerfp);
+       }
+@@ -4315,7 +4304,7 @@ static int addnote (char* arg, int updat
+   if (cs_status != 0 /* success */
+       && cs_status != 803) { /* partial success */
+     cgi_header(CGI_PLAIN);
+-    fprintf(errstream, get_status_msg(cs_status));
++    fprintf(errstream, "%s", get_status_msg(cs_status));
+     return 1;
+   }
+ 
+@@ -4340,7 +4329,7 @@ static int addnote (char* arg, int updat
+     closepager(pagerfp);
+   }
+ 
+-  fprintf(errstream, inbuffer);
++  fprintf(errstream, "%s", inbuffer);
+ 
+ cleanup:
+   /*    printf("%s\n", inbuffer); */
+@@ -4641,8 +4630,7 @@ int com_deletenote (char* arg)
+   LOG_PRINT(LOG_DEBUG, cmd_buffer);
+   if (numbyte == -1) {
+     cgi_header(CGI_PLAIN);
+-    fprintf(errstream, get_status_msg(110));
+-    fprintf(errstream, "\n");
++    fprintf(errstream, "%s\n", get_status_msg(110));
+     close(slvals.n_sockfd);
+     delete_all_lilimem(&sentinel);
+     return 1;
+@@ -4651,8 +4639,7 @@ int com_deletenote (char* arg)
+   numbyte = 0;
+ 
+   if ((cs_status = read_status(slvals.n_sockfd)) != 0) {
+-    fprintf(errstream, get_status_msg(cs_status));
+-    fprintf(errstream, "\n");
++    fprintf(errstream, "%s\n", get_status_msg(cs_status));
+     close(slvals.n_sockfd);
+     delete_all_lilimem(&sentinel);
+     return 1;
+@@ -5166,8 +5153,7 @@ static int getnote (char* arg, int send_
+   numbyte = 0;
+ 
+   if ((cs_status = read_status(slvals.n_sockfd)) != 0) {
+-    fprintf(errstream, get_status_msg(cs_status));
+-    fprintf(errstream, "\n");
++    fprintf(errstream, "%s\n", get_status_msg(cs_status));
+     close(slvals.n_sockfd);
+     delete_all_lilimem(&sentinel);
+     return 1;
+@@ -5209,8 +5195,7 @@ static int getnote (char* arg, int send_
+     if (cs_status != 402 /* last dataset */
+ 	&& cs_status != 404) { /* finished dataset */
+       cgi_header(CGI_PLAIN);
+-      fprintf(errstream, get_status_msg(cs_status));
+-      fprintf(errstream, "\n");
++      fprintf(errstream, "%s\n", get_status_msg(cs_status));
+       if (slvals.n_file_open || slvals.n_file_append) {
+ 	close_outfile(pagerfp);
+       }
+@@ -5247,15 +5232,13 @@ static int getnote (char* arg, int send_
+   if (cs_status != 0 /* success */
+       && cs_status != 803) { /* partial success */
+     cgi_header(CGI_PLAIN);
+-    fprintf(errstream, get_status_msg(cs_status));
+-    fprintf(stderr, "\n");
++    fprintf(errstream, "%s\n", get_status_msg(cs_status));
+     return 1;
+   }
+ 	
+   numbyte = tread(slvals.n_sockfd, slvals.inbuffer, OUTBUF_LEN);
+   if (numbyte == -1) {
+-    fprintf(stderr, get_status_msg(109));
+-    fprintf(stderr, "\n");
++    fprintf(stderr, "%s\n", get_status_msg(109));
+     n_broken_pipe = 0;
+     return 1;
+   }
+@@ -5272,7 +5255,7 @@ static int getnote (char* arg, int send_
+ 
+   close(slvals.n_sockfd);
+ 
+-  fprintf(errstream, slvals.inbuffer);
++  fprintf(errstream, "%s", slvals.inbuffer);
+ 
+   delete_all_lilimem(&sentinel);
+ 
+@@ -6084,7 +6067,7 @@ void log_print(int priority, const char*
+     fprintf(stderr, "%s\n", string);
+   }
+   else if (n_log_dest == 1) { /* output via syslog */
+-    syslog(priority, string);
++    syslog(priority, "%s", string);
+   }
+   else { /* output in user-defined logfile */
+     time(&the_time);
+--- refdb-1.0.orig/src/refdba.c
++++ refdb-1.0/src/refdba.c
+@@ -1040,16 +1040,14 @@ static int adduser (int n_remove, char*
+   numbyte = tiwrite(n_sockfd, outbuffer, TERM_YES);
+   if (numbyte == -1) {
+     delete_all_lilimem(&sentinel);
+-    fprintf(stderr, get_status_msg(110));
+-    fprintf(stderr, "\n");
++    fprintf(stderr, "%s\n", get_status_msg(110));
+     close(n_sockfd);
+     return 1;
+   }
+ 
+   if ((n_server_status = read_status(n_sockfd))) {
+     delete_all_lilimem(&sentinel);
+-    fprintf(stderr, get_status_msg(n_server_status));
+-    fprintf(stderr, "\n");
++    fprintf(stderr, "%s\n", get_status_msg(n_server_status));
+     close(n_sockfd);
+     return 1;
+   }
+@@ -1143,8 +1141,7 @@ static int adduser (int n_remove, char*
+   /* read data */
+   if ((n_server_status = read_status(n_sockfd))) {
+     delete_all_lilimem(&sentinel);
+-    fprintf(stderr, get_status_msg(n_server_status));
+-    fprintf(stderr, "\n");
++    fprintf(stderr, "%s\n", get_status_msg(n_server_status));
+     close(n_sockfd);
+     return 1;
+   }
+@@ -1201,8 +1198,7 @@ static int adduser (int n_remove, char*
+   /* read summary */
+   if ((n_server_status = read_status(n_sockfd))) {
+     delete_all_lilimem(&sentinel);
+-    fprintf(stderr, get_status_msg(n_server_status));
+-    fprintf(stderr, "\n");
++    fprintf(stderr, "%s\n", get_status_msg(n_server_status));
+     close(n_sockfd);
+     return 1;
+   }
+@@ -1221,7 +1217,7 @@ static int adduser (int n_remove, char*
+ 
+   closepager(pagerfp);
+ 
+-  fprintf(stderr, inbuffer);
++  fprintf(stderr, "%s", inbuffer);
+ 
+   n_broken_pipe = 0;
+   delete_all_lilimem(&sentinel);
+@@ -1493,8 +1489,7 @@ static int addword (int n_remove, char*
+ 
+   if ((n_server_status = read_status(n_sockfd))) {
+     delete_all_lilimem(&sentinel);
+-    fprintf(stderr, get_status_msg(n_server_status));
+-    fprintf(stderr, "\n");
++    fprintf(stderr, "%s\n", get_status_msg(n_server_status));
+     close(n_sockfd);
+     return 1;
+   }
+@@ -1567,15 +1562,14 @@ static int addword (int n_remove, char*
+   numbyte = tiwrite(n_sockfd, outbuffer, TERM_YES);
+   if (numbyte == -1) {
+     delete_all_lilimem(&sentinel);
+-    fprintf(stderr, get_status_msg(110));
++    fprintf(stderr, "%s", get_status_msg(110));
+     close(n_sockfd);
+     return 1;
+   }
+ 
+   if ((n_server_status = read_status(n_sockfd))) {
+     delete_all_lilimem(&sentinel);
+-    fprintf(stderr, get_status_msg(n_server_status));
+-    fprintf(stderr, "\n");
++    fprintf(stderr, "%s\n", get_status_msg(n_server_status));
+     close(n_sockfd);
+     return 1;
+   }
+@@ -1632,15 +1626,14 @@ static int addword (int n_remove, char*
+ 
+   if ((n_server_status = read_status(n_sockfd))) {
+     delete_all_lilimem(&sentinel);
+-    fprintf(stderr, get_status_msg(n_server_status));
+-    fprintf(stderr, "\n");
++    fprintf(stderr, "%s\n", get_status_msg(n_server_status));
+     close(n_sockfd);
+     return 1;
+   }
+ 
+   numbyte = tread(n_sockfd, inbuffer, OUTBUF_LEN);
+   if (numbyte == -1) {
+-    fprintf(stderr, get_status_msg(109));
++    fprintf(stderr, "%s", get_status_msg(109));
+     delete_all_lilimem(&sentinel);
+     close(n_sockfd);
+     n_broken_pipe = 0;
+@@ -1652,7 +1645,7 @@ static int addword (int n_remove, char*
+ 
+   closepager(pagerfp);
+ 
+-  fprintf(stderr, inbuffer);
++  fprintf(stderr, "%s", inbuffer);
+ 
+   close(n_sockfd);
+   return (0);
+@@ -1889,8 +1882,7 @@ int com_addstyle (char* arg)
+ 
+   /* check server status */
+   if ((cs_status = read_status(n_sockfd))) {
+-    fprintf(stderr, get_status_msg(cs_status));
+-    fprintf(stderr, "\n");
++    fprintf(stderr, "%s\n", get_status_msg(cs_status));
+     return 1;
+   }
+   
+@@ -1982,7 +1974,7 @@ int com_addstyle (char* arg)
+ 	  /*   	printf("phase4 server reply:%s<<\n", inbuffer); */
+ 	  if (numbyte == -1) {
+ 	    /* timeout while reading */
+-	    fprintf(stderr, get_status_msg(109));
++	    fprintf(stderr, "%s", get_status_msg(109));
+ 	    result = 1;
+ 	    goto cleanup;
+ 	  }
+@@ -2004,8 +1996,7 @@ int com_addstyle (char* arg)
+ /* 	goto cleanup; */
+       }
+       else {
+-	fprintf(stderr, get_status_msg(cs_status));
+-	fprintf(stderr, "\n");
++	fprintf(stderr, "%s\n", get_status_msg(cs_status));
+ 	result = 1;
+ 	goto cleanup;
+       }
+@@ -2457,7 +2448,7 @@ void log_print(int priority, const char*
+     fprintf(stderr, "%s\n", string);
+   }
+   else if (n_log_dest == 1) { /* output via syslog */
+-    syslog(priority, string);
++    syslog(priority, "%s", string);
+   }
+   else { /* output in user-defined logfile */
+     time(&the_time);
+--- refdb-1.0.orig/src/bib2ris.c
++++ refdb-1.0/src/bib2ris.c
+@@ -502,7 +502,7 @@ int process_bib(char* infile, int file)
+       return 1;
+     }
+     else {
+-      printf(html_string);
++      printf("%s", html_string);
+       free(html_string);
+     }
+   }
+@@ -851,7 +851,7 @@ acknowledgement, bibdate, isbn, keywords
+       return 1;
+     }
+     else {
+-      printf(html_string);
++      printf("%s",html_string);
+       free(html_string);
+     }
+   }
+@@ -1890,7 +1890,7 @@ void log_print(int priority, char* strin
+     fprintf(stderr, "%s\n", string);
+   }
+   else if (n_log_dest == 1) { /* output via syslog */
+-    syslog(priority, string);
++    syslog(priority, "%s", string);
+   }
+   else { /* output in user-defined logfile */
+     time(&the_time);

Modified: packages/refdb/trunk/debian/patches/fixsvn.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/refdb/trunk/debian/patches/fixsvn.patch?rev=2066&op=diff
==============================================================================
--- packages/refdb/trunk/debian/patches/fixsvn.patch (original)
+++ packages/refdb/trunk/debian/patches/fixsvn.patch Tue Oct  2 09:30:57 2012
@@ -1,30 +1,10 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- refdb (1.0-1) unstable; urgency=low
- .
-   * Initial Debian Upload (Closes: #)
+Description: Fix compilation from exported svn
 Author: Mathieu Malaterre <malat at debian.org>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
+Origin: upstream, https://sourceforge.net/mailarchive/message.php?msg_id=8297766
+Forwarded: not-needed
 
 --- /dev/null
 +++ refdb-1.0/src/svn_dist_version
 @@ -0,0 +1 @@
-+531
++756
 \ No newline at end of file

Modified: packages/refdb/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/refdb/trunk/debian/patches/series?rev=2066&op=diff
==============================================================================
--- packages/refdb/trunk/debian/patches/series (original)
+++ packages/refdb/trunk/debian/patches/series Tue Oct  2 09:30:57 2012
@@ -1,1 +1,2 @@
 fixsvn.patch
+fixcomp.patch




More information about the debian-xml-sgml-commit mailing list