summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorHye-Shik Chang <perky@FreeBSD.org>2002-07-08 07:42:04 +0000
committerHye-Shik Chang <perky@FreeBSD.org>2002-07-08 07:42:04 +0000
commit0360be38d574b7347c65887704ca3468159fa3ff (patch)
tree8f143ba9c681a6fffe05d213d334c0e3fadc4a31 /www
parent- Update to version 1.18 (diff)
Fix more fatal bugs on htpasswd(1)
Requested by: "Jon Noack" <noackjr@compgeek.com> Obtained from: Apache Group CVS (rev 1.49-1.51)
Notes
Notes: svn path=/head/; revision=62635
Diffstat (limited to '')
-rw-r--r--www/apache2/Makefile2
-rw-r--r--www/apache2/files/patch-support:htpasswd.c22
-rw-r--r--www/apache20/Makefile2
-rw-r--r--www/apache20/files/patch-support:htpasswd.c22
-rw-r--r--www/apache21/Makefile2
-rw-r--r--www/apache21/files/patch-support:htpasswd.c22
-rw-r--r--www/apache22/Makefile2
-rw-r--r--www/apache22/files/patch-support:htpasswd.c22
8 files changed, 80 insertions, 16 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 69dd84b0d092..95824f5133a3 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= apache
PORTVERSION= 2.0.39
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www ipv6
MASTER_SITES= http://www.apache.org/dist/httpd/ \
http://apache.mirrorcentral.com/dist/httpd/ \
diff --git a/www/apache2/files/patch-support:htpasswd.c b/www/apache2/files/patch-support:htpasswd.c
index 3267c08e9c31..f836f157fa1b 100644
--- a/www/apache2/files/patch-support:htpasswd.c
+++ b/www/apache2/files/patch-support:htpasswd.c
@@ -1,6 +1,14 @@
---- support/htpasswd.c 2002/06/18 02:58:36 1.48
-+++ support/htpasswd.c 2002/06/19 17:31:19 1.49
-@@ -375,7 +375,7 @@
+--- support/htpasswd.c.orig Tue Jun 18 11:58:36 2002
++++ support/htpasswd.c Mon Jul 8 16:30:14 2002
+@@ -236,6 +236,7 @@
+ strcpy(record, user);
+ strcat(record, ":");
+ strcat(record, cpw);
++ strcat(record, "\n");
+ return 0;
+ }
+
+@@ -375,7 +376,7 @@
}
}
@@ -9,3 +17,11 @@
apr_file_printf(errfile, "%s: -c and -n options conflict\n", argv[0]);
exit(ERR_SYNTAX);
}
+@@ -592,6 +593,7 @@
+ */
+ apr_file_printf(errfile, "Updating ");
+ putline(ftemp, record);
++ found++;
+ }
+ }
+ }
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 69dd84b0d092..95824f5133a3 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -7,7 +7,7 @@
PORTNAME= apache
PORTVERSION= 2.0.39
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www ipv6
MASTER_SITES= http://www.apache.org/dist/httpd/ \
http://apache.mirrorcentral.com/dist/httpd/ \
diff --git a/www/apache20/files/patch-support:htpasswd.c b/www/apache20/files/patch-support:htpasswd.c
index 3267c08e9c31..f836f157fa1b 100644
--- a/www/apache20/files/patch-support:htpasswd.c
+++ b/www/apache20/files/patch-support:htpasswd.c
@@ -1,6 +1,14 @@
---- support/htpasswd.c 2002/06/18 02:58:36 1.48
-+++ support/htpasswd.c 2002/06/19 17:31:19 1.49
-@@ -375,7 +375,7 @@
+--- support/htpasswd.c.orig Tue Jun 18 11:58:36 2002
++++ support/htpasswd.c Mon Jul 8 16:30:14 2002
+@@ -236,6 +236,7 @@
+ strcpy(record, user);
+ strcat(record, ":");
+ strcat(record, cpw);
++ strcat(record, "\n");
+ return 0;
+ }
+
+@@ -375,7 +376,7 @@
}
}
@@ -9,3 +17,11 @@
apr_file_printf(errfile, "%s: -c and -n options conflict\n", argv[0]);
exit(ERR_SYNTAX);
}
+@@ -592,6 +593,7 @@
+ */
+ apr_file_printf(errfile, "Updating ");
+ putline(ftemp, record);
++ found++;
+ }
+ }
+ }
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index 69dd84b0d092..95824f5133a3 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -7,7 +7,7 @@
PORTNAME= apache
PORTVERSION= 2.0.39
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www ipv6
MASTER_SITES= http://www.apache.org/dist/httpd/ \
http://apache.mirrorcentral.com/dist/httpd/ \
diff --git a/www/apache21/files/patch-support:htpasswd.c b/www/apache21/files/patch-support:htpasswd.c
index 3267c08e9c31..f836f157fa1b 100644
--- a/www/apache21/files/patch-support:htpasswd.c
+++ b/www/apache21/files/patch-support:htpasswd.c
@@ -1,6 +1,14 @@
---- support/htpasswd.c 2002/06/18 02:58:36 1.48
-+++ support/htpasswd.c 2002/06/19 17:31:19 1.49
-@@ -375,7 +375,7 @@
+--- support/htpasswd.c.orig Tue Jun 18 11:58:36 2002
++++ support/htpasswd.c Mon Jul 8 16:30:14 2002
+@@ -236,6 +236,7 @@
+ strcpy(record, user);
+ strcat(record, ":");
+ strcat(record, cpw);
++ strcat(record, "\n");
+ return 0;
+ }
+
+@@ -375,7 +376,7 @@
}
}
@@ -9,3 +17,11 @@
apr_file_printf(errfile, "%s: -c and -n options conflict\n", argv[0]);
exit(ERR_SYNTAX);
}
+@@ -592,6 +593,7 @@
+ */
+ apr_file_printf(errfile, "Updating ");
+ putline(ftemp, record);
++ found++;
+ }
+ }
+ }
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 69dd84b0d092..95824f5133a3 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -7,7 +7,7 @@
PORTNAME= apache
PORTVERSION= 2.0.39
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www ipv6
MASTER_SITES= http://www.apache.org/dist/httpd/ \
http://apache.mirrorcentral.com/dist/httpd/ \
diff --git a/www/apache22/files/patch-support:htpasswd.c b/www/apache22/files/patch-support:htpasswd.c
index 3267c08e9c31..f836f157fa1b 100644
--- a/www/apache22/files/patch-support:htpasswd.c
+++ b/www/apache22/files/patch-support:htpasswd.c
@@ -1,6 +1,14 @@
---- support/htpasswd.c 2002/06/18 02:58:36 1.48
-+++ support/htpasswd.c 2002/06/19 17:31:19 1.49
-@@ -375,7 +375,7 @@
+--- support/htpasswd.c.orig Tue Jun 18 11:58:36 2002
++++ support/htpasswd.c Mon Jul 8 16:30:14 2002
+@@ -236,6 +236,7 @@
+ strcpy(record, user);
+ strcat(record, ":");
+ strcat(record, cpw);
++ strcat(record, "\n");
+ return 0;
+ }
+
+@@ -375,7 +376,7 @@
}
}
@@ -9,3 +17,11 @@
apr_file_printf(errfile, "%s: -c and -n options conflict\n", argv[0]);
exit(ERR_SYNTAX);
}
+@@ -592,6 +593,7 @@
+ */
+ apr_file_printf(errfile, "Updating ");
+ putline(ftemp, record);
++ found++;
+ }
+ }
+ }
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 12:14:44 +0000