Attachment #190356 for bug #225701

View | Details | Raw Unified | Return to bug 225701
Collapse All | Expand All

Lines 1-8 Link Here

(-)./Makefile (-2 / +1 lines)
1	# Created by: Anders Nordby <anders@fix.no>
2	# $FreeBSD: head/www/thttpd/Makefile 437856 2017-04-06 07:08:10Z danfe $	1	# $FreeBSD: head/www/thttpd/Makefile 437856 2017-04-06 07:08:10Z danfe $
3		2
4	PORTNAME= thttpd	3	PORTNAME= thttpd
5	PORTVERSION= 2.27	4	PORTVERSION= 2.28
6	CATEGORIES= www ipv6	5	CATEGORIES= www ipv6
7	MASTER_SITES= http://www.acme.com/software/thttpd/	6	MASTER_SITES= http://www.acme.com/software/thttpd/
8		7

Lines 1-2 Link Here

(-)./distinfo (-2 / +3 lines)
1	SHA256 (thttpd-2.27.tar.gz) = b1c4bc37ada7c39cc2bcfbf86b3bc05be91be49f8bb4f55379eaff1f66516d7a	1	TIMESTAMP = 1517895724
2	SIZE (thttpd-2.27.tar.gz) = 134005	2	SHA256 (thttpd-2.28.tar.gz) = 8552f929d4ede26cb193411c1208168e169dda24ee9eb1da8f8da4f4f8e10328
		3	SIZE (thttpd-2.28.tar.gz) = 135754




--- extras/htpasswd.c.orig	2017-12-13 16:35:28 UTC
+++ extras/htpasswd.c
@@ -19,7 +19,12 @@
 #define LF 10

     exit(1);
 }
 
@@ -149,52 +155,131 @@ void interrupted(int signo) {
 int main(int argc, char *argv[]) {
     FILE *tfp,*f;
     char user[MAX_STRING_LEN];

+        exit(1);
+    }
+    /* already checked for boflw ... */
     strncpy(user,argv[2],sizeof(user)-1);
     user[sizeof(user)-1] = '\0';
 
     found = 0;
-    while(!(my_getline(line,MAX_STRING_LEN,f))) {

             putline(tfp,line);
             continue;
         }
         strcpy(l,line);
         getword(w,l,':');
+        i = index(line,':');
+        w[0] = '\0';
+        /* actually, cpw is CPW_LEN chars and never null, hence ':' should 

         if(strcmp(user,w)) {
             putline(tfp,line);
             continue;
@@ -209,10 +294,28 @@ int main(int argc, char *argv[]) {
         printf("Adding user %s\n",user);
         add_password(user,tfp);
     }




--- mmc.c.orig	2015-11-05 18:13:49 UTC
+++ mmc.c
@@ -83,6 +83,9 @@ typedef struct MapStruct {
     time_t ct;

 	if ( munmap( m->addr, m->size ) < 0 )
 	    syslog( LOG_ERR, "munmap - %m" );
 #else /* HAVE_MMAP */
@@ -523,7 +543,7 @@ void
 mmc_logstats( long secs )
     {
     syslog(
-	LOG_NOTICE, "  map cache - %d allocated, %d active (%lld bytes), %d free; hash size: %d; expire age: %ld",
+	LOG_NOTICE, "  map cache - %d allocated, %d active (%lld bytes), %d free; hash size: %d; expire age: %d",
 	alloc_count, map_count, (long long) mapped_bytes, free_count, hash_size,
 	expire_age );
     if ( map_count + free_count != alloc_count )

Return to bug 225701

Lines 1-4 Link Here

(-)./files/patch-extras_htpasswd.c (-6 / +7 lines)
1	--- extras/htpasswd.c.orig 2001-12-19 00:08:08 UTC	1	--- extras/htpasswd.c.orig 2017-12-13 16:35:28 UTC
2	+++ extras/htpasswd.c	2	+++ extras/htpasswd.c
3	@@ -19,7 +19,12 @@	3	@@ -19,7 +19,12 @@
4	#define LF 10	4	#define LF 10
Lines 25-31 Link Here
25	exit(1);	25	exit(1);
26	}	26	}
27		27
28	@@ -149,51 +155,128 @@ void interrupted(int signo) {	28	@@ -149,52 +155,131 @@ void interrupted(int signo) {
29	int main(int argc, char *argv[]) {	29	int main(int argc, char *argv[]) {
30	FILE tfp,f;	30	FILE tfp,f;
31	char user[MAX_STRING_LEN];	31	char user[MAX_STRING_LEN];
Lines 138-144 Link Here
138	+ exit(1);	138	+ exit(1);
139	+ }	139	+ }
140	+ /* already checked for boflw ... */	140	+ /* already checked for boflw ... */
141	strcpy(user,argv[2]);	141	strncpy(user,argv[2],sizeof(user)-1);
		142	user[sizeof(user)-1] = '\0';
142		143
143	found = 0;	144	found = 0;
144	- while(!(my_getline(line,MAX_STRING_LEN,f))) {	145	- while(!(my_getline(line,MAX_STRING_LEN,f))) {
Lines 150-157 Link Here
150	putline(tfp,line);	151	putline(tfp,line);
151	continue;	152	continue;
152	}	153	}
153	- strcpy(l,line);	154	strcpy(l,line);
154	- getword(w,l,':');	155	getword(w,l,':');
155	+ i = index(line,':');	156	+ i = index(line,':');
156	+ w[0] = '\0';	157	+ w[0] = '\0';
157	+ /* actually, cpw is CPW_LEN chars and never null, hence ':' should	158	+ /* actually, cpw is CPW_LEN chars and never null, hence ':' should
Lines 166-172 Link Here
166	if(strcmp(user,w)) {	167	if(strcmp(user,w)) {
167	putline(tfp,line);	168	putline(tfp,line);
168	continue;	169	continue;
169	@@ -208,10 +291,28 @@ int main(int argc, char *argv[]) {	170	@@ -209,10 +294,28 @@ int main(int argc, char *argv[]) {
170	printf("Adding user %s\n",user);	171	printf("Adding user %s\n",user);
171	add_password(user,tfp);	172	add_password(user,tfp);
172	}	173	}

Lines 1-4 Link Here

(-)./files/patch-mmc.c (-10 / +1 lines)
1	--- mmc.c.orig 2014-12-10 20:53:22 UTC	1	--- mmc.c.orig 2015-11-05 18:13:49 UTC
2	+++ mmc.c	2	+++ mmc.c
3	@@ -83,6 +83,9 @@ typedef struct MapStruct {	3	@@ -83,6 +83,9 @@ typedef struct MapStruct {
4	time_t ct;	4	time_t ct;
Lines 87-98 Link Here
87	if ( munmap( m->addr, m->size ) < 0 )	87	if ( munmap( m->addr, m->size ) < 0 )
88	syslog( LOG_ERR, "munmap - %m" );	88	syslog( LOG_ERR, "munmap - %m" );
89	#else /* HAVE_MMAP */	89	#else /* HAVE_MMAP */
90	@@ -523,7 +543,7 @@ void
91	mmc_logstats( long secs )
92	{
93	syslog(
94	- LOG_NOTICE, " map cache - %d allocated, %d active (%lld bytes), %d free; hash size: %d; expire age: %ld",
95	+ LOG_NOTICE, " map cache - %d allocated, %d active (%lld bytes), %d free; hash size: %d; expire age: %d",
96	alloc_count, map_count, (long long) mapped_bytes, free_count, hash_size,
97	expire_age );
98	if ( map_count + free_count != alloc_count )