/[gentoo-x86]/www-servers/thttpd/files/thttpd-renamed-htpasswd.patch
Gentoo

Contents of /www-servers/thttpd/files/thttpd-renamed-htpasswd.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Fri Oct 3 19:30:31 2014 UTC (3 years, 4 months ago) by blueness
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +2 -2 lines
Version bump

(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

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

  ViewVC Help
Powered by ViewVC 1.1.20