| 1 |
blueness 13/06/01 14:21:14 |
| 2 |
|
| 3 |
Added: thttpd-renamed-htpasswd.patch |
| 4 |
Log: |
| 5 |
Add live ebuild to follow upstream closely |
| 6 |
|
| 7 |
(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 www-servers/thttpd/files/thttpd-renamed-htpasswd.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/thttpd/files/thttpd-renamed-htpasswd.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/thttpd/files/thttpd-renamed-htpasswd.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: thttpd-renamed-htpasswd.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/configure.ac b/configure.ac |
| 18 |
index 2c2dfae..e028a0d 100644 |
| 19 |
--- a/configure.ac |
| 20 |
+++ b/configure.ac |
| 21 |
@@ -42,12 +42,6 @@ if test "x${WEBDIR}" = "x" ; then |
| 22 |
WEBDIR='/usr/local/www' |
| 23 |
fi |
| 24 |
|
| 25 |
-AC_ARG_VAR(WEBGROUP, [The group that the web server will run as]) |
| 26 |
- |
| 27 |
-if test "x${WEBGROUP}" = "x" ; then |
| 28 |
- WEBGROUP='thttpd' |
| 29 |
-fi |
| 30 |
- |
| 31 |
AC_CONFIG_FILES([Makefile |
| 32 |
docs/Makefile |
| 33 |
extras/Makefile |
| 34 |
diff --git a/docs/Makefile.am b/docs/Makefile.am |
| 35 |
index 303c25f..2823290 100644 |
| 36 |
--- a/docs/Makefile.am |
| 37 |
+++ b/docs/Makefile.am |
| 38 |
@@ -1 +1 @@ |
| 39 |
-dist_man_MANS = htpasswd.1 makeweb.1 redirect.8 ssi.8 syslogtocern.8 thttpd.8 |
| 40 |
+dist_man_MANS = th_htpasswd.1 makeweb.1 redirect.8 ssi.8 syslogtocern.8 thttpd.8 |
| 41 |
diff --git a/docs/htpasswd.1 b/docs/htpasswd.1 |
| 42 |
deleted file mode 100644 |
| 43 |
index 1124b02..0000000 |
| 44 |
--- a/docs/htpasswd.1 |
| 45 |
+++ /dev/null |
| 46 |
@@ -1,16 +0,0 @@ |
| 47 |
-.TH htpasswd 1 "05 May 1998" |
| 48 |
-.SH NAME |
| 49 |
-htpasswd - manipulate HTTP-server password files |
| 50 |
-.SH SYNOPSIS |
| 51 |
-.B htpasswd |
| 52 |
-.RB [ -c ] |
| 53 |
-.I passwordfile |
| 54 |
-.I username |
| 55 |
-.SH DESCRIPTION |
| 56 |
-.PP |
| 57 |
-Sets a user's password in an httpd-style password file. |
| 58 |
-The -c flag creates a new file. |
| 59 |
-.SH AUTHOR |
| 60 |
-Rob McCool. |
| 61 |
-Modified 29aug97 by Jef Poskanzer to accept new password on stdin, |
| 62 |
-if stdin is a pipe or file. This is necessary for use from CGI. |
| 63 |
diff --git a/docs/th_htpasswd.1 b/docs/th_htpasswd.1 |
| 64 |
new file mode 100644 |
| 65 |
index 0000000..f524af9 |
| 66 |
--- /dev/null |
| 67 |
+++ b/docs/th_htpasswd.1 |
| 68 |
@@ -0,0 +1,16 @@ |
| 69 |
+.TH th_htpasswd 1 "05 May 1998" |
| 70 |
+.SH NAME |
| 71 |
+th_htpasswd - manipulate HTTP-server password files |
| 72 |
+.SH SYNOPSIS |
| 73 |
+.B th_htpasswd |
| 74 |
+.RB [ -c ] |
| 75 |
+.I passwordfile |
| 76 |
+.I username |
| 77 |
+.SH DESCRIPTION |
| 78 |
+.PP |
| 79 |
+Sets a user's password in an httpd-style password file. |
| 80 |
+The -c flag creates a new file. |
| 81 |
+.SH AUTHOR |
| 82 |
+Rob McCool. |
| 83 |
+Modified 29aug97 by Jef Poskanzer to accept new password on stdin, |
| 84 |
+if stdin is a pipe or file. This is necessary for use from CGI. |
| 85 |
diff --git a/docs/thttpd.8 b/docs/thttpd.8 |
| 86 |
index a0fd334..78af884 100644 |
| 87 |
--- a/docs/thttpd.8 |
| 88 |
+++ b/docs/thttpd.8 |
| 89 |
@@ -270,7 +270,7 @@ called .htpasswd by default. |
| 90 |
This file is formatted as the familiar colon-separated |
| 91 |
username/encrypted-password pair, records delimited by newlines. |
| 92 |
The protection does not carry over to subdirectories. |
| 93 |
-The utility program htpasswd(1) is included to help create and |
| 94 |
+The utility program th_htpasswd(1) is included to help create and |
| 95 |
modify .htpasswd files. |
| 96 |
.PP |
| 97 |
Relevant thttpd.h option: AUTH_FILE |
| 98 |
@@ -562,7 +562,7 @@ This is a little tricky to set up correctly, for instance if you are using |
| 99 |
chroot() then the log file must be within the chroot tree, but it's |
| 100 |
definitely doable. |
| 101 |
.SH "SEE ALSO" |
| 102 |
-redirect(8), ssi(8), makeweb(1), htpasswd(1), syslogtocern(8), weblog_parse(1), http_get(1) |
| 103 |
+redirect(8), ssi(8), makeweb(1), th_htpasswd(1), syslogtocern(8), weblog_parse(1), http_get(1) |
| 104 |
.SH THANKS |
| 105 |
.PP |
| 106 |
Many thanks to contributors, reviewers, testers: |
| 107 |
diff --git a/extras/Makefile.am b/extras/Makefile.am |
| 108 |
index b1f3b4d..ffd19d7 100644 |
| 109 |
--- a/extras/Makefile.am |
| 110 |
+++ b/extras/Makefile.am |
| 111 |
@@ -1,11 +1,7 @@ |
| 112 |
AM_CPPFLAGS = -DWEBDIR='"$(WEBDIR)"' |
| 113 |
|
| 114 |
-sbin_PROGRAMS = makeweb htpasswd |
| 115 |
+sbin_PROGRAMS = makeweb th_htpasswd |
| 116 |
makeweb_SOURCES = makeweb.c |
| 117 |
-htpasswd_SOURCES = htpasswd.c |
| 118 |
+th_htpasswd_SOURCES = th_htpasswd.c |
| 119 |
|
| 120 |
dist_sbin_SCRIPTS = syslogtocern |
| 121 |
- |
| 122 |
-install-exec-hook: |
| 123 |
- chgrp $(WEBGROUP) $(sbindir)/makeweb |
| 124 |
- chmod 2751 $(sbindir)/makeweb |
Archives