Attachment #123311 for bug #166638

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

Lines 7-12 Link Here

(-)chpasswd/Makefile (+1 lines)
7		7
8	PORTNAME= chpasswd	8	PORTNAME= chpasswd
9	PORTVERSION= 2.2.4	9	PORTVERSION= 2.2.4
		10	PORTREVISION= 1
10	CATEGORIES= www	11	CATEGORIES= www
11	#MASTER_SITES= SF/orsochpasswd/orsochpasswd/chpasswd-2.2.4/	12	#MASTER_SITES= SF/orsochpasswd/orsochpasswd/chpasswd-2.2.4/
12	MASTER_SITES= SF/orso${PORTNAME}/orso${PORTNAME}/${PORTNAME}-${PORTVERSION}/	13	MASTER_SITES= SF/orso${PORTNAME}/orso${PORTNAME}/${PORTNAME}-${PORTVERSION}/

Lines 1-5 Link Here

(-)chpasswd/files/patch-Makefile.in (-3 / +11 lines)
1	--- Makefile.in.orig Wed Feb 11 14:56:26 2004	1	--- Makefile.in.orig 2009-02-16 18:04:20.000000000 +0100
2	+++ Makefile.in Wed Feb 11 14:57:15 2004	2	+++ Makefile.in 2012-04-04 11:40:46.773080089 +0200
3	@@ -1,13 +1,13 @@	3	@@ -1,13 +1,13 @@
4	# Makefile.in for chpasswd.cgi	4	# Makefile.in for chpasswd.cgi
5		5
Lines 16-22 Link Here
16	PREFIX = @prefix@	16	PREFIX = @prefix@
17	DEFS = -I. @DEFS@ -DPREFIX=\"@prefix@\"	17	DEFS = -I. @DEFS@ -DPREFIX=\"@prefix@\"
18		18
19	@@ -43,7 +43,7 @@	19	@@ -37,13 +37,13 @@
		20	echo "cp $(PREFIX)/chpasswd.conf"; \
		21	cp chpasswd.conf $(PREFIX)/chpasswd.conf; \
		22	chmod 755 $(PREFIX)/chpasswd.conf; \
		23	- else \
		24	- cp chpasswd.conf $(PREFIX)/chpasswd.conf.orig; \
		25	fi
		26	+ @echo "cp $(PREFIX)/chpasswd.conf.sample"
		27	+ @cp chpasswd.conf $(PREFIX)/chpasswd.conf.sample
20	@if test ! -f $(PREFIX)/chpasswd.log; then \	28	@if test ! -f $(PREFIX)/chpasswd.log; then \
21	echo "touch $(PREFIX)/chpasswd.log"; \	29	echo "touch $(PREFIX)/chpasswd.log"; \
22	touch $(PREFIX)/chpasswd.log; \	30	touch $(PREFIX)/chpasswd.log; \




--- chpasswd.c.orig	2012-04-03 23:09:02.516342475 +0200
+++ chpasswd.c	2012-04-03 23:09:54.396341248 +0200
@@ -804,7 +804,7 @@
 
     if (strcmp(getenv("REQUEST_METHOD"), "GET") == 0) {
 	UserForm(PwdMinLen,PwdMaxLen,PwdMinChar,PwdMinNum,PwdMinSpec,BgColor,TxColor,TiColor,RuColor,Logo,Width,Height,Header,BgImage,ShowInfo);
-	return;
+	return 0;
     }
 
     pContentLength = getenv("CONTENT_LENGTH");
@@ -852,7 +852,7 @@
             if(strlen(PwdLogFile) > 0)
                log(PwdLogFile,User,New_pw1,ShowPwd,Msg,PwdFile,SmtpUser,SmtpSubject);
 	    Herror(Msg);
-	    return;
+	    return 0;
     	}
 
         if (strlen(New_pw1) < atoi(PwdMinLen)) {
@@ -860,7 +860,7 @@
  	    if(strlen(PwdLogFile) > 0)
   	       log(PwdLogFile,User,New_pw1,ShowPwd,Msg,PwdFile,SmtpUser,SmtpSubject);
 	    Herror(Msg);
-	    return;
+	    return 0;
         }
 
 	if (strlen(New_pw1) > atoi(PwdMaxLen)) {
@@ -868,7 +868,7 @@
             if(strlen(PwdLogFile) > 0)
                log(PwdLogFile,User,New_pw1,ShowPwd,Msg,PwdFile,SmtpUser,SmtpSubject);
 	    Herror(Msg);
-	    return;
+	    return 0;
 	}
 
 	if (strcmp(Old_pw, New_pw1) == 0) {
@@ -876,7 +876,7 @@
             if(strlen(PwdLogFile) > 0)
                log(PwdLogFile,User,New_pw1,ShowPwd,Msg,PwdFile,SmtpUser,SmtpSubject);
 	    Herror(Msg);
-	    return;
+	    return 0;
 	}
 
 	if (strcmp(New_pw1, New_pw2) != 0) {
@@ -884,13 +884,13 @@
             if(strlen(PwdLogFile) > 0)
                log(PwdLogFile,User,New_pw1,ShowPwd,Msg,PwdFile,SmtpUser,SmtpSubject);
 	    Herror(Msg);
-	    return;
+	    return 0;
 	}
 
 	if ((fpw = fopen(PwdFile, "r")) == NULL) {
 	    sprintf(Msg, "%s %s",msg07, PwdFile);
 	    Herror(Msg);
-	    return;
+	    return 0;
 	}
 
         fd = mkstemp(template);
@@ -898,7 +898,7 @@
             ((tmp = fdopen (fd, "w+" )) == NULL)  ) {    /* failure, bail out */
 	       sprintf(Msg, "%s",msg08);
        	       Herror(Msg);
-               return;
+               return 0;
         }
 	while (fgets(buf, MAXLEN, fpw) != NULL) {
 	    if (!ok) {
@@ -918,7 +918,7 @@
             		if(strlen(PwdLogFile) > 0)
                		   log(PwdLogFile,User,New_pw1,ShowPwd,Msg,PwdFile,SmtpUser,SmtpSubject);
 			Herror(Msg);
-			return;
+			return 0;
 		    }
 
 		    (void) srand((int) time((time_t *) NULL));
@@ -943,13 +943,13 @@
         if ((tmp = fopen(template, "r")) == NULL) {
             sprintf(Msg, "%s",msg08);
             Herror(Msg);
-            return;
+            return 0;
         }
 
         if ((fpw = fopen(PwdFile, "w")) == NULL) {
             sprintf(Msg, "%s",msg07);
             Herror(Msg);
-            return;
+            return 0;
         }
 
 	while (fgets(buf, MAXLEN, tmp) != NULL)
@@ -970,8 +970,8 @@
            if(strlen(PwdLogFile) > 0)
               log(PwdLogFile,User,New_pw1,ShowPwd,Msg,PwdFile,SmtpUser,SmtpSubject);
 	   Herror(Msg);
-	   return;
+	   return 0;
 	}
     }
-    return;
+    return 0;
 }

Lines 1-4 Link Here

(-)chpasswd/pkg-plist (-1 / +3 lines)
1	etc/chpasswd/chpasswd.conf	1	@unexec if cmp -s %D/etc/chpasswd/chpasswd.conf.sample %D/etc/chpasswd/chpasswd.conf; then rm -f %D/etc/chpasswd/chpasswd.conf; fi
		2	etc/chpasswd/chpasswd.conf.sample
		3	@exec if [ ! -f %D/etc/chpasswd/chpasswd.conf ] ; then cp -p %D/%F %B/chpasswd/chpasswd.conf; fi
2	etc/chpasswd/chpasswd.log	4	etc/chpasswd/chpasswd.log
3	www/cgi-bin/chpasswd.cgi	5	www/cgi-bin/chpasswd.cgi
4	@dirrm etc/chpasswd	6	@dirrm etc/chpasswd

Return to bug 166638

Line 0 Link Here

(-)chpasswd/files/patch-chpasswd.c (+108 lines)
		1	--- chpasswd.c.orig 2012-04-03 23:09:02.516342475 +0200
		2	+++ chpasswd.c 2012-04-03 23:09:54.396341248 +0200
		3	@@ -804,7 +804,7 @@
		4
		5	if (strcmp(getenv("REQUEST_METHOD"), "GET") == 0) {
		6	UserForm(PwdMinLen,PwdMaxLen,PwdMinChar,PwdMinNum,PwdMinSpec,BgColor,TxColor,TiColor,RuColor,Logo,Width,Height,Header,BgImage,ShowInfo);
		7	- return;
		8	+ return 0;
		9	}
		10
		11	pContentLength = getenv("CONTENT_LENGTH");
		12	@@ -852,7 +852,7 @@
		13	if(strlen(PwdLogFile) > 0)
		14	log(PwdLogFile,User,New_pw1,ShowPwd,Msg,PwdFile,SmtpUser,SmtpSubject);
		15	Herror(Msg);
		16	- return;
		17	+ return 0;
		18	}
		19
		20	if (strlen(New_pw1) < atoi(PwdMinLen)) {
		21	@@ -860,7 +860,7 @@
		22	if(strlen(PwdLogFile) > 0)
		23	log(PwdLogFile,User,New_pw1,ShowPwd,Msg,PwdFile,SmtpUser,SmtpSubject);
		24	Herror(Msg);
		25	- return;
		26	+ return 0;
		27	}
		28
		29	if (strlen(New_pw1) > atoi(PwdMaxLen)) {
		30	@@ -868,7 +868,7 @@
		31	if(strlen(PwdLogFile) > 0)
		32	log(PwdLogFile,User,New_pw1,ShowPwd,Msg,PwdFile,SmtpUser,SmtpSubject);
		33	Herror(Msg);
		34	- return;
		35	+ return 0;
		36	}
		37
		38	if (strcmp(Old_pw, New_pw1) == 0) {
		39	@@ -876,7 +876,7 @@
		40	if(strlen(PwdLogFile) > 0)
		41	log(PwdLogFile,User,New_pw1,ShowPwd,Msg,PwdFile,SmtpUser,SmtpSubject);
		42	Herror(Msg);
		43	- return;
		44	+ return 0;
		45	}
		46
		47	if (strcmp(New_pw1, New_pw2) != 0) {
		48	@@ -884,13 +884,13 @@
		49	if(strlen(PwdLogFile) > 0)
		50	log(PwdLogFile,User,New_pw1,ShowPwd,Msg,PwdFile,SmtpUser,SmtpSubject);
		51	Herror(Msg);
		52	- return;
		53	+ return 0;
		54	}
		55
		56	if ((fpw = fopen(PwdFile, "r")) == NULL) {
		57	sprintf(Msg, "%s %s",msg07, PwdFile);
		58	Herror(Msg);
		59	- return;
		60	+ return 0;
		61	}
		62
		63	fd = mkstemp(template);
		64	@@ -898,7 +898,7 @@
65	((tmp = fdopen (fd, "w+" )) == NULL) ) { /* failure, bail out */
66	sprintf(Msg, "%s",msg08);
67	Herror(Msg);
68	- return;
69	+ return 0;
70	}
71	while (fgets(buf, MAXLEN, fpw) != NULL) {
72	if (!ok) {
73	@@ -918,7 +918,7 @@
74	if(strlen(PwdLogFile) > 0)
75	log(PwdLogFile,User,New_pw1,ShowPwd,Msg,PwdFile,SmtpUser,SmtpSubject);
76	Herror(Msg);
77	- return;
78	+ return 0;
79	}
80
81	(void) srand((int) time((time_t *) NULL));
82	@@ -943,13 +943,13 @@
83	if ((tmp = fopen(template, "r")) == NULL) {
84	sprintf(Msg, "%s",msg08);
85	Herror(Msg);
86	- return;
87	+ return 0;
88	}
89
90	if ((fpw = fopen(PwdFile, "w")) == NULL) {
91	sprintf(Msg, "%s",msg07);
92	Herror(Msg);
93	- return;
94	+ return 0;
95	}
96
97	while (fgets(buf, MAXLEN, tmp) != NULL)
98	@@ -970,8 +970,8 @@
99	if(strlen(PwdLogFile) > 0)
100	log(PwdLogFile,User,New_pw1,ShowPwd,Msg,PwdFile,SmtpUser,SmtpSubject);
101	Herror(Msg);
102	- return;
103	+ return 0;
104	}
105	}
106	- return;
107	+ return 0;
108	}