diff options
Diffstat (limited to 'www')
135 files changed, 28 insertions, 3179 deletions
diff --git a/www/Makefile b/www/Makefile index e1e9df68d49..2054bfcd8d1 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1294 2017/12/30 21:37:44 adam Exp $ +# $NetBSD: Makefile,v 1.1295 2018/01/01 10:23:04 wiz Exp $ # COMMENT= Packages related to the World Wide Web @@ -15,24 +15,11 @@ SUBDIR+= amaya SUBDIR+= analog SUBDIR+= ap-auth-kerb SUBDIR+= ap-auth-mellon -SUBDIR+= ap-auth-mysql SUBDIR+= ap-authnz-crowd -SUBDIR+= ap-fastcgi -SUBDIR+= ap-geoip2 SUBDIR+= ap-mono SUBDIR+= ap-php SUBDIR+= ap-rpaf -SUBDIR+= ap-scgi -SUBDIR+= ap2-auth-external SUBDIR+= ap2-auth-mellon -SUBDIR+= ap2-auth-mysql -SUBDIR+= ap2-auth-ntlm -SUBDIR+= ap2-auth-pgsql -SUBDIR+= ap2-auth-radius -SUBDIR+= ap2-auth-xradius -SUBDIR+= ap2-authn-otp -SUBDIR+= ap2-bw -SUBDIR+= ap2-cband SUBDIR+= ap2-encoding SUBDIR+= ap2-fcgid SUBDIR+= ap2-jk @@ -41,17 +28,11 @@ SUBDIR+= ap2-mkdir SUBDIR+= ap2-perl SUBDIR+= ap2-python SUBDIR+= ap2-subversion -SUBDIR+= ap2-suphp -SUBDIR+= ap2-transform SUBDIR+= ap2-upload SUBDIR+= ap2-xsendfile SUBDIR+= ap22-auth-ofba -SUBDIR+= ap22-authn-sasl -SUBDIR+= ap22-authnz-external SUBDIR+= ap22-authz-ldap SUBDIR+= ap22-dnssd -SUBDIR+= ap22-limitipconn -SUBDIR+= ap22-vhost-ldap SUBDIR+= ap24-authnz-external SUBDIR+= apache-roller SUBDIR+= apache-tomcat55 @@ -59,7 +40,6 @@ SUBDIR+= apache-tomcat6 SUBDIR+= apache-tomcat7 SUBDIR+= apache-tomcat8 SUBDIR+= apache-tomcat85 -SUBDIR+= apache22 SUBDIR+= apache24 SUBDIR+= apachetop SUBDIR+= asp2php diff --git a/www/ap-auth-kerb/Makefile b/www/ap-auth-kerb/Makefile index bd221c18225..a2fb372300d 100644 --- a/www/ap-auth-kerb/Makefile +++ b/www/ap-auth-kerb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2016/12/12 14:22:04 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2018/01/01 10:23:05 wiz Exp $ DISTNAME= mod_auth_kerb-5.4 PKGNAME= ${DISTNAME:S/mod/${APACHE_PKG_PREFIX}/:S/_/-/g} @@ -10,8 +10,6 @@ HOMEPAGE= http://modauthkerb.sourceforge.net/ COMMENT= Module to allow Apache authentication using Kerberos LICENSE= modified-bsd -PKG_APACHE_ACCEPTED= apache22 apache24 - CONFLICTS= ap-auth-kerb-[0-9]* GNU_CONFIGURE= yes diff --git a/www/ap-auth-mellon/Makefile b/www/ap-auth-mellon/Makefile index c3baa9540f7..72a514dc4e1 100644 --- a/www/ap-auth-mellon/Makefile +++ b/www/ap-auth-mellon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2017/08/24 20:03:41 adam Exp $ +# $NetBSD: Makefile,v 1.3 2018/01/01 10:23:05 wiz Exp $ DISTNAME= mod_auth_mellon-0.13.1 PKGNAME= ${DISTNAME:S/mod/${APACHE_PKG_PREFIX}/:S/_/-/g} @@ -14,8 +14,6 @@ HOMEPAGE= https://github.com/UNINETT/mod_auth_mellon COMMENT= Module to allow Apache authentication using a SAML 2.0 IdP LICENSE= gnu-gpl-v2 -PKG_APACHE_ACCEPTED= apache22 apache24 - GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-apxs2=${APXS} USE_LIBTOOL= yes diff --git a/www/ap-auth-mysql/DESCR b/www/ap-auth-mysql/DESCR deleted file mode 100644 index 397ce787268..00000000000 --- a/www/ap-auth-mysql/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -A module for the Apache web server which enables HTTP authentication -against information stored in a MySQL database. diff --git a/www/ap-auth-mysql/MESSAGE b/www/ap-auth-mysql/MESSAGE deleted file mode 100644 index 9489f030f9c..00000000000 --- a/www/ap-auth-mysql/MESSAGE +++ /dev/null @@ -1,9 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.1.1.1 2004/07/16 11:28:19 jdolecek Exp $ - -In order to use this module in your Apache installation, you need to -add the following to your httpd.conf file: - - LoadModule auth_mysql_module ${PREFIX}/lib/httpd/mod_auth_mysql.so - -=========================================================================== diff --git a/www/ap-auth-mysql/Makefile b/www/ap-auth-mysql/Makefile deleted file mode 100644 index d71f110c9cb..00000000000 --- a/www/ap-auth-mysql/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# $NetBSD: Makefile,v 1.31 2014/06/10 15:22:14 joerg Exp $ -# - -DISTNAME= mod-auth-mysql_4.3.9.orig -PKGNAME= ${APACHE_PKG_PREFIX}-auth-mysql-4.3.9 -PKGREVISION= 3 -WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} -CATEGORIES= www databases security -MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/m/mod-auth-mysql/} - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://packages.debian.org/sid/libapache2-mod-auth-mysql -COMMENT= Module to allow apache authentication against a MySQL database - -PKG_APACHE_ACCEPTED= apache22 - -CONFLICTS= ap-auth-mysql-[0-9]* - -GNU_CONFIGURE= yes -USE_LIBTOOL= yes - -CONFIGURE_ARGS+= --with-mysql-includes=${BUILDLINK_PREFIX.mysql-client}/${BUILDLINK_INCDIRS.mysql-client} \ - --with-mysql-libs=${BUILDLINK_PREFIX.mysql-client}/${BUILDLINK_LIBDIRS.mysql-client} -LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/${BUILDLINK_LIBDIRS.mysql-client} - -WRKSRC= ${WRKDIR}/${DISTNAME:S/.orig//:S/_/-/} - -.include "../../mk/apache.mk" - -CONFIGURE_ARGS+= --disable-apache13 --enable-apache2 - -APACHE_MODULE= YES -APACHE_MODULE_NAME= mod_auth_mysql.so - -INSTALLATION_DIRS= lib/httpd share/doc/mod_auth_mysql - -do-install: - if [ -f ${WRKSRC}/.libs/apache2_mod_auth_mysql.so ]; then \ - ${INSTALL_DATA} \ - ${WRKSRC}/.libs/apache2_mod_auth_mysql.so \ - ${DESTDIR}${PREFIX}/lib/httpd/mod_auth_mysql.so; \ - elif [ -f ${WRKSRC}/.libs/${PKG_APACHE}_mod_auth_mysql.so ]; then \ - ${INSTALL_DATA} \ - ${WRKSRC}/.libs/${PKG_APACHE}_mod_auth_mysql.so \ - ${DESTDIR}${PREFIX}/lib/httpd/mod_auth_mysql.so; \ - elif [ -f ${WRKSRC}/libs/${PKG_APACHE}_mod_auth_mysql.so ]; then \ - ${INSTALL_DATA} \ - ${WRKSRC}/libs/${PKG_APACHE}_mod_auth_mysql.so \ - ${DESTDIR}${PREFIX}/lib/httpd/mod_auth_mysql.so; \ - elif [ -f ${WRKSRC}/${PKG_APACHE}_mod_auth_mysql.so ]; then \ - ${INSTALL_DATA} \ - ${WRKSRC}/${PKG_APACHE}_mod_auth_mysql.so \ - ${DESTDIR}${PREFIX}/lib/httpd/mod_auth_mysql.so; \ - fi - ${INSTALL_DATA} ${WRKSRC}/DIRECTIVES ${DESTDIR}${PREFIX}/share/doc/mod_auth_mysql - ${INSTALL_DATA} ${WRKSRC}/USAGE ${DESTDIR}${PREFIX}/share/doc/mod_auth_mysql - -.include "../../mk/mysql.buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/www/ap-auth-mysql/PLIST b/www/ap-auth-mysql/PLIST deleted file mode 100644 index 35443f6f2c3..00000000000 --- a/www/ap-auth-mysql/PLIST +++ /dev/null @@ -1,4 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 22:00:15 joerg Exp $ -lib/httpd/mod_auth_mysql.so -share/doc/mod_auth_mysql/DIRECTIVES -share/doc/mod_auth_mysql/USAGE diff --git a/www/ap-auth-mysql/distinfo b/www/ap-auth-mysql/distinfo deleted file mode 100644 index 86c7b15e1aa..00000000000 --- a/www/ap-auth-mysql/distinfo +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: distinfo,v 1.9 2015/11/04 02:46:47 agc Exp $ - -SHA1 (mod-auth-mysql_4.3.9.orig.tar.gz) = 417efcd2fcd2cce9092843179b52b5901e38aea6 -RMD160 (mod-auth-mysql_4.3.9.orig.tar.gz) = 06d041bf229007e2d08dc86285f349d33df2e019 -SHA512 (mod-auth-mysql_4.3.9.orig.tar.gz) = 292c167706f31542c74f24e481a227a36dfdfea57fc51f471188e2fd5188dc785789bd060f9c9d90d94a67492dc7ec64331a1af83fade4f70549cb9ddfb32f16 -Size (mod-auth-mysql_4.3.9.orig.tar.gz) = 48479 bytes -SHA1 (patch-DIRECTIVES) = a7ec300f0c4efaa2137818af5aa711e569be86eb -SHA1 (patch-USAGE) = 441f0da8842d51ee994c8ead114cbda9135e632f -SHA1 (patch-aa) = c18f857317b5838c955ddfea501961e0e2a88e76 -SHA1 (patch-ab) = 7acddeb4e25a50e7460b07e498bbc71a9d125ea5 -SHA1 (patch-ac) = 4cbc888cc09c522270690d39a6625d3d5967440f -SHA1 (patch-ad) = 13a665c78c4c4bf4d359a6e6ec4e36e2a4027687 -SHA1 (patch-ae) = 2e5569026965558d9490d3a8face857f5d611b1b diff --git a/www/ap-auth-mysql/patches/patch-DIRECTIVES b/www/ap-auth-mysql/patches/patch-DIRECTIVES deleted file mode 100644 index e314143510e..00000000000 --- a/www/ap-auth-mysql/patches/patch-DIRECTIVES +++ /dev/null @@ -1,251 +0,0 @@ -$NetBSD: patch-DIRECTIVES,v 1.1 2011/04/01 15:11:58 wiz Exp $ - -All Debian patches up to 4.3.9-13. - ---- DIRECTIVES.orig 2004-12-23 13:43:14.000000000 +0000 -+++ DIRECTIVES -@@ -1,23 +1,27 @@ - All the directives understood by this version of mod-auth-mysql are listed --below. The huge number of synonym directives is due to the merging of two --separate versions of the program, both of which had subtly different usage --symantics. I'm sure there will be rationalisation in the near future. -+below. All directives exist in the two forms Auth_MySQL_* and AuthMySQL_* -+and share the same semantics. They are the result of merging two separate -+versions of the mod_auth_mysql in the first place, both of which had subtly -+different usage symantics. The directive names have since then unified. -+ -+Auth_MySQL <on/off> -+ Enable/disable MySQL authentication - - Auth_MySQL_Info <host> <user> <password> - Server-wide config option to specify the database host, username, - and password used to connect to the MySQL server. - - This option affects all directories which do not override it via -- AuthMySQL_Host, AuthMySQL_User, and/or AuthMySQL_Password. -+ Auth_MySQL_Host, Auth_MySQL_User, and/or Auth_MySQL_Password. - --AuthMySQL_DefaultHost <hostname> -+Auth_MySQL_DefaultHost <hostname> - Specifies the MySQL server to use for authentication. - - This option affects all directories which do not override it via -- AuthMySQL_Host. -+ Auth_MySQL_Host. - --AuthMySQL_Host <hostname> -- Synonym for AuthMySQL_DefaultHost, to be used in .htaccess files and -+Auth_MySQL_Host <hostname> -+ Synonym for Auth_MySQL_DefaultHost, to be used in .htaccess files and - directory-specific entries. - - Auth_MySQL_DefaultPort <portnum> -@@ -28,35 +32,37 @@ Auth_MySQL_DefaultPort <portnum> - Auth_MySQL_Port. - - Auth_MySQL_Port <portnum> -- Specifies a non-default port to use (other than 3306) when talking -- to the MySQL server on AuthMySQL_Host or AuthMySQL_DefaultHost. -+ Synonym for Auth_MySQL_DefaultPort, to be used in .htaccess files and -+ directory-specific entries. - - Auth_MySQL_DefaultSocket <socketname> -- If using a local MySQL server, you can -- specify a non-default named pipe to use instead of the default pipe -- name compiled into your MySQL client library. -+ If using a local MySQL server, you can specify a non-default named -+ pipe to use instead of the default pipe name compiled into your MySQL -+ client library. - - This option affects all directories which do not override it via - Auth_MySQL_Socket. - - Auth_MySQL_Socket <socketname> -- If using a local MySQL server, you can specify a non-default named -- pipe to use instead of the default one compiled into MySQL with this -- option. -+ Synonym for Auth_MySQL_DefaultSocket, to be used in .htaccess files and -+ directory-specific entries. - --AuthMySQL_DefaultUser <username> -+Auth_MySQL_DefaultUser <username> - Specifies the username for connection to the MySQL server. - --AuthMySQL_User <username> -- Synonym for AuthMySQL_DefaultUser, to be used in .htaccess files and -+Auth_MySQL_User <username> -+ Synonym for Auth_MySQL_DefaultUser, to be used in .htaccess files and - directory-specific entries. - --AuthMySQL_DefaultPassword <password> -+Auth_MySQL_Username <username> -+ Synonym for Auth_MySQL_User. -+ -+Auth_MySQL_DefaultPassword <password> - Specifies the password user together with the above user. - --AuthMySQL_Password <password> -- Synonym for AuthMySQL_Password, to be used in .htaccess files and -- directory-specific entries. -+Auth_MySQL_Password <password> -+ Synonym for Auth_MySQL_DefaultPassword, to be used in .htaccess files -+ and directory-specific entries. - - Auth_MySQL_General_DB <database_name> - Server-wide, specifies a default database name to use. -@@ -65,12 +71,20 @@ Auth_MySQL_DB <database_name> - Synonym for Auth_MySQL_General_DB, to be used in .htaccess files and - directory-specific entries. - --AuthMySQL_DefaultDB <database_name> -+Auth_MySQL_DefaultDB <database_name> - Synonym for Auth_MySQL_General_DB. - --AuthMySQL_DB <database_name> -- Synonym for Auth_MySQL_General_DB, to be used in .htaccess files and -- directory-specific entries. -+Auth_MySQL_CharacterSet <character set> -+ -+ Set the connection character set to the specified one. Otherwise no -+ particular character set is used when the connection is created. -+ This could cause problems with differently encoded strings and table -+ or column collations. The parameter must be a valid MySQL -+ character. It is mandatory if the character set used for tables/rows -+ differs from the default. -+ -+AuthMySQL_CharacterSet <character set> -+ Synonym for Auth_MySQL_CharacterSet. - - AuthName "<Realm>" - Describes the data you're guarding. -@@ -96,39 +110,28 @@ Auth_MySQL_Password_Table <password_tabl - The name of the MySQL table in the specified database which stores - username:password pairs. By default, it is 'mysql_auth'. - --AuthMySQL_Password_Table <password_table_name> -- Synonym for Auth_MySQL_Password_Table. -- - Auth_MySQL_Group_Table <group_table_name> - As per ...Password_Table above, stores username:group pairs. - Normally you'll store username:password:group triplets in the one - table, but we are nothing if not flexible. Defaults to - 'mysql_auth'. - --AuthMySQL_Group_Table <group_table_name> -- Synonym for Auth_MySQL_Group_Table. -- - Auth_MySQL_Username_Field <username_field_name> - The name of the field which stores usernames. Defaults to - 'username'. The username/password combo specified in Auth_MySQL_Info - must have select privileges to this field in the Password and Group - tables. - --AuthMySQL_Username_Field <username_field_name> -- Synonym for Auth_MySQL_Username_Field. -- - Auth_MySQL_Password_Field <password_field_name> - As per ...Username_Field above, but for passwords. Same MySQL -- access privileges. Defaults to 'password'. -+ access privileges. Defaults to 'passwd'. - - AuthMySQL_Password_Field <password_field_name> - Synonym for Auth_MySQL_Password_Field. - - Auth_MySQL_Group_Field <group_field_name> -- As per ...Username_Field above. Defaults to 'groups'. -- --AuthMySQL_Group_Field <group_field_name> -- Synonym for Auth_MySQL_Group_Field. -+ As per ...Username_Field above. Defaults to 'groups'. The query -+ will use FIND_IN_SET(<group_name>,<group_field_name>). - - Auth_MySQL_Group_User_Field <field_name> - The name of the field in the groups table which stores the username. -@@ -146,6 +149,9 @@ Auth_MySQL_Group_Clause <SQL fragment> - Adds arbitrary clause to username:group matching query, for example: - " AND Allowed=1". Clause has to start with space. Default is empty. - -+Auth_MySQL_Where_Clause <SQL fragment> -+ Synonym for Auth_MySQL_Password_Clause. -+ - Auth_MySQL_Empty_Passwords <on/off> - Whether or not to allow empty passwords. If the password field is - empty (equals to '') and this option is 'on', users would be able to -@@ -153,9 +159,6 @@ Auth_MySQL_Empty_Passwords <on/off> - PASSWORD CHECKING. If this is 'off', they would be denied access. - Default: 'on'. - --AuthMySQL_Empty_Passwords <on/off> -- Synonym for Auth_MySQL_Empty_Passwords. -- - Auth_MySQL_Encryption_Types <type_list> - - Select which types of encryption to check, and in which order to -@@ -203,10 +206,11 @@ Auth_MySQL_Encryption_Types <type_list> - - MySQL - The hashing scheme used by the MySQL PASSWORD() function. -+ -+ Apache -+ The hashing scheme used by htpasswd utility. Compatible to -+ authuserfile. - --AuthMySQL_Encryption_Types <type_list> -- Synonym for Auth_MySQL_Encryption_Types. -- - Auth_MySQL_Encrypted_Passwords <on/off> (DEPRECATED) - Equivalent to: Auth_MySQL_Encryption_Types Crypt_DES - Only used if ...Encryption_Types is not set. Defaults to 'on'. If -@@ -214,17 +218,11 @@ Auth_MySQL_Encrypted_Passwords <on/off> - ...Encryption_Types is not set, passwords are expected to be in - plaintext. - --AuthMySQL_Encrypted_Passwords <on/off> (DEPRECATED) -- Synonym for Auth_MySQL_Encrypted_Passwords. -- - Auth_MySQL_Scrambled_Passwords <on/off> (DEPRECATED) - Equivalent to: Auth_MySQL_Encryption_Types MySQL - The same restrictions apply to this directive as to - ...Encrypted_Passwords. - --AuthMySQL_Scrambled_Passwords <on/off> (DEPRECATED) -- Synonym for Auth_MySQL_Scrambled_Passwords. -- - Auth_MySQL_Authoritative <on/off> - Whether or not to use other authentication schemes if the user is - successfully authenticated. That is, if the user passes the MySQL -@@ -232,9 +230,6 @@ Auth_MySQL_Authoritative <on/off> - option is set 'off'. The default is 'on' (i.e. if the user passes - the MySQL module, they're considered OK). - --AuthMySQL_Authoritative <on/off> -- Synonym for Auth_MySQL_Authoritative. -- - Auth_MySQL_Non_Persistent <on/off> - If set to 'on', the link to the MySQL server is explicitly closed - after each authentication request. Note that I can't think of any -@@ -244,10 +239,15 @@ Auth_MySQL_Non_Persistent <on/off> - increase the maximum number of simultaneous threads in MySQL and - keep this option off. Default: off, and for good reason. - --AuthMySQL_Persistent <on/off> -+ Please bear in mind that modern MySQL installations appear to have a -+ connection timeout of 28000 seconds (8 hours), one may want to lower -+ this to 30 (max_connections) if you have very busy site and are -+ observing spikes containing a large number of connection threads. -+ -+Auth_MySQL_Persistent <on/off> - An antonym for Auth_MySQL_Non_Persistent. - --AuthMySQL_AllowOverride <on/off> -+Auth_MySQL_AllowOverride <on/off> - Whether or not .htaccess files are allowed to use their own - Host/User/Password/DB specifications. If set to 'off', then the - defaults specified in the httpd.conf cannot be overridden. -@@ -256,6 +256,3 @@ Auth_MYSQL <on/off> - Whether or not to enable MySQL authentication. If it's off, the - MySQL authentication will simply pass authentication off to other - modules defined. -- --AuthMySQL <on/off> -- Synonym for Auth_MYSQL. diff --git a/www/ap-auth-mysql/patches/patch-USAGE b/www/ap-auth-mysql/patches/patch-USAGE deleted file mode 100644 index ce576c21ef2..00000000000 --- a/www/ap-auth-mysql/patches/patch-USAGE +++ /dev/null @@ -1,69 +0,0 @@ -$NetBSD: patch-USAGE,v 1.1 2011/04/01 15:11:58 wiz Exp $ - -All Debian patches up to 4.3.9-13. - ---- USAGE.orig 2004-12-23 13:43:14.000000000 +0000 -+++ USAGE -@@ -18,7 +18,10 @@ create table mysql_auth ( - primary key (username) - ); - --This would work quite well. -+This would work quite well. Remember that the passwd field needs to be long -+enough to store the entire password string -- for example, if you are using -+MD5 passwords, passwd needs to be 32 characters long, and if you are using -+SHA1 it must be 40 characters long. - - NOTE 1: You don't have to use a new table for the purpose of storing - usernames and passwords; I quite happily use a 'members' table (with all -@@ -41,9 +44,9 @@ Auth_MySQL_Info <host> <user> <password> - - or - --AuthMySQL_DefaultHost <host> --AuthMySQL_DefaultUser <user> --AuthMySQL_DefaultPassword <password> -+Auth_MySQL_DefaultHost <host> -+Auth_MySQL_DefaultUser <user> -+Auth_MySQL_DefaultPassword <password> - - This should be placed globally. - -@@ -53,12 +56,12 @@ use - Auth_MySQL_General_DB <database> - - to set that. This setting can be overridden in .htaccess files if --AuthMySQL_AllowOverride is set. -+Auth_MySQL_AllowOverride is set. - - On that topic, if you want .htaccess files to be restricted in what they're - able to connect to database-wise, you can - --AuthMySQL_AllowOverride no -+Auth_MySQL_AllowOverride no - - and the host, user, password, and database name cannot be changed. - -@@ -123,3 +126,22 @@ become plaintext equivalents. - - The full set of directives available are now listed in the file DIRECTIVES, - for ease of perusal. -+ -+Disable other Auth methods -+-------------------------- -+ -+For some reason Apache has problems handing over authority to this -+module if this is requested an another auth module is also loaded. -+ -+If you have another authentication module loaded, you'll have to -+disable it the hard way. -+ -+AuthBasicAuthoritative Off -+AuthUserFile /dev/null -+ -+The following option is not sufficient -+ -+Auth_MySQL_Authoritative On -+ -+If you experience similar problems with group membership, try -+repeating the same procedure with AuthGroupFile. diff --git a/www/ap-auth-mysql/patches/patch-aa b/www/ap-auth-mysql/patches/patch-aa deleted file mode 100644 index 9cf7e2599b0..00000000000 --- a/www/ap-auth-mysql/patches/patch-aa +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/07/16 11:28:19 jdolecek Exp $ - ---- config.h.in.orig 2004-05-11 04:32:13.000000000 +0200 -+++ config.h.in 2004-07-16 12:36:49.000000000 +0200 -@@ -47,3 +47,5 @@ - - /* Define to empty if `const' does not conform to ANSI C. */ - #undef const -+ -+#undef HAVE_LIBCRYPT diff --git a/www/ap-auth-mysql/patches/patch-ab b/www/ap-auth-mysql/patches/patch-ab deleted file mode 100644 index 76a4733a2a0..00000000000 --- a/www/ap-auth-mysql/patches/patch-ab +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2011/04/01 15:03:48 wiz Exp $ - ---- configure.ac.orig 2004-12-23 13:43:14.000000000 +0000 -+++ configure.ac -@@ -140,11 +140,16 @@ AC_CHECK_HEADERS([crypt.h]) - - AC_CHECK_LIB([crypt], [crypt]) - --if test -n $HAVE_CRYPT_H; then -+if test -n $HAVE_CRYPT_H -a $HAVE_LIBCRYPT; then - AC_TRY_RUN( - [ -+#ifdef HAVE_CRYPT_H - #include <crypt.h> -+#endif - #include <string.h> -+#ifdef HAVE_UNISTD_H -+#include <unistd.h> -+#endif - - int main() - { -@@ -156,8 +161,13 @@ AC_DEFINE(CRYPT_MD5, 1, [Enable crypt() - ,,) - AC_TRY_RUN( - [ -+#ifdef HAVE_CRYPT_H - #include <crypt.h> -+#endif - #include <string.h> -+#ifdef HAVE_UNISTD_H -+#include <unistd.h> -+#endif - - int main() - { diff --git a/www/ap-auth-mysql/patches/patch-ac b/www/ap-auth-mysql/patches/patch-ac deleted file mode 100644 index a1f6a17b51c..00000000000 --- a/www/ap-auth-mysql/patches/patch-ac +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2011/04/01 15:03:48 wiz Exp $ - ---- configure.orig 2004-12-23 13:43:14.000000000 +0000 -+++ configure -@@ -3192,7 +3202,7 @@ _ACEOF - fi - - --if test -n $HAVE_CRYPT_H; then -+if test -n $HAVE_CRYPT_H -a $HAVE_LIBCRYPT; then - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling - See \`config.log' for more details." >&5 -@@ -3207,8 +3291,13 @@ cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - -+#ifdef HAVE_CRYPT_H - #include <crypt.h> -+#endif - #include <string.h> -+#ifdef HAVE_UNISTD_H -+#include <unistd.h> -+#endif - - int main() - { -@@ -3255,8 +3344,13 @@ cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - -+#ifdef HAVE_CRYPT_H - #include <crypt.h> -+#endif - #include <string.h> -+#ifdef HAVE_UNISTD_H -+#include <unistd.h> -+#endif - - int main() - { diff --git a/www/ap-auth-mysql/patches/patch-ad b/www/ap-auth-mysql/patches/patch-ad deleted file mode 100644 index eac477afd8c..00000000000 --- a/www/ap-auth-mysql/patches/patch-ad +++ /dev/null @@ -1,782 +0,0 @@ -$NetBSD: patch-ad,v 1.5 2011/04/01 15:11:58 wiz Exp $ - -Some crypt.h changes that were here before, undocumented. -All Debian patches up to 4.3.9-13, including a fix for -CVE-2008-2384. - ---- mod_auth_mysql.c.orig 2004-12-23 13:43:14.000000000 +0000 -+++ mod_auth_mysql.c -@@ -48,19 +48,27 @@ - #include <http_log.h> - #ifdef APACHE2 - #include "http_request.h" /* for ap_hook_(check_user_id | auth_checker)*/ -+#include <apr_general.h> - #include <apr_md5.h> - #include <apr_sha1.h> -+#include <apr_strings.h> - #else - #include <ap_md5.h> - #include <ap_sha1.h> - #endif - -+#ifndef APR_XtOffsetOf -+#define APR_XtOffsetOf(x,y) APR_OFFSETOF(x,y) -+#endif -+ - #include <mysql.h> - #include <errmsg.h> - #include <mysqld_error.h> - - #ifdef HAVE_CRYPT_H - #include <crypt.h> -+#else -+#include <unistd.h> - #endif - - #ifndef TRUE -@@ -98,10 +106,14 @@ unsigned long auth_db_client_flag = 0; - #define CRYPT_MD5_ENCRYPTION_FLAG 1<<3 - #endif - #define PHP_MD5_ENCRYPTION_FLAG 1<<4 --#ifdef HAVE_CRYPT_H -+#if defined(HAVE_CRYPT_H) || defined(HAVE_LIBCRYPT) - #define CRYPT_ENCRYPTION_FLAG 1<<5 - #endif - #define SHA1SUM_ENCRYPTION_FLAG 1<<6 -+#define APACHE_ENCRYPTION_FLAG 1<<7 -+ -+/* from include/sha1.h from the mysql-server source distribution */ -+#define SHA1_HASH_SIZE 20 /* Hash size in bytes */ - - static int check_no_encryption(const char *passwd, char *enc_passwd) - { -@@ -131,7 +143,7 @@ static int check_crypt_MD5_encryption(co - } - #endif - --#ifdef HAVE_CRYPT_H -+#if defined(HAVE_CRYPT_H) || defined(HAVE_LIBCRYPT) - static int check_crypt_encryption(const char *passwd, char *enc_passwd) - { - return (!strcmp(crypt(passwd, enc_passwd), enc_passwd)); -@@ -229,12 +241,21 @@ static int check_SHA1Sum_encryption(cons - - static int check_mysql_encryption(const char *passwd, char *enc_passwd) - { -- char scrambled_passwd[32]; -+ char scrambled_passwd[2*SHA1_HASH_SIZE + 2]; - - make_scrambled_password(scrambled_passwd, passwd); - return (!strcmp(scrambled_passwd, enc_passwd)); - } - -+static int check_apache_encryption(const char *passwd, char *enc_passwd) -+{ -+#ifdef APACHE2 -+ return (!apr_password_validate(passwd, enc_passwd)); -+#else -+ return (!ap_validate_password(passwd, enc_passwd)); -+#endif -+} -+ - typedef struct { - char *name; - int (*check_function)(const char *passwd, char *enc_passwd); -@@ -250,9 +271,12 @@ encryption_type_entry supported_encrypti - #if CRYPT_MD5 - { "Crypt_MD5", check_crypt_MD5_encryption, CRYPT_MD5_ENCRYPTION_FLAG }, - #endif -+#if defined(HAVE_CRYPT_H) || defined(HAVE_LIBCRYPT) - { "Crypt", check_crypt_encryption, CRYPT_ENCRYPTION_FLAG }, -+#endif - { "PHP_MD5", check_PHP_MD5_encryption, PHP_MD5_ENCRYPTION_FLAG }, - { "SHA1Sum", check_SHA1Sum_encryption, SHA1SUM_ENCRYPTION_FLAG}, -+ { "Apache", check_apache_encryption, APACHE_ENCRYPTION_FLAG }, - /* add additional encryption types below */ - { NULL, NULL, 0 } - }; -@@ -284,6 +308,7 @@ typedef struct { - char *db_user; - char *db_pwd; - char *db_name; -+ char *db_charset; - - MYSQL *dbh; - -@@ -324,11 +349,14 @@ typedef struct { - - module auth_mysql_module; - -+static int open_auth_dblink(request_rec *r, mysql_auth_config_rec *sec); -+ - #ifdef APACHE2 - static apr_status_t - #else - static void - #endif -+ - auth_mysql_cleanup(void *ptr) - { - mysql_auth_config_rec *sec = ptr; -@@ -380,7 +408,7 @@ void *create_mysql_auth_dir_config(pool - sizeof(mysql_auth_config_rec)); - #endif - -- sec->db_name = sec->db_socket = sec->db_user = sec->db_pwd = NULL; -+ sec->db_name = sec->db_socket = sec->db_user = sec->db_pwd = sec->db_charset = NULL; - - sec->dbh = NULL; - /* When the memory for this connection record is cleaned, we must -@@ -489,9 +517,9 @@ static const char *set_scrambled_passwor - * server when passed in as part of a query. - */ - #ifdef APACHE2 --static char *mysql_escape(char *str, apr_pool_t *p) -+static char *mysql_escape(mysql_auth_config_rec *sec, request_rec *r, char *str, apr_pool_t *p) - #else --static char *mysql_escape(char *str, pool *p) -+static char *mysql_escape(mysql_auth_config_rec *sec, request_rec *r, char *str, pool *p) - #endif - { - char *dest; -@@ -505,7 +533,7 @@ static char *mysql_escape(char *str, poo - return str; - } - -- mysql_escape_string(dest, str, strlen(str)); -+ mysql_real_escape_string(sec->dbh, dest, str, strlen(str)); - - return dest; - } -@@ -644,6 +672,24 @@ static const char *enable_mysql(cmd_parm - return NULL; - } - -+static const char *set_empty_passwords(cmd_parms *cmd, void *sconf, int arg) -+{ -+ mysql_auth_config_rec *sec = (mysql_auth_config_rec *) sconf; -+ -+ sec->allow_empty_passwords = arg; -+ APACHELOG(APLOG_DEBUG, cmd, "set_empty_passwords: Setting allow_empty_passwords in %s to %i", sec->dir, sec->allow_empty_passwords); -+ return NULL; -+} -+ -+static const char *set_authoritative(cmd_parms *cmd, void *sconf, int arg) -+{ -+ mysql_auth_config_rec *sec = (mysql_auth_config_rec *) sconf; -+ -+ sec->authoritative = arg; -+ APACHELOG(APLOG_DEBUG, cmd, "set_authoritative: Setting authoritative in %s to %i", sec->dir, sec->authoritative); -+ return NULL; -+} -+ - /* The command list. What it's called, when it's legal to use it, and - * what to do when we find it. Pretty cool, IMHO. - */ -@@ -655,14 +701,30 @@ command_rec mysql_auth_cmds[] = { - NULL, - RSRC_CONF, "host, user and password of the MySQL database" ), - -+ AP_INIT_TAKE3( "AuthMySQL_Info", set_auth_mysql_info, -+ NULL, -+ RSRC_CONF, "host, user and password of the MySQL database" ), -+ -+ AP_INIT_TAKE1( "Auth_MySQL_DefaultHost", set_auth_mysql_host, -+ NULL, -+ RSRC_CONF, "Default MySQL host" ), -+ - AP_INIT_TAKE1( "AuthMySQL_DefaultHost", set_auth_mysql_host, - NULL, - RSRC_CONF, "Default MySQL host" ), - -+ AP_INIT_TAKE1( "Auth_MySQL_DefaultUser", set_auth_mysql_user, -+ NULL, -+ RSRC_CONF, "Default MySQL user" ), -+ - AP_INIT_TAKE1( "AuthMySQL_DefaultUser", set_auth_mysql_user, - NULL, - RSRC_CONF, "Default MySQL user" ), - -+ AP_INIT_TAKE1( "Auth_MySQL_DefaultPassword", set_auth_mysql_pwd, -+ NULL, -+ RSRC_CONF, "Default MySQL password" ), -+ - AP_INIT_TAKE1( "AuthMySQL_DefaultPassword", set_auth_mysql_pwd, - NULL, - RSRC_CONF, "Default MySQL password" ), -@@ -671,138 +733,182 @@ command_rec mysql_auth_cmds[] = { - NULL, - RSRC_CONF, "Default MySQL server port" ), - -+ AP_INIT_TAKE1( "AuthMySQL_DefaultPort", set_auth_mysql_port, -+ NULL, -+ RSRC_CONF, "Default MySQL server port" ), -+ - AP_INIT_TAKE1( "Auth_MySQL_DefaultSocket", set_auth_mysql_socket, - NULL, - RSRC_CONF, "Default MySQL server socket" ), - -+ AP_INIT_TAKE1( "AuthMySQL_DefaultSocket", set_auth_mysql_socket, -+ NULL, -+ RSRC_CONF, "Default MySQL server socket" ), -+ - AP_INIT_TAKE1( "Auth_MySQL_General_DB", set_auth_mysql_db, - NULL, - RSRC_CONF, "default database for MySQL authentication" ), - -+ AP_INIT_TAKE1( "AuthMySQL_General_DB", set_auth_mysql_db, -+ NULL, -+ RSRC_CONF, "default database for MySQL authentication" ), -+ -+ AP_INIT_TAKE1( "Auth_MySQL_DefaultDB", set_auth_mysql_db, -+ NULL, -+ RSRC_CONF, "default database for MySQL authentication" ), -+ - AP_INIT_TAKE1( "AuthMySQL_DefaultDB", set_auth_mysql_db, - NULL, - RSRC_CONF, "default database for MySQL authentication" ), - -- AP_INIT_TAKE1( "AuthMySQL_Host", ap_set_string_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, db_host), -+ AP_INIT_TAKE1( "Auth_MySQL_Host", ap_set_string_slot, -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, db_host), - OR_AUTHCFG, "database host" ), - -- AP_INIT_TAKE1( "Auth_MySQL_Host", ap_set_string_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, db_host), -+ AP_INIT_TAKE1( "AuthMySQL_Host", ap_set_string_slot, -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, db_host), - OR_AUTHCFG, "database host" ), - - AP_INIT_TAKE1( "Auth_MySQL_Socket", ap_set_string_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, db_socket), -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, db_socket), - OR_AUTHCFG, "database host socket" ), - - AP_INIT_TAKE1( "AuthMySQL_Socket", ap_set_string_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, db_socket), -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, db_socket), - OR_AUTHCFG, "database host socket" ), - -- AP_INIT_TAKE1( "Auth_MySQL_Port", ap_set_string_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, db_port), -+ AP_INIT_TAKE1( "Auth_MySQL_Port", ap_set_int_slot, -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, db_port), - OR_AUTHCFG, "database host port" ), - -- AP_INIT_TAKE1( "AuthMySQL_Port", ap_set_string_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, db_port), -+ AP_INIT_TAKE1( "AuthMySQL_Port", ap_set_int_slot, -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, db_port), - OR_AUTHCFG, "database host port" ), - - AP_INIT_TAKE1( "Auth_MySQL_Username", ap_set_string_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, db_user), -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, db_user), -+ OR_AUTHCFG, "database user" ), -+ -+ AP_INIT_TAKE1( "AuthMySQL_Username", ap_set_string_slot, -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, db_user), -+ OR_AUTHCFG, "database user" ), -+ -+ AP_INIT_TAKE1( "Auth_MySQL_User", ap_set_string_slot, -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, db_user), - OR_AUTHCFG, "database user" ), - - AP_INIT_TAKE1( "AuthMySQL_User", ap_set_string_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, db_user), -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, db_user), - OR_AUTHCFG, "database user" ), - - AP_INIT_TAKE1( "Auth_MySQL_Password", ap_set_string_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, db_pwd), -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, db_pwd), - OR_AUTHCFG, "database password" ), - - AP_INIT_TAKE1( "AuthMySQL_Password", ap_set_string_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, db_pwd), -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, db_pwd), - OR_AUTHCFG, "database password" ), - - AP_INIT_TAKE1( "Auth_MySQL_DB", ap_set_string_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, db_name), -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, db_name), - OR_AUTHCFG, "database name" ), - - AP_INIT_TAKE1( "AuthMySQL_DB", ap_set_string_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, db_name), -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, db_name), - OR_AUTHCFG, "database name" ), - -+ AP_INIT_TAKE1( "Auth_MySQL_CharacterSet", ap_set_string_slot, -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, db_charset), -+ OR_AUTHCFG, "character set" ), -+ -+ AP_INIT_TAKE1( "AuthMySQL_CharacterSet", ap_set_string_slot, -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, db_charset), -+ OR_AUTHCFG, "character set" ), -+ - AP_INIT_TAKE1( "Auth_MySQL_Password_Table", ap_set_string_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, user_table), -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, user_table), - OR_AUTHCFG, "Name of the MySQL table containing the password/user-name combination" ), - - AP_INIT_TAKE1( "AuthMySQL_Password_Table", ap_set_string_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, user_table), -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, user_table), - OR_AUTHCFG, "Name of the MySQL table containing the password/user-name combination" ), - - AP_INIT_TAKE1( "Auth_MySQL_Group_Table", ap_set_string_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, group_table), -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, group_table), -+ OR_AUTHCFG, "Name of the MySQL table containing the group-name/user-name combination; can be the same as the password-table." ), -+ -+ AP_INIT_TAKE1( "AuthMySQL_Group_Table", ap_set_string_slot, -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, group_table), - OR_AUTHCFG, "Name of the MySQL table containing the group-name/user-name combination; can be the same as the password-table." ), - - AP_INIT_TAKE1( "Auth_MySQL_Group_Clause", ap_set_string_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, group_where_clause), -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, group_where_clause), - OR_AUTHCFG, "Additional WHERE clause for group/user-name lookup" ), - -- AP_INIT_TAKE1( "AuthMySQL_Group_Table", ap_set_string_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, group_table), -- OR_AUTHCFG, "Name of the MySQL table containing the group-name/user-name combination; can be the same as the password-table." ), -+ AP_INIT_TAKE1( "AuthMySQL_Group_Clause", ap_set_string_slot, -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, group_where_clause), -+ OR_AUTHCFG, "Additional WHERE clause for group/user-name lookup" ), - - AP_INIT_TAKE1( "Auth_MySQL_Password_Field", ap_set_string_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, password_field), -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, password_field), - OR_AUTHCFG, "The name of the field in the MySQL password table" ), - - AP_INIT_TAKE1( "AuthMySQL_Password_Field", ap_set_string_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, password_field), -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, password_field), - OR_AUTHCFG, "The name of the field in the MySQL password table" ), - - AP_INIT_TAKE1( "Auth_MySQL_Password_Clause", ap_set_string_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, password_where_clause), -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, password_where_clause), -+ OR_AUTHCFG, "Additional WHERE clause for group password/user-name lookup" ), -+ -+ AP_INIT_TAKE1( "AuthMySQL_Password_Clause", ap_set_string_slot, -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, password_where_clause), - OR_AUTHCFG, "Additional WHERE clause for group password/user-name lookup" ), - - AP_INIT_TAKE1( "Auth_MySQL_Username_Field", ap_set_string_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, user_field), -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, user_field), - OR_AUTHCFG, "The name of the user-name field in the MySQL password (and possibly group) table(s)." ), - - AP_INIT_TAKE1( "AuthMySQL_Username_Field", ap_set_string_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, user_field), -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, user_field), - OR_AUTHCFG, "The name of the user-name field in the MySQL password (and possibly group) table(s)." ), - - AP_INIT_TAKE1( "Auth_MySQL_Group_Field", ap_set_string_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, group_field), -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, group_field), - OR_AUTHCFG, "The name of the group field in the MySQL group table; must be set if you want to use groups." ), - - AP_INIT_TAKE1( "AuthMySQL_Group_Field", ap_set_string_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, group_field), -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, group_field), - OR_AUTHCFG, "The name of the group field in the MySQL group table; must be set if you want to use groups." ), - - AP_INIT_TAKE1( "Auth_MySQL_Group_User_Field", ap_set_string_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, group_user_field), -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, group_user_field), - OR_AUTHCFG, "The name of the user-name field in the MySQL group table; defaults to the same as the username field for the password table." ), - - AP_INIT_TAKE1( "AuthMySQL_Group_User_Field", ap_set_string_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, group_user_field), -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, group_user_field), - OR_AUTHCFG, "The name of the user-name field in the MySQL group table; defaults to the same as the username field for the password table." ), - -- AP_INIT_FLAG( "Auth_MySQL_Empty_Passwords", ap_set_flag_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, allow_empty_passwords), -+ AP_INIT_FLAG( "Auth_MySQL_Empty_Passwords", set_empty_passwords, -+ NULL, - OR_AUTHCFG, "Enable (on) or disable (off) empty password strings; in which case any user password is accepted." ), - -- AP_INIT_FLAG( "AuthMySQL_Empty_Passwords", ap_set_flag_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, allow_empty_passwords), -+ AP_INIT_FLAG( "AuthMySQL_Empty_Passwords", set_empty_passwords, -+ NULL, - OR_AUTHCFG, "Enable (on) or disable (off) empty password strings; in which case any user password is accepted." ), - -- AP_INIT_FLAG( "Auth_MySQL_Authoritative", ap_set_flag_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, authoritative), -+ AP_INIT_FLAG( "Auth_MySQL_Authoritative", set_authoritative, -+ NULL, - OR_AUTHCFG, "When 'on' the MySQL database is taken to be authoritative and access control is not passed along to other db or access modules." ), - -- AP_INIT_FLAG( "AuthMySQL_Authoritative", ap_set_flag_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, authoritative), -+ AP_INIT_FLAG( "AuthMySQL_Authoritative", set_authoritative, -+ NULL, - OR_AUTHCFG, "When 'on' the MySQL database is taken to be authoritative and access control is not passed along to other db or access modules." ), - -+ AP_INIT_FLAG( "Auth_MySQL_AllowOverride", set_auth_mysql_override, -+ NULL, -+ RSRC_CONF, "Allow directory overrides of configuration" ), -+ - AP_INIT_FLAG( "AuthMySQL_AllowOverride", set_auth_mysql_override, - NULL, - RSRC_CONF, "Allow directory overrides of configuration" ), -@@ -835,6 +941,14 @@ command_rec mysql_auth_cmds[] = { - NULL, - OR_AUTHCFG, "Use non-persistent MySQL links" ), - -+ AP_INIT_FLAG( "AuthMySQL_Non_Persistent", set_non_persistent, -+ NULL, -+ OR_AUTHCFG, "Use non-persistent MySQL links" ), -+ -+ AP_INIT_FLAG( "Auth_MySQL_Persistent", set_persistent, -+ NULL, -+ OR_AUTHCFG, "Use non-persistent MySQL links" ), -+ - AP_INIT_FLAG( "AuthMySQL_Persistent", set_persistent, - NULL, - OR_AUTHCFG, "Use non-persistent MySQL links" ), -@@ -848,7 +962,11 @@ command_rec mysql_auth_cmds[] = { - OR_AUTHCFG, "Enable MySQL authentication" ), - - AP_INIT_TAKE1( "Auth_MySQL_Where", ap_set_string_slot, -- (void*)APR_XtOffsetOf(mysql_auth_config_rec, password_where_clause), -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, password_where_clause), -+ OR_AUTHCFG, "Additional WHERE clause for group password/user-name lookup" ), -+ -+ AP_INIT_TAKE1( "AuthMySQL_Where", ap_set_string_slot, -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, password_where_clause), - OR_AUTHCFG, "Additional WHERE clause for group password/user-name lookup" ), - - { NULL } -@@ -859,14 +977,30 @@ command_rec mysql_auth_cmds[] = { - NULL, - RSRC_CONF, TAKE3, "host, user and password of the MySQL database" }, - -+ { "AuthMySQL_Info", set_auth_mysql_info, -+ NULL, -+ RSRC_CONF, TAKE3, "host, user and password of the MySQL database" }, -+ -+ { "Auth_MySQL_DefaultHost", set_auth_mysql_host, -+ NULL, -+ RSRC_CONF, TAKE1, "Default MySQL host" }, -+ - { "AuthMySQL_DefaultHost", set_auth_mysql_host, - NULL, - RSRC_CONF, TAKE1, "Default MySQL host" }, - -+ { "Auth_MySQL_DefaultUser", set_auth_mysql_user, -+ NULL, -+ RSRC_CONF, TAKE1, "Default MySQL user" }, -+ - { "AuthMySQL_DefaultUser", set_auth_mysql_user, - NULL, - RSRC_CONF, TAKE1, "Default MySQL user" }, - -+ { "Auth_MySQL_DefaultPassword", set_auth_mysql_pwd, -+ NULL, -+ RSRC_CONF, TAKE1, "Default MySQL password" }, -+ - { "AuthMySQL_DefaultPassword", set_auth_mysql_pwd, - NULL, - RSRC_CONF, TAKE1, "Default MySQL password" }, -@@ -875,23 +1009,39 @@ command_rec mysql_auth_cmds[] = { - NULL, - RSRC_CONF, TAKE1, "Default MySQL server port" }, - -+ { "AuthMySQL_DefaultPort", set_auth_mysql_port, -+ NULL, -+ RSRC_CONF, TAKE1, "Default MySQL server port" }, -+ - { "Auth_MySQL_DefaultSocket", set_auth_mysql_socket, - NULL, - RSRC_CONF, TAKE1, "Default MySQL server socket" }, - -+ { "AuthMySQL_DefaultSocket", set_auth_mysql_socket, -+ NULL, -+ RSRC_CONF, TAKE1, "Default MySQL server socket" }, -+ - { "Auth_MySQL_General_DB", set_auth_mysql_db, - NULL, - RSRC_CONF, TAKE1, "default database for MySQL authentication" }, - -+ { "AuthMySQL_General_DB", set_auth_mysql_db, -+ NULL, -+ RSRC_CONF, TAKE1, "default database for MySQL authentication" }, -+ -+ { "Auth_MySQL_DefaultDB", set_auth_mysql_db, -+ NULL, -+ RSRC_CONF, TAKE1, "default database for MySQL authentication" }, -+ - { "AuthMySQL_DefaultDB", set_auth_mysql_db, - NULL, - RSRC_CONF, TAKE1, "default database for MySQL authentication" }, - -- { "AuthMySQL_Host", ap_set_string_slot, -+ { "Auth_MySQL_Host", ap_set_string_slot, - (void *) XtOffsetOf(mysql_auth_config_rec, db_host), - OR_AUTHCFG, TAKE1, "database host" }, - -- { "Auth_MySQL_Host", ap_set_string_slot, -+ { "AuthMySQL_Host", ap_set_string_slot, - (void *) XtOffsetOf(mysql_auth_config_rec, db_host), - OR_AUTHCFG, TAKE1, "database host" }, - -@@ -899,7 +1049,15 @@ command_rec mysql_auth_cmds[] = { - (void *) XtOffsetOf(mysql_auth_config_rec, db_socket), - OR_AUTHCFG, TAKE1, "database host socket" }, - -- { "Auth_MySQL_Port", ap_set_string_slot, -+ { "AuthMySQL_Socket", ap_set_string_slot, -+ (void *) XtOffsetOf(mysql_auth_config_rec, db_socket), -+ OR_AUTHCFG, TAKE1, "database host socket" }, -+ -+ { "Auth_MySQL_Port", ap_set_int_slot, -+ (void *) XtOffsetOf(mysql_auth_config_rec, db_port), -+ OR_AUTHCFG, TAKE1, "database host socket" }, -+ -+ { "AuthMySQL_Port", ap_set_int_slot, - (void *) XtOffsetOf(mysql_auth_config_rec, db_port), - OR_AUTHCFG, TAKE1, "database host socket" }, - -@@ -907,6 +1065,14 @@ command_rec mysql_auth_cmds[] = { - (void *) XtOffsetOf(mysql_auth_config_rec, db_user), - OR_AUTHCFG, TAKE1, "database user" }, - -+ { "AuthMySQL_Username", ap_set_string_slot, -+ (void *) XtOffsetOf(mysql_auth_config_rec, db_user), -+ OR_AUTHCFG, TAKE1, "database user" }, -+ -+ { "Auth_MySQL_User", ap_set_string_slot, -+ (void *) XtOffsetOf(mysql_auth_config_rec, db_user), -+ OR_AUTHCFG, TAKE1, "database user" }, -+ - { "AuthMySQL_User", ap_set_string_slot, - (void *) XtOffsetOf(mysql_auth_config_rec, db_user), - OR_AUTHCFG, TAKE1, "database user" }, -@@ -927,6 +1093,14 @@ command_rec mysql_auth_cmds[] = { - (void *) XtOffsetOf(mysql_auth_config_rec, db_name), - OR_AUTHCFG, TAKE1, "database name" }, - -+ { "Auth_MySQL_CharacterSet", ap_set_string_slot, -+ (void *) XtOffsetOf(mysql_auth_config_rec, db_charset), -+ OR_AUTHCFG, TAKE1, "character set" }, -+ -+ { "AuthMySQL_CharacterSet", ap_set_string_slot, -+ (void *) XtOffsetOf(mysql_auth_config_rec, db_charset), -+ OR_AUTHCFG, TAKE1, "character set" }, -+ - { "Auth_MySQL_Password_Table", ap_set_string_slot, - (void *) XtOffsetOf(mysql_auth_config_rec, user_table), - OR_AUTHCFG, TAKE1, "Name of the MySQL table containing the password/user-name combination" }, -@@ -939,14 +1113,18 @@ command_rec mysql_auth_cmds[] = { - (void *) XtOffsetOf(mysql_auth_config_rec, group_table), - OR_AUTHCFG, TAKE1, "Name of the MySQL table containing the group-name/user-name combination; can be the same as the password-table." }, - -+ { "AuthMySQL_Group_Table", ap_set_string_slot, -+ (void *) XtOffsetOf(mysql_auth_config_rec, group_table), -+ OR_AUTHCFG, TAKE1, "Name of the MySQL table containing the group-name/user-name combination; can be the same as the password-table." }, -+ - { "Auth_MySQL_Group_Clause", ap_set_string_slot, - (void *) XtOffsetOf(mysql_auth_config_rec, group_where_clause), - OR_AUTHCFG, TAKE1, "Additional WHERE clause for group/user-name lookup" }, - -- { "AuthMySQL_Group_Table", ap_set_string_slot, -- (void *) XtOffsetOf(mysql_auth_config_rec, group_table), -- OR_AUTHCFG, TAKE1, "Name of the MySQL table containing the group-name/user-name combination; can be the same as the password-table." }, -- -+ { "AuthMySQL_Group_Clause", ap_set_string_slot, -+ (void *) XtOffsetOf(mysql_auth_config_rec, group_where_clause), -+ OR_AUTHCFG, TAKE1, "Additional WHERE clause for group/user-name lookup" }, -+ - { "Auth_MySQL_Password_Field", ap_set_string_slot, - (void *) XtOffsetOf(mysql_auth_config_rec, password_field), - OR_AUTHCFG, TAKE1, "The name of the field in the MySQL password table" }, -@@ -959,6 +1137,10 @@ command_rec mysql_auth_cmds[] = { - (void *) XtOffsetOf(mysql_auth_config_rec, password_where_clause), - OR_AUTHCFG, TAKE1, "Additional WHERE clause for group password/user-name lookup" }, - -+ { "AuthMySQL_Password_Clause", ap_set_string_slot, -+ (void *) XtOffsetOf(mysql_auth_config_rec, password_where_clause), -+ OR_AUTHCFG, TAKE1, "Additional WHERE clause for group password/user-name lookup" }, -+ - { "Auth_MySQL_Username_Field", ap_set_string_slot, - (void *) XtOffsetOf(mysql_auth_config_rec, user_field), - OR_AUTHCFG, TAKE1, "The name of the user-name field in the MySQL password (and possibly group) table(s)." }, -@@ -983,22 +1165,26 @@ command_rec mysql_auth_cmds[] = { - (void *) XtOffsetOf(mysql_auth_config_rec, group_user_field), - OR_AUTHCFG, TAKE1, "The name of the user-name field in the MySQL group table; defaults to the same as the username field for the password table." }, - -- { "Auth_MySQL_Empty_Passwords", ap_set_flag_slot, -- (void *) XtOffsetOf(mysql_auth_config_rec, allow_empty_passwords), -+ { "Auth_MySQL_Empty_Passwords", set_empty_passwords, -+ NULL, - OR_AUTHCFG, FLAG, "Enable (on) or disable (off) empty password strings; in which case any user password is accepted." }, - -- { "AuthMySQL_Empty_Passwords", ap_set_flag_slot, -- (void *) XtOffsetOf(mysql_auth_config_rec, allow_empty_passwords), -+ { "AuthMySQL_Empty_Passwords", set_empty_passwords, -+ NULL, - OR_AUTHCFG, FLAG, "Enable (on) or disable (off) empty password strings; in which case any user password is accepted." }, - -- { "Auth_MySQL_Authoritative", ap_set_flag_slot, -- (void *) XtOffsetOf(mysql_auth_config_rec, authoritative), -+ { "Auth_MySQL_Authoritative", set_authoritative, -+ NULL, - OR_AUTHCFG, FLAG, "When 'on' the MySQL database is taken to be authoritative and access control is not passed along to other db or access modules." }, - -- { "AuthMySQL_Authoritative", ap_set_flag_slot, -- (void *) XtOffsetOf(mysql_auth_config_rec, authoritative), -+ { "AuthMySQL_Authoritative", set_authoritative, -+ NULL, - OR_AUTHCFG, FLAG, "When 'on' the MySQL database is taken to be authoritative and access control is not passed along to other db or access modules." }, - -+ { "Auth_MySQL_AllowOverride", set_auth_mysql_override, -+ NULL, -+ RSRC_CONF, FLAG, "Allow directory overrides of configuration" }, -+ - { "AuthMySQL_AllowOverride", set_auth_mysql_override, - NULL, - RSRC_CONF, FLAG, "Allow directory overrides of configuration" }, -@@ -1031,6 +1217,14 @@ command_rec mysql_auth_cmds[] = { - NULL, - OR_AUTHCFG, FLAG, "Use non-persistent MySQL links" }, - -+ { "AuthMySQL_Non_Persistent", set_non_persistent, -+ NULL, -+ OR_AUTHCFG, FLAG, "Use non-persistent MySQL links" }, -+ -+ { "Auth_MySQL_Persistent", set_persistent, -+ NULL, -+ OR_AUTHCFG, FLAG, "Use non-persistent MySQL links" }, -+ - { "AuthMySQL_Persistent", set_persistent, - NULL, - OR_AUTHCFG, FLAG, "Use non-persistent MySQL links" }, -@@ -1047,6 +1241,10 @@ command_rec mysql_auth_cmds[] = { - (void *) XtOffsetOf(mysql_auth_config_rec, password_where_clause), - OR_AUTHCFG, TAKE1, "Additional WHERE clause for group password/user-name lookup" }, - -+ { "AuthMySQL_Where", ap_set_string_slot, -+ (void *) XtOffsetOf(mysql_auth_config_rec, password_where_clause), -+ OR_AUTHCFG, TAKE1, "Additional WHERE clause for group password/user-name lookup" }, -+ - { NULL } - }; - -@@ -1092,6 +1290,10 @@ static int open_auth_dblink(request_rec - char *dbname = auth_db_name, *user = auth_db_user, *pwd = auth_db_pwd; - void (*sigpipe_handler)(); - unsigned long client_flag = 0; -+#if MYSQL_VERSION_ID >= 50013 -+ my_bool do_reconnect = 1; -+#endif -+ char *query; - - APACHELOG(APLOG_DEBUG, r, "Opening DB connection for %s", sec->dir); - -@@ -1160,6 +1362,13 @@ static int open_auth_dblink(request_rec - return errno; - } - -+#if MYSQL_VERSION_ID >= 50013 -+ /* The default is no longer to automatically reconnect on failure, -+ * (as of 5.0.3) so we have to set that option here. The option is -+ * available from 5.0.13. */ -+ mysql_options(sec->dbh, MYSQL_OPT_RECONNECT, &do_reconnect); -+#endif -+ - signal(SIGPIPE, sigpipe_handler); - - APACHELOG(APLOG_DEBUG, r, "Persistent in %s is %i", sec->dir, sec->persistent); -@@ -1175,6 +1384,23 @@ static int open_auth_dblink(request_rec - #endif - } - -+ if (sec->db_charset) { -+ const char *check; -+ -+ APACHELOG(APLOG_DEBUG, r, -+ "Setting character set to %s", sec->db_charset); -+ -+ mysql_set_character_set(sec->dbh, sec->db_charset); -+ -+ check = mysql_character_set_name(sec->dbh); -+ -+ if (!check || strcmp(sec->db_charset, check)) { -+ APACHELOG(APLOG_ERR, r, -+ "Failed to set character set to %s", sec->db_charset); -+ return -1; -+ } -+ } -+ - /* W00t! We made it! */ - return 0; - } -@@ -1287,10 +1513,16 @@ static int check_password(const char *pl - encryption_type_entry *ete; - - /* empty password support */ -- if (sec->allow_empty_passwords && !strlen(hashed)) { -- APACHELOG(APLOG_INFO, r, "User successful on empty password"); -- return 1; -- } -+ if (!strlen(hashed)) { -+ if (sec->allow_empty_passwords) { -+ APACHELOG(APLOG_INFO, r, "User successful on empty password"); -+ return 1; -+ } else { -+ APACHELOG(APLOG_INFO, r, "Rejecting login because of empty password field in DB"); -+ return 0; -+ } -+ } -+ - - for (ete=supported_encryption_types; ete->name; ete++) { - if (sec->encryption_types & ete->flag) { -@@ -1315,11 +1547,27 @@ static int mysql_check_user_password(req - char *auth_table = "mysql_auth", *auth_user_field = "username", - *auth_password_field = "passwd", *auth_password_clause = ""; - char *query; -- char *esc_user = mysql_escape(user, r->pool); -+ char *esc_user = NULL; - MYSQL_RES *result; - MYSQL_ROW sql_row; -+ int error = CR_UNKNOWN_ERROR; - int rv; - -+ if (!sec->dbh) { -+ APACHELOG(APLOG_DEBUG, r, -+ "No DB connection open - firing one up"); -+ if ((error = open_auth_dblink(r, sec))) { -+ APACHELOG(APLOG_DEBUG, r, -+ "open_auth_dblink returned %i", error); -+ return error; -+ } -+ -+ APACHELOG(APLOG_DEBUG, r, -+ "Correctly opened a new DB connection"); -+ } -+ -+ esc_user = mysql_escape(sec, r, user, r->pool); -+ - if (sec->user_table) { - auth_table = sec->user_table; - } -@@ -1405,8 +1653,8 @@ static int mysql_check_group(request_rec - { - char *auth_table = "mysql_auth", *auth_group_field="groups", *auth_group_clause=""; - char *query; -- char *esc_user = mysql_escape(user, r->pool); -- char *esc_group = mysql_escape(group, r->pool); -+ char *esc_user = mysql_escape(sec, r, user, r->pool); -+ char *esc_group = mysql_escape(sec, r, group, r->pool); - MYSQL_RES *result; - MYSQL_ROW row; - char *auth_user_field = "username"; diff --git a/www/ap-auth-mysql/patches/patch-ae b/www/ap-auth-mysql/patches/patch-ae deleted file mode 100644 index cd7ea3f484d..00000000000 --- a/www/ap-auth-mysql/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2006/05/16 02:35:37 ben Exp $ - ---- Makefile.in.orig 2004-05-11 04:26:01.000000000 +0000 -+++ Makefile.in -@@ -4,7 +4,7 @@ APXS2 = @apxs2@ - APXS2FLAGS = - SRCS = mod_auth_mysql.c - HDRS = config.h --OPTS = @build_opts@ -lmysqlclient -+OPTS = @build_opts@ -lmysqlclient @LDFLAGS@ - MODULES = @modules@ - - all: $(MODULES) diff --git a/www/ap-authnz-crowd/Makefile b/www/ap-authnz-crowd/Makefile index f0c803c8b95..26c06b98b41 100644 --- a/www/ap-authnz-crowd/Makefile +++ b/www/ap-authnz-crowd/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2017/11/30 16:45:40 adam Exp $ -# +# $NetBSD: Makefile,v 1.13 2018/01/01 10:23:05 wiz Exp $ DISTNAME= mod_authnz_crowd-2.2.2 PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//:S/_/-/} @@ -13,7 +12,6 @@ COMMENT= Apache module for Crowd authentication LICENSE= apache-2.0 APACHE_MODULE= yes -PKG_APACHE_ACCEPTED= apache22 apache24 DEPENDS+= ${APACHE_PKG_PREFIX}-subversion>0:../../www/ap2-subversion diff --git a/www/ap-fastcgi/DESCR b/www/ap-fastcgi/DESCR deleted file mode 100644 index fd3d6e4652e..00000000000 --- a/www/ap-fastcgi/DESCR +++ /dev/null @@ -1,9 +0,0 @@ -FastCGI provides a high-performance alternative to CGI for writing Web -server applications in a variety of languages, including Perl, C, C++, -Java, and Python. FastCGI gets its speed by having keeping application -processes running between requests. So, unlike CGI, you do not have the -overhead of starting up a new process and doing application initialization -(e.g. connecting to a database) each time somebody requests a document. - -This package works with Apache version 2 series. In order to use FastCGI -with the version 1.3 series, use www/ap-fastcgi instead. diff --git a/www/ap-fastcgi/MESSAGE b/www/ap-fastcgi/MESSAGE deleted file mode 100644 index cfec953aa78..00000000000 --- a/www/ap-fastcgi/MESSAGE +++ /dev/null @@ -1,13 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.4 2007/12/05 17:42:49 ghen Exp $ - -In order to use this module in your Apache installation, you need to -add the following to your httpd.conf file: - - LoadModule fastcgi_module lib/httpd/mod_fastcgi.so - -For more information, see - - ${PREFIX}/share/httpd/${APACHE_MANUAL}/mod/mod_fastcgi.html - -=========================================================================== diff --git a/www/ap-fastcgi/Makefile b/www/ap-fastcgi/Makefile deleted file mode 100644 index 4e3ba081ffa..00000000000 --- a/www/ap-fastcgi/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# $NetBSD: Makefile,v 1.34 2017/08/16 20:45:46 wiz Exp $ - -DISTNAME= mod_fastcgi-2.4.6 -PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//} -CATEGORIES= www -#MASTER_SITES= http://www.fastcgi.com/dist/ - -MAINTAINER= pkgsrc-users@NetBSD.org -#HOMEPAGE= http://www.fastcgi.com/ -COMMENT= New, improved CGI-like interface module for Apache - -PLIST_SUBST+= APACHE_MANUAL=${APACHE_MANUAL:Q} -MESSAGE_SUBST+= APACHE_MANUAL=${APACHE_MANUAL:Q} - -INSTALLATION_DIRS+= share/httpd/${APACHE_MANUAL}/mod - -post-install: - ${INSTALL_DATA} ${WRKSRC}/docs/mod_fastcgi.html \ - ${DESTDIR}${PREFIX}/share/httpd/${APACHE_MANUAL}/mod/ - -PKG_APACHE_ACCEPTED= apache22 -APACHE_MANUAL= manual -APACHE_MODULE= YES -USE_LIBTOOL= YES - -MAKE_FLAGS+= LIBTOOL=${LIBTOOL:Q} - -SUBST_CLASSES+= ap2 -SUBST_STAGE.ap2= pre-build -SUBST_FILES.ap2= Makefile -SUBST_SED.ap2= -e s,/usr/local/apache2,${PREFIX}/share/httpd, - -post-patch: - ${CP} ${WRKSRC}/Makefile.AP2 ${WRKSRC}/Makefile - -.include "../../mk/apache.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/www/ap-fastcgi/PLIST b/www/ap-fastcgi/PLIST deleted file mode 100644 index b407bc8c9bb..00000000000 --- a/www/ap-fastcgi/PLIST +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2004/10/28 21:01:50 cube Exp $ -lib/httpd/mod_fastcgi.so -share/httpd/${APACHE_MANUAL}/mod/mod_fastcgi.html diff --git a/www/ap-fastcgi/distinfo b/www/ap-fastcgi/distinfo deleted file mode 100644 index 87096715250..00000000000 --- a/www/ap-fastcgi/distinfo +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: distinfo,v 1.8 2015/11/04 02:46:47 agc Exp $ - -SHA1 (mod_fastcgi-2.4.6.tar.gz) = 69c56548bf97040a61903b32679fe3e3b7d3c2d4 -RMD160 (mod_fastcgi-2.4.6.tar.gz) = 95caee4847cb725aab6c7d8bf2db9dee49d46eec -SHA512 (mod_fastcgi-2.4.6.tar.gz) = a666e1b0490ca19f11c297a8ecd56ba1fee71ce42cbd67430b49b6945d55333148920b52718755ff65e9a9bd2c7cd6edaac824dce0b4399507dcffe42d770a6a -Size (mod_fastcgi-2.4.6.tar.gz) = 100230 bytes -SHA1 (patch-aa) = c7ead44e7c0530f093065f034900e1be84746ec2 -SHA1 (patch-ab) = 257d7e2b65fedd630e85acfb77bb9b6ddd21c6bf -SHA1 (patch-ac) = 2cc983a1f3d63a650fb648e60b3529c677857695 -SHA1 (patch-ad) = c020c369f3075c28d30087e1b72ae6b0a3105373 -SHA1 (patch-ae) = b934b3bc5b40dd62d70a06458849ca1049a3c9ae diff --git a/www/ap-fastcgi/patches/patch-aa b/www/ap-fastcgi/patches/patch-aa deleted file mode 100644 index 5f54c0ee0d0..00000000000 --- a/www/ap-fastcgi/patches/patch-aa +++ /dev/null @@ -1,95 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2006/12/29 13:35:30 joerg Exp $ - ---- fcgi.h.orig 2003-02-03 23:07:37.000000000 +0000 -+++ fcgi.h -@@ -19,15 +19,15 @@ - #endif - - /* Apache header files */ --#include "httpd.h" --#include "http_config.h" --#include "http_request.h" --#include "http_core.h" --#include "http_protocol.h" --#include "http_main.h" --#include "http_log.h" --#include "util_script.h" --#include "util_md5.h" -+#include <httpd/httpd.h> -+#include <httpd/http_config.h> -+#include <httpd/http_request.h> -+#include <httpd/http_core.h> -+#include <httpd/http_protocol.h> -+#include <httpd/http_main.h> -+#include <httpd/http_log.h> -+#include <httpd/util_script.h> -+#include <httpd/util_md5.h> - - /* AP2TODO there's probably a better way */ - #ifdef STANDARD20_MODULE_STUFF -@@ -37,8 +37,8 @@ - #ifdef APACHE2 - - #include <sys/stat.h> --#include "ap_compat.h" --#include "apr_strings.h" -+#include <httpd/ap_compat.h> -+#include <apr_strings.h> - - #ifdef WIN32 - #if MODULE_MAGIC_NUMBER < 20020903 -@@ -79,7 +79,7 @@ typedef apr_status_t apcb_t; - - #else /* !APACHE2 */ - --#include "http_conf_globals.h" -+#include <httpd/http_conf_globals.h> - typedef void apcb_t; - #define APCB_OK - -@@ -88,6 +88,36 @@ typedef void apcb_t; - #endif - - #endif /* !APACHE2 */ -+ -+/* starting with apache 2.2 the backward-compatibility defines for -+ * 1.3 APIs are not available anymore. Define them ourselves here. -+ */ -+#if defined(APACHE2) && !defined(ap_copy_table) -+ -+#define ap_copy_table apr_table_copy -+#define ap_cpystrn apr_cpystrn -+#define ap_destroy_pool apr_pool_destroy -+#define ap_isspace apr_isspace -+#define ap_make_array apr_array_make -+#define ap_make_table apr_table_make -+#define ap_null_cleanup apr_pool_cleanup_null -+#define ap_palloc apr_palloc -+#define ap_pcalloc apr_pcalloc -+#define ap_psprintf apr_psprintf -+#define ap_pstrcat apr_pstrcat -+#define ap_pstrdup apr_pstrdup -+#define ap_pstrndup apr_pstrndup -+#define ap_push_array apr_array_push -+#define ap_register_cleanup apr_pool_cleanup_register -+#define ap_snprintf apr_snprintf -+#define ap_table_add apr_table_add -+#define ap_table_do apr_table_do -+#define ap_table_get apr_table_get -+#define ap_table_set apr_table_set -+#define ap_table_setn apr_table_setn -+#define ap_table_unset apr_table_unset -+ -+#endif /* defined(ap_copy_table) */ - - #ifndef NO_WRITEV - #include <sys/uio.h> -@@ -95,7 +125,7 @@ typedef void apcb_t; - - #ifdef WIN32 - #ifndef APACHE2 --#include "multithread.h" -+#include <multithread.h> - #endif - #pragma warning(default : 4115) - #else diff --git a/www/ap-fastcgi/patches/patch-ab b/www/ap-fastcgi/patches/patch-ab deleted file mode 100644 index fa7c65d35fc..00000000000 --- a/www/ap-fastcgi/patches/patch-ab +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2004/10/28 21:01:50 cube Exp $ - ---- fcgi_config.c.orig 2003-10-30 02:08:34.000000000 +0100 -+++ fcgi_config.c -@@ -8,13 +8,13 @@ - #ifdef APACHE2 - - #include <limits.h> --#include "mpm_common.h" /* ap_uname2id, ap_gname2id */ -+#include <httpd/mpm_common.h> /* ap_uname2id, ap_gname2id */ - - #ifdef WIN32 - #include <direct.h> - #else - #include <unistd.h> --#include "unixd.h" -+#include <httpd/unixd.h> - #endif - - #endif diff --git a/www/ap-fastcgi/patches/patch-ac b/www/ap-fastcgi/patches/patch-ac deleted file mode 100644 index 35eb374dc27..00000000000 --- a/www/ap-fastcgi/patches/patch-ac +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2004/10/28 21:01:50 cube Exp $ - ---- fcgi_pm.c.orig 2003-10-30 02:08:34.000000000 +0100 -+++ fcgi_pm.c -@@ -8,8 +8,8 @@ - #if defined(APACHE2) && !defined(WIN32) - #include <pwd.h> - #include <unistd.h> --#include "unixd.h" --#include "apr_signal.h" -+#include <httpd/unixd.h> -+#include <apr_signal.h> - #endif - - #ifndef WIN32 -@@ -31,7 +31,7 @@ static time_t now = 0; - - #ifdef WIN32 - #ifdef APACHE2 --#include "mod_cgi.h" -+#include <httpd/mod_cgi.h> - #endif - #pragma warning ( disable : 4100 4102 ) - static BOOL bTimeToDie = FALSE; /* process termination flag */ diff --git a/www/ap-fastcgi/patches/patch-ad b/www/ap-fastcgi/patches/patch-ad deleted file mode 100644 index 570c9faf691..00000000000 --- a/www/ap-fastcgi/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2004/10/28 21:01:50 cube Exp $ - ---- fcgi_util.c.orig 2003-10-30 02:08:34.000000000 +0100 -+++ fcgi_util.c -@@ -16,7 +16,7 @@ - #include <arpa/inet.h> - #endif - --#include "unixd.h" -+#include <httpd/unixd.h> - #endif - - uid_t diff --git a/www/ap-fastcgi/patches/patch-ae b/www/ap-fastcgi/patches/patch-ae deleted file mode 100644 index c428ec9c233..00000000000 --- a/www/ap-fastcgi/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2004/10/28 21:01:50 cube Exp $ - ---- mod_fastcgi.c.orig 2003-10-30 02:08:34.000000000 +0100 -+++ mod_fastcgi.c -@@ -80,7 +80,7 @@ - #include <ctype.h> - #endif - --#include "unixd.h" -+#include <httpd/unixd.h> - - #endif - #endif diff --git a/www/ap-geoip2/DESCR b/www/ap-geoip2/DESCR deleted file mode 100644 index 81903948263..00000000000 --- a/www/ap-geoip2/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -Apache module to look up the IP address of the client end user in -the MaxMind geoip database diff --git a/www/ap-geoip2/Makefile b/www/ap-geoip2/Makefile deleted file mode 100644 index 19e45dbaefd..00000000000 --- a/www/ap-geoip2/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# $NetBSD: Makefile,v 1.5 2014/06/11 12:57:22 joerg Exp $ -# - -DISTNAME= mod_geoip2_1.2.5 -PKGNAME= ${DISTNAME:S/mod_/${APACHE_PKG_PREFIX}-/:S/_/-/} -CATEGORIES= www -MASTER_SITES= http://geolite.maxmind.com/download/geoip/api/mod_geoip2/ - -MAINTAINER= msporleder@gmail.com -HOMEPAGE= http://www.maxmind.com/app/mod_geoip -COMMENT= Apache module to interact with the MaxMind geoip database -LICENSE= apache-1.1 - -APACHE_MODULE_NAME= mod_geoip.so -PKG_APACHE_ACCEPTED= apache22 -NO_CONFIGURE= yes -CPPFLAGS+= -I${DESTDIR}/include -LDFLAGS+= -L${DESTDIR}/lib -lGeoIP - -pre-install: - cp ${WRKDIR}/${DISTNAME}/.libs/mod_geoip.so ${WRKDIR}/${DISTNAME}/ - -.include "../../mk/apache.module.mk" -.include "../../net/GeoIP/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/www/ap-geoip2/PLIST b/www/ap-geoip2/PLIST deleted file mode 100644 index e41a18af668..00000000000 --- a/www/ap-geoip2/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2011/05/20 00:07:25 mspo Exp $ -lib/httpd/mod_geoip.so diff --git a/www/ap-geoip2/distinfo b/www/ap-geoip2/distinfo deleted file mode 100644 index 51b18034592..00000000000 --- a/www/ap-geoip2/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.2 2015/11/04 02:46:47 agc Exp $ - -SHA1 (mod_geoip2_1.2.5.tar.gz) = aee05907479bbb6c7923287d6ddb6e8a0e169b46 -RMD160 (mod_geoip2_1.2.5.tar.gz) = e81511ed3a2aa20897a4071d508a01194f97c4aa -SHA512 (mod_geoip2_1.2.5.tar.gz) = bc3674fa374d613ce9512706c87cee68ecf20dfdfaeec81de8ce71345a4101ae4c6f8ac177fd9308c4ead933c757fd4e13f1888f4644650be96b36bf6d1049f5 -Size (mod_geoip2_1.2.5.tar.gz) = 11602 bytes diff --git a/www/ap-scgi/DESCR b/www/ap-scgi/DESCR deleted file mode 100644 index c9bf489ea59..00000000000 --- a/www/ap-scgi/DESCR +++ /dev/null @@ -1,6 +0,0 @@ -The SCGI protocol is a replacement for the Common Gateway Interface -(CGI) protocol. It is a standard for applications to interface with -HTTP servers. It is similar to FastCGI but is designed to be easier -to implement. - -This package provide SCGI for Apache diff --git a/www/ap-scgi/MESSAGE b/www/ap-scgi/MESSAGE deleted file mode 100644 index 08a6a6ea2b1..00000000000 --- a/www/ap-scgi/MESSAGE +++ /dev/null @@ -1,10 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.1.1.1 2009/03/03 10:13:34 manu Exp $ - -In order to use ${PKGNAME}, you must add something like this to your Apache -configuration: - -LoadModule scgi_module lib/httpd/mod_scgi.so -SCGIMount /dynamic 127.0.0.1:4000 - -=========================================================================== diff --git a/www/ap-scgi/Makefile b/www/ap-scgi/Makefile deleted file mode 100644 index faa93686721..00000000000 --- a/www/ap-scgi/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# $NetBSD: Makefile,v 1.18 2017/01/01 14:44:02 wiz Exp $ -# - -PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME} - -COMMENT= Simple Common Gateway Interface for Apache -LICENSE= cnri-license - -DEPENDS+= ${PYPKGPREFIX}-scgi-[0-9]*:../../www/py-scgi - -APACHE_MODULE= yes - -# does not compile with apache24 -PKG_APACHE_ACCEPTED= apache22 - -PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-quixote via py-scgi - -MODULE_EXT= la -APACHE_MODULE_SRCDIR= ${WRKDIR}/${DISTNAME}/apache2 - -APACHE_MODULE_NAME= mod_scgi.${MODULE_EXT} -APACHE_MODULE_SRC= mod_scgi.c - -.include "../../lang/python/pyversion.mk" -.include "../../mk/apache.module.mk" -.include "../../www/py-scgi/Makefile.common" diff --git a/www/ap-scgi/PLIST b/www/ap-scgi/PLIST deleted file mode 100644 index c2ad826492a..00000000000 --- a/www/ap-scgi/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2009/03/03 10:13:34 manu Exp $ -lib/httpd/mod_scgi.so diff --git a/www/ap2-auth-external/DESCR b/www/ap2-auth-external/DESCR deleted file mode 100644 index 0a4e81c24c1..00000000000 --- a/www/ap2-auth-external/DESCR +++ /dev/null @@ -1,20 +0,0 @@ -The Apache HTTP Daemon can be configured to require users to supply logins -and passwords before accessing pages in some directories. Authentication is -the process of checking if the password given is correct for a user. Apache -has standard modules for authenticating out of several different kinds of -databases. The external authentication module provides a flexible tool for -creating authentication systems based on other databases. - -The module can be used in either of two somewhat divergent ways: -1) External Authentication: - -When a user supplies a login and password, mod_auth*_external runs a program -you write, passing it the login and password. Your program does whatever -checking and logging it needs to, and then returns a Accept/Reject flag to -Apache. - -2) Hardcoded Authentication: - -Some hooks have been inserted into mod_auth*_external to make it easy to -replace the call to the external authentication program with a call to a -hardcoded internal authentication routine that you write. diff --git a/www/ap2-auth-external/MESSAGE b/www/ap2-auth-external/MESSAGE deleted file mode 100644 index a96a9e42b11..00000000000 --- a/www/ap2-auth-external/MESSAGE +++ /dev/null @@ -1,9 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.1.1.1 2007/12/20 14:59:14 sborrill Exp $ - -In order to use this module in your Apache installation, you need to -add the following to your httpd.conf file: - - LoadModule ${MODULE_NAME} lib/httpd/mod_auth_external.so - -=========================================================================== diff --git a/www/ap2-auth-external/Makefile b/www/ap2-auth-external/Makefile deleted file mode 100644 index 54bc09fbddc..00000000000 --- a/www/ap2-auth-external/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# $NetBSD: Makefile,v 1.8 2017/08/01 16:49:18 wiz Exp $ - -DISTNAME= mod_auth_external-${DISTVERS} -PKGREVISION= 2 -PKGNAME= ${APACHE_PKG_PREFIX}-auth-external-${DISTVERS} -CATEGORIES= www -MASTER_SITES= http://mod-auth-external.googlecode.com/files/ - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= https://github.com/phokz/mod-auth-external -COMMENT= Apache module for external program authentication - -PKG_APACHE_ACCEPTED= apache22 - -APACHE_MODULE_NAME= mod_auth_external.${MODULE_EXT} - -DISTVERS= 2.2.11 -MODULE_EXT= la -MESSAGE_SUBST+= MODULE_NAME=auth_external_module - -.include "../../mk/apache.module.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/www/ap2-auth-external/PLIST b/www/ap2-auth-external/PLIST deleted file mode 100644 index f40870fbbb7..00000000000 --- a/www/ap2-auth-external/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2007/12/20 14:59:14 sborrill Exp $ -lib/httpd/mod_auth_external.so diff --git a/www/ap2-auth-external/distinfo b/www/ap2-auth-external/distinfo deleted file mode 100644 index 57c86060649..00000000000 --- a/www/ap2-auth-external/distinfo +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: distinfo,v 1.2 2015/11/04 02:46:47 agc Exp $ - -SHA1 (mod_auth_external-2.1.19.tar.gz) = da2266f93acf82e488e14380157f1acd69198ad9 -RMD160 (mod_auth_external-2.1.19.tar.gz) = f4012119f3e3eca73b07c1f90292338e6256e31a -SHA512 (mod_auth_external-2.1.19.tar.gz) = f4e3b101f70d63d9d051c9d954fc8a2550f05a38463d29eaa429254a2b63133199dcd3592babb8bdf5e2af2287df6b80de0dec11f3c6cc38f04ac8ebe2c00dae -Size (mod_auth_external-2.1.19.tar.gz) = 51390 bytes -SHA1 (mod_auth_external-2.2.11.tar.gz) = da89adcdac611ec8c0f69a79f2edff669210f2a1 -RMD160 (mod_auth_external-2.2.11.tar.gz) = be27183d8049989f64548a5c8dd3cdecc3b3a5e2 -SHA512 (mod_auth_external-2.2.11.tar.gz) = ddcc09106c6464cd3683ef6fd17f6367fb3f876256de60fe9b11b33ac443aa66991cb0f60f2a1ef5b96be96a33ac40df5a623a09462ccda0e2c6a63d38f18fc7 -Size (mod_auth_external-2.2.11.tar.gz) = 52542 bytes -SHA1 (patch-aa) = 7232921601c3e61e70d13cd0bb252eb219de3569 diff --git a/www/ap2-auth-external/patches/patch-aa b/www/ap2-auth-external/patches/patch-aa deleted file mode 100644 index 8484a49b025..00000000000 --- a/www/ap2-auth-external/patches/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2007/12/20 14:59:14 sborrill Exp $ - ---- mod_auth_external.c.orig 2007-12-19 15:17:29.000000000 +0000 -+++ mod_auth_external.c 2007-12-19 15:17:29.000000000 +0000 -@@ -242,6 +242,7 @@ - #define ENV_PASS "PASS" - #define ENV_GROUP "GROUP" - #define ENV_URI "URI" -+#define ENV_METHOD "METHOD" - #define ENV_IP "IP" - #define ENV_HOST "HOST" /* Remote Host */ - #define ENV_HTTP_HOST "HTTP_HOST" /* Local Host */ -@@ -506,6 +507,9 @@ - if (r->uri) - child_env[i++]= apr_pstrcat(r->pool, ENV_URI"=", r->uri, NULL); - -+ if (r->method) -+ child_env[i++]= apr_pstrcat(r->pool, ENV_METHOD"=", r->method, NULL); -+ - if ((host= lookup_header(r,"Host")) != NULL) - child_env[i++]= apr_pstrcat(r->pool, ENV_HTTP_HOST"=", host, NULL); - diff --git a/www/ap2-auth-mellon/Makefile b/www/ap2-auth-mellon/Makefile index e61ee80a891..0da5ab55cd2 100644 --- a/www/ap2-auth-mellon/Makefile +++ b/www/ap2-auth-mellon/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2017/08/24 20:03:41 adam Exp $ -# +# $NetBSD: Makefile,v 1.41 2018/01/01 10:23:06 wiz Exp $ DISTNAME= mod_auth_mellon-0.12.0 PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//:S/_/-/g} @@ -17,9 +16,7 @@ USE_LIBTOOL= YES USE_TOOLS+= pkg-config APACHE_MODULE= YES -PKG_APACHE_ACCEPTED= apache22 apache24 .include "../../mk/apache.mk" -BUILDLINK_API_DEPENDS.apache+= apache>=2.0.47 SUBST_CLASSES+= pthflags SUBST_STAGE.pthflags= post-configure diff --git a/www/ap2-auth-mysql/DESCR b/www/ap2-auth-mysql/DESCR deleted file mode 100644 index d3f6e6f5488..00000000000 --- a/www/ap2-auth-mysql/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -mod_auth_mysql will allow you to use a MySQL database to authenticate users -with the Apache 2 HTTP server. diff --git a/www/ap2-auth-mysql/Makefile b/www/ap2-auth-mysql/Makefile deleted file mode 100644 index f840cc84c3d..00000000000 --- a/www/ap2-auth-mysql/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# $NetBSD: Makefile,v 1.25 2014/06/10 15:22:17 joerg Exp $ -# - -DISTNAME= mod_auth_mysql.c -PKGNAME= ${APACHE_PKG_PREFIX}-auth-mysql-1.11.12 -PKGREVISION= 10 -CATEGORIES= www databases -MASTER_SITES= ftp://ftp.kcilink.com/pub/ -DISTFILES= ${DISTNAME}.gz mysql-group-auth.txt - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= ftp://ftp.kcilink.com/pub/ -COMMENT= Module to allow Apache 2 authentication against a MySQL database - -CONFLICTS+= ap-auth-mysql-[0-9]* - -DIST_SUBDIR= ap2-auth-mysql -EXTRACT_ONLY= ${DISTNAME}.gz - -WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} -NO_CONFIGURE= yes - -APACHE_MODULE_NAME= mod_auth_mysql -DOC_DIR= ${PREFIX}/share/doc/${APACHE_MODULE_NAME} - -PKG_APACHE_ACCEPTED= apache22 - -INSTALLATION_DIRS+= ${DOC_DIR} lib/httpd - -post-extract: - ${MKDIR} ${WRKSRC} - ${MV} ${WRKDIR}/${DISTNAME} ${WRKSRC} - ${CP} ${DISTDIR}/${DIST_SUBDIR}/mysql-group-auth.txt ${WRKSRC} - -do-build: - cd ${WRKSRC} && \ - ${APXS} -c -n ${APACHE_MODULE_NAME} \ - -I${BUILDLINK_PREFIX.mysql-client}/include \ - -L${BUILDLINK_PREFIX.mysql-client}/${BUILDLINK_LIBDIRS.mysql-client} \ - ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/${BUILDLINK_LIBDIRS.mysql-client} \ - -lmysqlclient ${DISTNAME} - -do-install: - cd ${WRKSRC} && \ - libexecdir=`${APXS} -q LIBEXECDIR` && \ - ${APXS} -i -S LIBEXECDIR=${DESTDIR}"$${libexecdir}" \ - -n ${APACHE_MODULE_NAME} ${APACHE_MODULE_NAME}.la - ${INSTALL_DATA} ${WRKSRC}/mysql-group-auth.txt ${DESTDIR}${DOC_DIR} - -.include "../../mk/apache.mk" -.include "../../mk/mysql.buildlink3.mk" - -.include "../../mk/bsd.pkg.mk" diff --git a/www/ap2-auth-mysql/PLIST b/www/ap2-auth-mysql/PLIST deleted file mode 100644 index 99a41403286..00000000000 --- a/www/ap2-auth-mysql/PLIST +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 22:00:16 joerg Exp $ -lib/httpd/mod_auth_mysql.so -share/doc/mod_auth_mysql/mysql-group-auth.txt diff --git a/www/ap2-auth-mysql/distinfo b/www/ap2-auth-mysql/distinfo deleted file mode 100644 index 2f1821d49aa..00000000000 --- a/www/ap2-auth-mysql/distinfo +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: distinfo,v 1.5 2015/11/04 02:46:48 agc Exp $ - -SHA1 (ap2-auth-mysql/mod_auth_mysql.c.gz) = 0e53b22ccd2ebd36a213d5e418b02e6167a1300b -RMD160 (ap2-auth-mysql/mod_auth_mysql.c.gz) = 1c5578132b79063ac6da87d827e9fdb55f7be412 -SHA512 (ap2-auth-mysql/mod_auth_mysql.c.gz) = 46167eeb0264fde9b937d01af6d4210c3aa7d37743375be777a5cc8b8ac476bed510e4483f8fa5c6e2287bb3eca5f3fbff86292830ab6eb4b40e383cd9b6d1eb -Size (ap2-auth-mysql/mod_auth_mysql.c.gz) = 6900 bytes -SHA1 (ap2-auth-mysql/mysql-group-auth.txt) = 6c0d39ed3ac6a3955d8d8c7c4892e07ba3d3ae77 -RMD160 (ap2-auth-mysql/mysql-group-auth.txt) = aff76b74993e8501e2efa0cc366ef91a4b29821a -SHA512 (ap2-auth-mysql/mysql-group-auth.txt) = 80a1a2e55e3b9866b5e52326fd738be6993c3f99117bb4c53898c6da63a2da153ebb33e31e0707e102758f8a0cb71d80c1254c89eead3c2cc6ecbd05da5c32d3 -Size (ap2-auth-mysql/mysql-group-auth.txt) = 1564 bytes -SHA1 (patch-aa) = 36364c3af7dd99ba9ce3f79fb4625e40e07d3911 diff --git a/www/ap2-auth-mysql/patches/patch-aa b/www/ap2-auth-mysql/patches/patch-aa deleted file mode 100644 index 195a3b79de1..00000000000 --- a/www/ap2-auth-mysql/patches/patch-aa +++ /dev/null @@ -1,385 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2007/02/25 15:51:50 sborrill Exp $ - ---- mod_auth_mysql.c.orig 2007-02-25 16:15:13.000000000 +0000 -+++ mod_auth_mysql.c 2007-02-25 16:15:13.000000000 +0000 -@@ -189,7 +189,9 @@ - #include "http_core.h" - #include "http_log.h" - #include "http_protocol.h" -+#include "apr_strings.h" - #include <mysql/mysql.h> -+#include <unistd.h> - - /* - * structure to hold the configuration details for the request -@@ -221,34 +223,26 @@ static MYSQL *mysql_handle = NULL; - * Callback to close mysql handle when necessary. Also called when a - * child httpd process is terminated. - */ --static void -+static apr_status_t - mod_auth_mysql_cleanup (void *notused) - { - if (mysql_handle) mysql_close(mysql_handle); - mysql_handle = NULL; /* make sure we don't try to use it later */ -+ return APR_SUCCESS; - } - - /* - * empty function necessary because register_cleanup requires it as one - * of its parameters - */ --static void -+static apr_status_t - mod_auth_mysql_cleanup_child (void *notused) - { - /* nothing */ -+ return APR_SUCCESS; - } - - /* -- * handler to do cleanup on child exit -- */ --static void --child_exit(server_rec *s, pool *p) --{ -- mod_auth_mysql_cleanup(NULL); --} -- -- --/* - * open connection to DB server if necessary. Return TRUE if connection - * is good, FALSE if not able to connect. If false returned, reason - * for failure has been logged to error_log file already. -@@ -274,22 +268,28 @@ open_db_handle(request_rec *r, mysql_aut - db_host = m->mysqlhost; - } - -- mysql_handle=mysql_connect(&mysql_conn,db_host,m->mysqluser,m->mysqlpasswd); -+ if (mysql_init(&mysql_conn) == NULL) { -+ ap_log_error (APLOG_MARK, APLOG_ERR, 0, r->server, -+ "mysql_init() failed"); -+ return FALSE; -+ } -+ mysql_handle=mysql_real_connect(&mysql_conn,db_host,m->mysqluser,m->mysqlpasswd, -+ NULL, 0, NULL, 0); - - if (mysql_handle) { - - if (!m->mysqlKeepAlive) { - /* close when request done */ -- ap_register_cleanup(r->pool, (void *)NULL, -- mod_auth_mysql_cleanup, -- mod_auth_mysql_cleanup_child); -+ apr_pool_cleanup_register(r->pool, r->server, -+ mod_auth_mysql_cleanup, -+ mod_auth_mysql_cleanup_child); - } /* ELSE... - * Child process is notified when it is terminated so we - * do a graceful close to the server in that handler. - */ - - } else { /* failed to get MySQL connection */ -- ap_log_error (APLOG_MARK, APLOG_ERR, r->server, -+ ap_log_error (APLOG_MARK, APLOG_ERR, 0, r->server, - "MySQL error: %s", mysql_error(&mysql_conn)); - return FALSE; - } -@@ -299,9 +299,9 @@ open_db_handle(request_rec *r, mysql_aut - - - static void * --create_mysql_auth_dir_config (pool *p, char *d) -+create_mysql_auth_dir_config (apr_pool_t *p, char *d) - { -- mysql_auth_config_rec *m = ap_pcalloc (p, sizeof(mysql_auth_config_rec)); -+ mysql_auth_config_rec *m = apr_pcalloc (p, sizeof(mysql_auth_config_rec)); - if (!m) return NULL; /* failure to get memory is a bad thing */ - - /* defaults values */ -@@ -316,45 +316,45 @@ create_mysql_auth_dir_config (pool *p, c - - static - command_rec mysql_auth_cmds[] = { -- { "AuthMySQLHost", ap_set_string_slot, -- (void*)XtOffsetOf(mysql_auth_config_rec, mysqlhost), -- OR_AUTHCFG, TAKE1, "mysql server host name" }, -- { "AuthMySQLUser", ap_set_string_slot, -- (void*)XtOffsetOf(mysql_auth_config_rec, mysqluser), -- OR_AUTHCFG, TAKE1, "mysql server user name" }, -- { "AuthMySQLPassword", ap_set_string_slot, -- (void*)XtOffsetOf(mysql_auth_config_rec, mysqlpasswd), -- OR_AUTHCFG, TAKE1, "mysql server user password" }, -- { "AuthMySQLDB", ap_set_string_slot, -- (void*)XtOffsetOf(mysql_auth_config_rec, mysqlDB), -- OR_AUTHCFG, TAKE1, "mysql database name" }, -- { "AuthMySQLUserTable", ap_set_string_slot, -- (void*)XtOffsetOf(mysql_auth_config_rec, mysqlpwtable), -- OR_AUTHCFG, TAKE1, "mysql user table name" }, -- { "AuthMySQLGroupTable", ap_set_string_slot, -- (void*)XtOffsetOf(mysql_auth_config_rec, mysqlgrptable), -- OR_AUTHCFG, TAKE1, "mysql group table name" }, -- { "AuthMySQLNameField", ap_set_string_slot, -- (void*)XtOffsetOf(mysql_auth_config_rec, mysqlNameField), -- OR_AUTHCFG, TAKE1, "mysql User ID field name within table" }, -- { "AuthMySQLGroupField", ap_set_string_slot, -- (void*)XtOffsetOf(mysql_auth_config_rec, mysqlGroupField), -- OR_AUTHCFG, TAKE1, "mysql Group field name within table" }, -- { "AuthMySQLPasswordField", ap_set_string_slot, -- (void*)XtOffsetOf(mysql_auth_config_rec, mysqlPasswordField), -- OR_AUTHCFG, TAKE1, "mysql Password field name within table" }, -- { "AuthMySQLCryptedPasswords", ap_set_flag_slot, -- (void*)XtOffsetOf(mysql_auth_config_rec, mysqlCrypted), -- OR_AUTHCFG, FLAG, "mysql passwords are stored encrypted if On" }, -- { "AuthMySQLKeepAlive", ap_set_flag_slot, -- (void*)XtOffsetOf(mysql_auth_config_rec, mysqlKeepAlive), -- OR_AUTHCFG, FLAG, "mysql connection kept open across requests if On" }, -- { "AuthMySQLAuthoritative", ap_set_flag_slot, -- (void*)XtOffsetOf(mysql_auth_config_rec, mysqlAuthoritative), -- OR_AUTHCFG, FLAG, "mysql lookup is authoritative if On" }, -- { "AuthMySQLNoPasswd", ap_set_flag_slot, -- (void*)XtOffsetOf(mysql_auth_config_rec, mysqlNoPasswd), -- OR_AUTHCFG, FLAG, "If On, only check if user exists; ignore password" }, -+ AP_INIT_TAKE1("AuthMySQLHost", ap_set_string_slot, -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, mysqlhost), -+ OR_AUTHCFG, "mysql server host name"), -+ AP_INIT_TAKE1("AuthMySQLUser", ap_set_string_slot, -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, mysqluser), -+ OR_AUTHCFG, "mysql server user name"), -+ AP_INIT_TAKE1("AuthMySQLPassword", ap_set_string_slot, -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, mysqlpasswd), -+ OR_AUTHCFG, "mysql server user password"), -+ AP_INIT_TAKE1("AuthMySQLDB", ap_set_string_slot, -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, mysqlDB), -+ OR_AUTHCFG, "mysql database name"), -+ AP_INIT_TAKE1("AuthMySQLUserTable", ap_set_string_slot, -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, mysqlpwtable), -+ OR_AUTHCFG, "mysql user table name"), -+ AP_INIT_TAKE1("AuthMySQLGroupTable", ap_set_string_slot, -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, mysqlgrptable), -+ OR_AUTHCFG, "mysql group table name"), -+ AP_INIT_TAKE1("AuthMySQLNameField", ap_set_string_slot, -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, mysqlNameField), -+ OR_AUTHCFG, "mysql User ID field name within table"), -+ AP_INIT_TAKE1("AuthMySQLGroupField", ap_set_string_slot, -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, mysqlGroupField), -+ OR_AUTHCFG, "mysql Group field name within table"), -+ AP_INIT_TAKE1("AuthMySQLPasswordField", ap_set_string_slot, -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, mysqlPasswordField), -+ OR_AUTHCFG, "mysql Password field name within table"), -+ AP_INIT_FLAG("AuthMySQLCryptedPasswords", ap_set_flag_slot, -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, mysqlCrypted), -+ OR_AUTHCFG, "mysql passwords are stored encrypted if On"), -+ AP_INIT_FLAG("AuthMySQLKeepAlive", ap_set_flag_slot, -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, mysqlKeepAlive), -+ OR_AUTHCFG, "mysql connection kept open across requests if On"), -+ AP_INIT_FLAG("AuthMySQLAuthoritative", ap_set_flag_slot, -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, mysqlAuthoritative), -+ OR_AUTHCFG, "mysql lookup is authoritative if On"), -+ AP_INIT_FLAG("AuthMySQLNoPasswd", ap_set_flag_slot, -+ (void*)APR_OFFSETOF(mysql_auth_config_rec, mysqlNoPasswd), -+ OR_AUTHCFG, "If On, only check if user exists; ignore password"), - { NULL } - }; - -@@ -379,7 +379,7 @@ get_mysql_pw(request_rec *r, char *user, - } - - if (mysql_select_db(mysql_handle,m->mysqlDB) != 0) { -- ap_log_error (APLOG_MARK, APLOG_ERR, r->server, -+ ap_log_error (APLOG_MARK, APLOG_ERR, 0, r->server, - "MySQL error: %s", mysql_error(mysql_handle)); - return NULL; - } -@@ -394,13 +394,13 @@ get_mysql_pw(request_rec *r, char *user, - } - - ulen = strlen(user); -- sql_safe_user = ap_pcalloc(r->pool, ulen*2+1); -- mysql_escape_string(sql_safe_user,user,ulen); -- ap_snprintf(query,sizeof(query)-1,"SELECT %s FROM %s WHERE %s='%s'", -- m->mysqlPasswordField, m->mysqlpwtable, -- m->mysqlNameField, sql_safe_user); -+ sql_safe_user = apr_pcalloc(r->pool, ulen*2+1); -+ mysql_real_escape_string(mysql_handle,sql_safe_user,user,ulen); -+ apr_snprintf(query,sizeof(query)-1,"SELECT %s FROM %s WHERE %s='%s'", -+ m->mysqlPasswordField, m->mysqlpwtable, -+ m->mysqlNameField, sql_safe_user); - if (mysql_query(mysql_handle, query) != 0) { -- ap_log_error (APLOG_MARK, APLOG_ERR, r->server, -+ ap_log_error (APLOG_MARK, APLOG_ERR, 0, r->server, - "MySQL error %s: %s", mysql_error(mysql_handle),r->uri); - return NULL; - } -@@ -409,10 +409,10 @@ get_mysql_pw(request_rec *r, char *user, - if (result && (mysql_num_rows(result) == 1)) { - MYSQL_ROW data = mysql_fetch_row(result); - if (data[0]) { -- pw = ap_pstrdup(r->pool, data[0]); -+ pw = apr_pstrdup(r->pool, data[0]); - } else { /* no password in mysql table returns NULL */ - /* this should never happen, but test for it anyhow */ -- ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server, -+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, - "MySQL user %s has no valid password: %s", user, r->uri); - mysql_free_result(result); - return NULL; -@@ -443,19 +443,19 @@ get_mysql_groups(request_rec *r, char *u - } - - if (mysql_select_db(mysql_handle,m->mysqlDB) != 0) { -- ap_log_error (APLOG_MARK, APLOG_ERR, r->server, -+ ap_log_error (APLOG_MARK, APLOG_ERR, 0, r->server, - "MySQL error %s: %s", mysql_error(mysql_handle),r->uri); - return NULL; - } - - ulen = strlen(user); -- sql_safe_user = ap_pcalloc(r->pool, ulen*2+1); -+ sql_safe_user = apr_pcalloc(r->pool, ulen*2+1); - mysql_escape_string(sql_safe_user,user,ulen); -- ap_snprintf(query,sizeof(query)-1,"SELECT %s FROM %s WHERE %s='%s'", -- m->mysqlGroupField, m->mysqlgrptable, -- m->mysqlNameField, sql_safe_user); -+ apr_snprintf(query,sizeof(query)-1,"SELECT %s FROM %s WHERE %s='%s'", -+ m->mysqlGroupField, m->mysqlgrptable, -+ m->mysqlNameField, sql_safe_user); - if (mysql_query(mysql_handle, query) != 0) { -- ap_log_error (APLOG_MARK, APLOG_ERR, r->server, -+ ap_log_error (APLOG_MARK, APLOG_ERR, 0, r->server, - "MySQL error %s: %s", mysql_error(mysql_handle),r->uri); - return NULL; - } -@@ -463,12 +463,12 @@ get_mysql_groups(request_rec *r, char *u - result = mysql_store_result(mysql_handle); - if (result && (mysql_num_rows(result) > 0)) { - int i = mysql_num_rows(result); -- list = (char **)ap_pcalloc(r->pool, sizeof(char *) * (i+1)); -+ list = (char **)apr_pcalloc(r->pool, sizeof(char *) * (i+1)); - list[i] = NULL; /* last element in array is NULL */ - while (i--) { /* populate the array elements */ - MYSQL_ROW data = mysql_fetch_row(result); - if (data[0]) -- list[i] = ap_pstrdup(r->pool, data[0]); -+ list[i] = apr_pstrdup(r->pool, data[0]); - else - list[i] = ""; /* if no data, make it empty, not NULL */ - } -@@ -499,15 +499,15 @@ mysql_authenticate_basic_user (request_r - if(!sec->mysqlpwtable) /* not configured for mysql authorization */ - return DECLINED; - -- if(!(real_pw = get_mysql_pw(r, c->user, sec))) { -+ if(!(real_pw = get_mysql_pw(r, r->user, sec))) { - /* user not found in database */ - if (!sec->mysqlAuthoritative) - return DECLINED; /* let other schemes find user */ - -- ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server, -- "MySQL user %s not found: %s", c->user, r->uri); -+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, -+ "MySQL user %s not found: %s", r->user, r->uri); - ap_note_basic_auth_failure (r); -- return AUTH_REQUIRED; -+ return HTTP_UNAUTHORIZED; - } - - /* if we don't require password, just return ok since they exist */ -@@ -517,10 +517,10 @@ mysql_authenticate_basic_user (request_r - - /* compare the password, possibly encrypted */ - if(strcmp(real_pw, sec->mysqlCrypted ? crypt(sent_pw,real_pw) : sent_pw)) { -- ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server, -- "user %s: password mismatch: %s", c->user, r->uri); -+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, -+ "user %s: password mismatch: %s", r->user, r->uri); - ap_note_basic_auth_failure (r); -- return AUTH_REQUIRED; -+ return HTTP_UNAUTHORIZED; - } - return OK; - } -@@ -534,10 +534,10 @@ mysql_check_auth(request_rec *r) - mysql_auth_config_rec *sec = - (mysql_auth_config_rec *)ap_get_module_config(r->per_dir_config, - &mysql_auth_module); -- char *user = r->connection->user; -+ char *user = r->user; - int method = r->method_number; - -- const array_header *reqs_arr = ap_requires(r); -+ const apr_array_header_t *reqs_arr = ap_requires(r); - require_line *reqs = reqs_arr ? (require_line *)reqs_arr->elts : NULL; - - register int x; -@@ -560,11 +560,11 @@ mysql_check_auth(request_rec *r) - if(!strcmp(want,"group")) { - /* check for list of groups from database only first time thru */ - if (!groups && !(groups = get_mysql_groups(r, user, sec))) { -- ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server, -+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, - "mysql user %s not in group table %s: %s", - user, sec->mysqlgrptable, r->uri); - ap_note_basic_auth_failure(r); -- return AUTH_REQUIRED; -+ return HTTP_UNAUTHORIZED; - } - - /* loop through list of groups specified in htaccess file */ -@@ -578,35 +578,39 @@ mysql_check_auth(request_rec *r) - ++i; - } - } -- ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server, -+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, - "mysql user %s not in right group: %s",user,r->uri); - ap_note_basic_auth_failure(r); -- return AUTH_REQUIRED; -+ return HTTP_UNAUTHORIZED; - } - } - - return DECLINED; - } - -+static void -+child_init(apr_pool_t *p, server_rec *s) -+{ -+ apr_pool_cleanup_register(p, s, -+ mod_auth_mysql_cleanup, -+ mod_auth_mysql_cleanup_child); -+} -+ -+static void -+register_hooks(apr_pool_t *p) -+{ -+ ap_hook_child_init(child_init, NULL, NULL, APR_HOOK_MIDDLE); -+ ap_hook_check_user_id(mysql_authenticate_basic_user, -+ NULL, NULL, APR_HOOK_MIDDLE); -+ ap_hook_auth_checker(mysql_check_auth, NULL, NULL, APR_HOOK_MIDDLE); -+} - --module mysql_auth_module = { -- STANDARD_MODULE_STUFF, -- NULL, /* initializer */ -+module AP_MODULE_DECLARE_DATA mysql_auth_module = { -+ STANDARD20_MODULE_STUFF, - create_mysql_auth_dir_config, /* dir config creater */ - NULL, /* dir merger --- default is to override */ - NULL, /* server config */ - NULL, /* merge server config */ - mysql_auth_cmds, /* command table */ -- NULL, /* handlers */ -- NULL, /* filename translation */ -- mysql_authenticate_basic_user, /* check_user_id */ -- mysql_check_auth, /* check auth */ -- NULL, /* check access */ -- NULL, /* type_checker */ -- NULL, /* fixups */ -- NULL, /* logger */ -- NULL, /* header parser */ -- NULL, /* child_init */ -- child_exit, /* child_exit */ -- NULL /* post read-request */ -+ register_hooks /* register hooks */ - }; diff --git a/www/ap2-auth-ntlm/DESCR b/www/ap2-auth-ntlm/DESCR deleted file mode 100644 index caf744bde0a..00000000000 --- a/www/ap2-auth-ntlm/DESCR +++ /dev/null @@ -1,8 +0,0 @@ -NTLM is an authentication protocol used by Microsoft Internet Informations -Server(tm) and Microsoft Internet Explorer(tm). While it is not really -secure, it offers background authentication (the workstation logon -credentials of users are passed through to the web server). This feature is -widely used in intranets based on these Microsoft products. - -This module is implementing NTLM authentication for Apache on Unix -platforms. It is available free of charges under the BSD License. diff --git a/www/ap2-auth-ntlm/MESSAGE b/www/ap2-auth-ntlm/MESSAGE deleted file mode 100644 index 4837f7aab0b..00000000000 --- a/www/ap2-auth-ntlm/MESSAGE +++ /dev/null @@ -1,13 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.1.1.1 2008/10/17 19:24:10 sborrill Exp $ - -In order to use this module in your Apache installation, you need to -add the following to your httpd.conf file: - - LoadModule ${MODULE_NAME} lib/httpd/mod_ntlm.so - -An example httpd.conf fragment can be found in: - - ${EGDIR}/ntlm.conf - -=========================================================================== diff --git a/www/ap2-auth-ntlm/Makefile b/www/ap2-auth-ntlm/Makefile deleted file mode 100644 index 4affec56241..00000000000 --- a/www/ap2-auth-ntlm/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# $NetBSD: Makefile,v 1.7 2014/06/11 12:57:23 joerg Exp $ -# - -DISTNAME= ntlm2 -PKGNAME= ${APACHE_PKG_PREFIX}-auth-ntlm-${DISTVERS} -CATEGORIES= www -MASTER_SITES= http://www.jamiekerwick.co.uk/modntlm/ - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://modntlm.sourceforge.net/ -COMMENT= Apache module for NTLM authentication - -PKG_APACHE_ACCEPTED= apache22 - -APACHE_MODULE_NAME= mod_ntlm.${MODULE_EXT} - -WRKSRC= ${WRKDIR} - -DISTVERS= 0.2 -MODULE_EXT= la - -MESSAGE_SUBST+= MODULE_NAME=ntlm_module -MESSAGE_SUBST+= EGDIR=${EGDIR} - -EGDIR= ${PREFIX}/share/examples/mod_ntlm - -INSTALLATION_DIRS+= ${EGDIR} - -post-install: - ${INSTALL_DATA} ${WRKSRC}/ntlm.conf ${DESTDIR}${EGDIR} - -.include "../../mk/apache.module.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/www/ap2-auth-ntlm/PLIST b/www/ap2-auth-ntlm/PLIST deleted file mode 100644 index 31dff3c3e2f..00000000000 --- a/www/ap2-auth-ntlm/PLIST +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 22:00:16 joerg Exp $ -lib/httpd/mod_ntlm.so -share/examples/mod_ntlm/ntlm.conf diff --git a/www/ap2-auth-ntlm/distinfo b/www/ap2-auth-ntlm/distinfo deleted file mode 100644 index e121187bd2e..00000000000 --- a/www/ap2-auth-ntlm/distinfo +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: distinfo,v 1.4 2015/11/04 02:46:48 agc Exp $ - -SHA1 (ntlm2.tar.gz) = 02deae9b83a73410bab989245335d684f1288f5e -RMD160 (ntlm2.tar.gz) = 5607b2e2b6420aa7534af0bb38fbf7a877ca616d -SHA512 (ntlm2.tar.gz) = 39d9b9f00432ec46218e7713bddc81504d0c5694e76ff978c3b0d8a1998c7f88a14ac0ca7a814f0c2750980945d9ca6a0bca502dae2c7a7e325a793ba3efef30 -Size (ntlm2.tar.gz) = 39380 bytes -SHA1 (patch-mod_ntlm.c) = a5503e6bbcdaf9fe40522f44f78c20fd4160b60c -SHA1 (patch-ntlmssp.inc.c) = 10dd76d55ebed06c292577b7837ccd719df6652f -SHA1 (patch-smbencrypt.inc.c) = 55c74559a05f9d7dfab6df006dea74fdcb1fe49a -SHA1 (patch-smblib.inc.c) = 90c4c795a7d4619650e565d3055cf2a0447b7d70 diff --git a/www/ap2-auth-ntlm/patches/patch-mod_ntlm.c b/www/ap2-auth-ntlm/patches/patch-mod_ntlm.c deleted file mode 100644 index f549027937f..00000000000 --- a/www/ap2-auth-ntlm/patches/patch-mod_ntlm.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mod_ntlm.c,v 1.1.1.1 2008/10/17 19:24:10 sborrill Exp $ -Add Apache 2.2 compatibility ---- mod_ntlm.c.orig 2008-10-17 20:18:13.000000000 +0100 -+++ mod_ntlm.c 2008-10-17 20:18:13.000000000 +0100 -@@ -671,7 +671,7 @@ - return NULL; - } - -- apr_pool_sub_make(&sp,p,NULL); -+ apr_pool_create_ex(&sp,p,NULL,NULL); - - while (!(ap_cfg_getline(l, MAX_STRING_LEN, f))) { - if ((l[0] == '#') || (!l[0])) diff --git a/www/ap2-auth-ntlm/patches/patch-ntlmssp.inc.c b/www/ap2-auth-ntlm/patches/patch-ntlmssp.inc.c deleted file mode 100644 index c519c300cfe..00000000000 --- a/www/ap2-auth-ntlm/patches/patch-ntlmssp.inc.c +++ /dev/null @@ -1,7 +0,0 @@ -$NetBSD: patch-ntlmssp.inc.c,v 1.2 2009/02/09 18:26:46 joerg Exp $ - ---- ntlmssp.inc.c.orig 2004-02-19 15:21:06.000000000 +0000 -+++ ntlmssp.inc.c 2008-10-17 19:33:51.000000000 +0100 -@@ -1,1 +1,2 @@ -+#include "httpd/httpd.h" - /* diff --git a/www/ap2-auth-ntlm/patches/patch-smbencrypt.inc.c b/www/ap2-auth-ntlm/patches/patch-smbencrypt.inc.c deleted file mode 100644 index e3a36545dc5..00000000000 --- a/www/ap2-auth-ntlm/patches/patch-smbencrypt.inc.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-smbencrypt.inc.c,v 1.1.1.1 2008/10/17 19:24:10 sborrill Exp $ ---- smbval/smbencrypt.inc.c.orig 2003-06-05 20:21:26.000000000 +0100 -+++ smbval/smbencrypt.inc.c 2008-10-17 17:47:37.000000000 +0100 -@@ -19,7 +19,9 @@ - #include <arpa/inet.h> - #include <dirent.h> - #include <string.h> -+#ifndef __NetBSD__ - #include <sys/vfs.h> -+#endif - #include <netinet/in.h> - - #include "smblib-priv.h" diff --git a/www/ap2-auth-ntlm/patches/patch-smblib.inc.c b/www/ap2-auth-ntlm/patches/patch-smblib.inc.c deleted file mode 100644 index f1e7b389a1b..00000000000 --- a/www/ap2-auth-ntlm/patches/patch-smblib.inc.c +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-smblib.inc.c,v 1.1.1.1 2008/10/17 19:24:10 sborrill Exp $ ---- smbval/smblib.inc.c.orig 2004-02-19 15:24:46.000000000 +0000 -+++ smbval/smblib.inc.c 2008-10-17 17:50:39.000000000 +0100 -@@ -22,8 +22,8 @@ - #include <stdio.h> - #include <malloc.h> - --static int SMBlib_errno; --static int SMBlib_SMB_Error; -+int SMBlib_errno; -+int SMBlib_SMB_Error; - #define SMBLIB_ERRNO - #define uchar unsigned char - #include "smblib-priv.h" -@@ -33,7 +33,7 @@ - - #include <signal.h> - --static SMB_State_Types SMBlib_State; -+SMB_State_Types SMBlib_State; - - /* Initialize the SMBlib package */ - static int diff --git a/www/ap2-auth-pgsql/DESCR b/www/ap2-auth-pgsql/DESCR deleted file mode 100644 index 50f3b87a96f..00000000000 --- a/www/ap2-auth-pgsql/DESCR +++ /dev/null @@ -1,4 +0,0 @@ -This add-on module allows the apache web server to use a PostgreSQL -database for user and/or group authentication. For large user lists this -can offer a significate speed up over apache's standard flat file -format. diff --git a/www/ap2-auth-pgsql/Makefile b/www/ap2-auth-pgsql/Makefile deleted file mode 100644 index 27937516e15..00000000000 --- a/www/ap2-auth-pgsql/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# $NetBSD: Makefile,v 1.27 2016/10/09 21:42:03 wiz Exp $ - -DISTNAME= mod_auth_pgsql-2.0.3 -PKGNAME= ${APACHE_PKG_PREFIX}-auth-pgsql-2.0.3 -PKGREVISION= 9 -CATEGORIES= www databases -MASTER_SITES= http://www.giuseppetanzilli.it/mod_auth_pgsql2/dist/ - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.giuseppetanzilli.it/mod_auth_pgsql2/ -COMMENT= Allows users to use PostgreSQL databases for user authentication - -CONFLICTS= ap-auth-postgresql-* - -APACHE_MODULE= yes -APACHE_MODULE_NAME= mod_auth_pgsql.la - -PKG_APACHE_ACCEPTED= apache22 - -CPPFLAGS+= -I${PGSQL_PREFIX}/include/postgresql -LDFLAGS+= -L${LOCALBASE}/lib \ - ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib -lpq - -.include "../../mk/apache.module.mk" -.include "../../mk/pgsql.buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/www/ap2-auth-pgsql/PLIST b/www/ap2-auth-pgsql/PLIST deleted file mode 100644 index 2466394adda..00000000000 --- a/www/ap2-auth-pgsql/PLIST +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2006/10/07 21:02:43 reed Exp $ -lib/httpd/mod_auth_pgsql.so -@unexec echo "===> If you do not plan on reinstalling mod_auth_pgsql, you must manually remove"; echo "===> references to it in httpd.conf." diff --git a/www/ap2-auth-pgsql/distinfo b/www/ap2-auth-pgsql/distinfo deleted file mode 100644 index a060ea2ec9a..00000000000 --- a/www/ap2-auth-pgsql/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.4 2015/11/04 02:46:48 agc Exp $ - -SHA1 (mod_auth_pgsql-2.0.3.tar.gz) = 1c9d04373b3196b8a4cf64527a824a8c29b38582 -RMD160 (mod_auth_pgsql-2.0.3.tar.gz) = f77194dcb63c57c75413495ce316d392f6e74a2f -SHA512 (mod_auth_pgsql-2.0.3.tar.gz) = 9ec9d9c1075d37e62e98f0f5519147d9fb2042ef7e149ff50461f3966d548afceefc330f4a1c3bd8fc64b5e93ed3e85508571a5b1b9832974c84267737e89cb0 -Size (mod_auth_pgsql-2.0.3.tar.gz) = 15474 bytes diff --git a/www/ap2-auth-radius/DESCR b/www/ap2-auth-radius/DESCR deleted file mode 100644 index 024269184f1..00000000000 --- a/www/ap2-auth-radius/DESCR +++ /dev/null @@ -1,4 +0,0 @@ -This is the Apache 2.x RADIUS authentication module. It allows any Apache 2.x -web-server to become a RADIUS client for authentication and accounting -requests. You will, however, need to supply your own RADIUS server to -perform the actual authentication. diff --git a/www/ap2-auth-radius/MESSAGE b/www/ap2-auth-radius/MESSAGE deleted file mode 100644 index f91bb0a6dc1..00000000000 --- a/www/ap2-auth-radius/MESSAGE +++ /dev/null @@ -1,18 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.1.1.1 2006/08/09 17:45:56 adrianp Exp $ - -In order to use this module in your Apache installation, you need to -add the following to your httpd.conf file: - - LoadModule radius_auth_module lib/httpd/mod_auth_radius.so - -NOTE mod_auth_radius by default will try and communicate with a radius -server using port 1645. If you are authenticating against a freeradius -server you will need to manually specify a different port. e.g. - - AddRadiusAuth localhost:1812 testing123 - -Would get mod_auth_radius taking to a default freeradius server on -localhost. - -=========================================================================== diff --git a/www/ap2-auth-radius/Makefile b/www/ap2-auth-radius/Makefile deleted file mode 100644 index f2aea4ee8ff..00000000000 --- a/www/ap2-auth-radius/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# $NetBSD: Makefile,v 1.16 2016/03/05 11:29:34 jperkin Exp $ - -DISTNAME= mod_auth_radius -PKGNAME= ${APACHE_PKG_PREFIX}-auth-radius-1.5.7 -PKGREVISION= 6 -CATEGORIES= www databases -MASTER_SITES= ftp://ftp.freeradius.org/pub/radius/ - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.freeradius.org/mod_auth_radius/ -COMMENT= Module to allow apache2 authentication against a RADIUS server - -WRKSRC= ${WRKDIR}/${DISTNAME}-1.5.7 -EXTRACT_SUFX= .tar -NO_CONFIGURE= YES -APACHE_MODULE= YES -APACHE_MODULE_NAME= mod_auth_radius.la -APACHE_MODULE_SRC= mod_auth_radius.c -USE_LIBTOOL= YES - -PKG_APACHE_ACCEPTED= apache22 - -post-extract: - ${MV} ${WRKSRC}/mod_auth_radius.c ${WRKSRC}/mod_auth_radius-1.0.c - ${MV} ${WRKSRC}/mod_auth_radius-2.0.c ${WRKSRC}/mod_auth_radius.c - -INSTALLATION_DIRS+= share/doc/mod_auth_radius share/examples/mod_auth_radius - -post-install: - ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/mod_auth_radius - ${INSTALL_DATA} ${WRKSRC}/index.html ${DESTDIR}${PREFIX}/share/doc/mod_auth_radius - - ${INSTALL_DATA} ${WRKSRC}/htaccess \ - ${DESTDIR}${PREFIX}/share/examples/mod_auth_radius - ${INSTALL_DATA} ${WRKSRC}/httpd.conf \ - ${DESTDIR}${PREFIX}/share/examples/mod_auth_radius - -.include "../../security/openssl/buildlink3.mk" -.include "../../mk/apache.module.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/www/ap2-auth-radius/PLIST b/www/ap2-auth-radius/PLIST deleted file mode 100644 index 12c48dcc17b..00000000000 --- a/www/ap2-auth-radius/PLIST +++ /dev/null @@ -1,6 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 22:00:16 joerg Exp $ -lib/httpd/mod_auth_radius.so -share/doc/mod_auth_radius/README -share/doc/mod_auth_radius/index.html -share/examples/mod_auth_radius/htaccess -share/examples/mod_auth_radius/httpd.conf diff --git a/www/ap2-auth-radius/distinfo b/www/ap2-auth-radius/distinfo deleted file mode 100644 index afbf40641c4..00000000000 --- a/www/ap2-auth-radius/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.2 2015/11/04 02:46:48 agc Exp $ - -SHA1 (mod_auth_radius.tar) = 4f9fdcd675ec0d0247d964883ad16a2593367e06 -RMD160 (mod_auth_radius.tar) = 5b9408d063c9d27a9d2918c8c4feb173b81ff1be -SHA512 (mod_auth_radius.tar) = c12fff695250e1e7998c8313acfe0d4c34bd9221c02bb2a4d8e8df09c6e4e806feeb1bc0365e06ca803b55bdd662f51dc665292e82cc50682e5e7b9919b82882 -Size (mod_auth_radius.tar) = 112640 bytes diff --git a/www/ap2-auth-xradius/DESCR b/www/ap2-auth-xradius/DESCR deleted file mode 100644 index d47e9aa69f0..00000000000 --- a/www/ap2-auth-xradius/DESCR +++ /dev/null @@ -1,10 +0,0 @@ -mod_auth_xradius provides high performance authentication against -RFC 2865 RADIUS Servers. - -Features: -* Supports popular RADIUS Servers including OpenRADIUS, FreeRADIUS and - commercial servers. -* Distributed Authentication Cache using apr_memcache. -* Local Authentication Cache using DBM. -* Uses standard HTTP Basic Authentication, unlike mod_auth_radius which uses - cookies for sessions. diff --git a/www/ap2-auth-xradius/MESSAGE b/www/ap2-auth-xradius/MESSAGE deleted file mode 100644 index a9124fdf1ab..00000000000 --- a/www/ap2-auth-xradius/MESSAGE +++ /dev/null @@ -1,13 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.1.1.1 2006/08/13 17:34:16 adrianp Exp $ - -In order to use this module in your Apache installation, you need to -add the following to your httpd.conf file: - - LoadModule auth_xradius_module lib/httpd/mod_auth_xradius.so - -All documentation is available from: - - http://www.outoforder.cc/projects/apache/mod_auth_xradius/docs/ - -=========================================================================== diff --git a/www/ap2-auth-xradius/Makefile b/www/ap2-auth-xradius/Makefile deleted file mode 100644 index d485c4e439b..00000000000 --- a/www/ap2-auth-xradius/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# $NetBSD: Makefile,v 1.9 2014/06/10 15:22:17 joerg Exp $ - -DISTNAME= mod_auth_xradius-0.4.6 -PKGNAME= ${APACHE_PKG_PREFIX}-auth-xradius-0.4.6 -CATEGORIES= www databases -MASTER_SITES= http://www.outoforder.cc/downloads/mod_auth_xradius/ -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.outoforder.cc/projects/apache/mod_auth_xradius/ -COMMENT= Module to allow apache2 authentication against a RADIUS server - -GNU_CONFIGURE= YES -USE_LIBTOOL= YES - -PKG_APACHE_ACCEPTED= apache22 -.include "../../mk/apache.mk" - -CONFIGURE_ARGS+= --with-apxs=${APXS} - -.include "../../mk/bsd.pkg.mk" diff --git a/www/ap2-auth-xradius/PLIST b/www/ap2-auth-xradius/PLIST deleted file mode 100644 index d0c2299578d..00000000000 --- a/www/ap2-auth-xradius/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2006/08/13 17:34:16 adrianp Exp $ -lib/httpd/mod_auth_xradius.so diff --git a/www/ap2-auth-xradius/distinfo b/www/ap2-auth-xradius/distinfo deleted file mode 100644 index ff64df3f70f..00000000000 --- a/www/ap2-auth-xradius/distinfo +++ /dev/null @@ -1,9 +0,0 @@ -$NetBSD: distinfo,v 1.4 2015/11/04 02:46:48 agc Exp $ - -SHA1 (mod_auth_xradius-0.4.6.tar.bz2) = f05f5d9bb9ad6fb76c026679cd5fb00a9c9e48dd -RMD160 (mod_auth_xradius-0.4.6.tar.bz2) = 82c34c82f692c6f5a321ad20103eb22b01da8d4a -SHA512 (mod_auth_xradius-0.4.6.tar.bz2) = 7edb26f988f9842825bec1b04f5127816bd53f76d2284d79d87afef2b5d6e9fa8cb8156c3f5543aeb9b013f65295fa70098ade603f00ce6e90b3b0c3e8c41b6a -Size (mod_auth_xradius-0.4.6.tar.bz2) = 180591 bytes -SHA1 (patch-aa) = 6cf2d151392eee1fce38d96b345e8fcd720f5ad9 -SHA1 (patch-ab) = 52bc4f6d0ae255a4681fd599ca17af2fdb0664d6 -SHA1 (patch-ac) = 402c963e36e71a35fbe35638c5ce00746a2634df diff --git a/www/ap2-auth-xradius/patches/patch-aa b/www/ap2-auth-xradius/patches/patch-aa deleted file mode 100644 index 821ed6577e9..00000000000 --- a/www/ap2-auth-xradius/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2006/08/13 17:34:16 adrianp Exp $ - ---- src/xradius_cache.c.orig 2006-08-11 14:42:03.000000000 +0100 -+++ src/xradius_cache.c 2006-08-11 14:42:30.000000000 +0100 -@@ -204,7 +204,7 @@ - status = dbmval.dptr+sizeof(apr_time_t); - epass = dbmval.dptr+sizeof(apr_time_t)+sizeof(char); - -- ap_log_error(APLOG_MARK, APLOG_NOTICE, rv, -+ ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, - r->server, - "xradius: fetched '%s':'%s'", - password, epass); diff --git a/www/ap2-auth-xradius/patches/patch-ab b/www/ap2-auth-xradius/patches/patch-ab deleted file mode 100644 index 19352c18559..00000000000 --- a/www/ap2-auth-xradius/patches/patch-ab +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2007/11/30 20:46:19 rillig Exp $ - -Recent NetBSD versions also have strsep. - ---- libradius/radlib.c.orig 2005-07-05 18:35:32.000000000 +0000 -+++ libradius/radlib.c 2007-11-30 20:43:58.000000000 +0000 -@@ -60,7 +60,8 @@ static int put_raw_attr(struct xrad_han - static int split(char *, char *[], int, char *, size_t); - - #if !defined(__FreeBSD__) && !defined(__linux__) --static char *strsep(char **stringp, const char *delim) -+static char *my_strsep(char **stringp, const char *delim) -+#define strsep(a,b) my_strsep((a),(b)) - { - char *s; - const char *spanp; diff --git a/www/ap2-auth-xradius/patches/patch-ac b/www/ap2-auth-xradius/patches/patch-ac deleted file mode 100644 index c7443189837..00000000000 --- a/www/ap2-auth-xradius/patches/patch-ac +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2009/02/20 23:21:53 adrianp Exp $ - ---- libradius/radlib.h.orig 2005-04-11 14:36:34.000000000 -0700 -+++ libradius/radlib.h -@@ -33,6 +33,10 @@ - #include <sys/types.h> - #include <netinet/in.h> - -+#ifndef u_int32_t -+#define u_int32_t uint32_t -+#endif -+ - /* Limits */ - #define RAD_MAX_ATTR_LEN 253 - diff --git a/www/ap2-authn-otp/DESCR b/www/ap2-authn-otp/DESCR deleted file mode 100644 index e027f693a78..00000000000 --- a/www/ap2-authn-otp/DESCR +++ /dev/null @@ -1,5 +0,0 @@ -mod_authn_otp is an Apache web server module for two-factor authentication -using one-time passwords (OTP) generated via the HOTP/OATH algorithm -defined in RFC 4226. This creates a simple way to protect a web site with -one-time passwords, using any RFC 4226-compliant hardware or software -token device. mod_authn_otp also supports the Mobile-OTP algorithm. diff --git a/www/ap2-authn-otp/MESSAGE b/www/ap2-authn-otp/MESSAGE deleted file mode 100644 index 98c805690f2..00000000000 --- a/www/ap2-authn-otp/MESSAGE +++ /dev/null @@ -1,9 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.1.1.1 2011/04/21 09:49:44 pettai Exp $ - -In order to use this module in your Apache installation, you need to -add the following to your httpd.conf file: - - LoadModule ${MODULE_NAME} lib/httpd/mod_authn_otp.so - -=========================================================================== diff --git a/www/ap2-authn-otp/Makefile b/www/ap2-authn-otp/Makefile deleted file mode 100644 index 2bb32306265..00000000000 --- a/www/ap2-authn-otp/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# $NetBSD: Makefile,v 1.10 2017/08/01 17:40:17 wiz Exp $ - -DISTNAME= mod_authn_otp-${DISTVERS} -PKGNAME= ${APACHE_PKG_PREFIX}-authn-otp-${DISTVERS} -PKGREVISION= 3 -CATEGORIES= www -#MASTER_SITES= http://mod-authn-otp.googlecode.com/files/ -LICENSE= apache-2.0 - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= https://github.com/archiecobbs/mod-authn-otp -COMMENT= Apache module for one-time password authentication - -PKG_APACHE_ACCEPTED= apache22 - -APACHE_MODULE_NAME= mod_authn_otp.${MODULE_EXT} - -DISTVERS= 1.1.4 -MODULE_EXT= la -MESSAGE_SUBST+= MODULE_NAME=authn_otp_module - -.include "../../mk/apache.module.mk" -.include "../../security/openssl/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/www/ap2-authn-otp/PLIST b/www/ap2-authn-otp/PLIST deleted file mode 100644 index 83e25e2db0c..00000000000 --- a/www/ap2-authn-otp/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2011/04/21 09:49:44 pettai Exp $ -lib/httpd/mod_authn_otp.so diff --git a/www/ap2-authn-otp/distinfo b/www/ap2-authn-otp/distinfo deleted file mode 100644 index 5bb272e2671..00000000000 --- a/www/ap2-authn-otp/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.3 2015/11/04 02:46:48 agc Exp $ - -SHA1 (mod_authn_otp-1.1.4.tar.gz) = cc1e3bebd3a2bf66fea6f4bf5e609e8bdc822040 -RMD160 (mod_authn_otp-1.1.4.tar.gz) = d1082f45fc94f042fd6b883152a5739b5a354d78 -SHA512 (mod_authn_otp-1.1.4.tar.gz) = 5f745173dc0bfd312948e1d32542897c9ff0d6f0920aea58383ba4eb3d7229dd57f911755b4cfe2895c8852cf0f39c13c212f5fe643379a66b38b12a2876abcd -Size (mod_authn_otp-1.1.4.tar.gz) = 94911 bytes diff --git a/www/ap2-bw/DESCR b/www/ap2-bw/DESCR deleted file mode 100644 index e586e2cf135..00000000000 --- a/www/ap2-bw/DESCR +++ /dev/null @@ -1,5 +0,0 @@ -bw_mod is an Apache 2 module to limit bandwidth consumed by browsers, -based in concept on the widely used Apache 1 "mod_bandwidth". - -[The package maintainer has elected to use the Apache 2.0 license for -binary distributions of this package, as allowed by the software author.] diff --git a/www/ap2-bw/Makefile b/www/ap2-bw/Makefile deleted file mode 100644 index c846a2652cd..00000000000 --- a/www/ap2-bw/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# $NetBSD: Makefile,v 1.12 2014/06/11 12:57:23 joerg Exp $ -# - -DISTNAME= bw_mod-0.6 -PKGNAME= ${APACHE_PKG_PREFIX}-bw-${DISTNAME:S/bw_mod-//} -PKGREVISION= 2 -CATEGORIES= www -MASTER_SITES= http://ivn.cl/apache/ -EXTRACT_SUFX= .tgz - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://ivn.cl/apache/ -COMMENT= Class-based bandwidth limiting module for Apache 2 - -APACHE_MODULE= # defined -INSTALLATION_DIRS= share/doc - -PKG_APACHE_ACCEPTED= apache22 - -APACHE_MODULE_NAME= mod_bw.la - -INSTALLATION_DIRS+= share/doc - -post-install: - ${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.txt ${DESTDIR}${PREFIX}/share/doc/apache_mod_bw.txt - -.include "../../mk/apache.module.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/www/ap2-bw/PLIST b/www/ap2-bw/PLIST deleted file mode 100644 index 2d894415715..00000000000 --- a/www/ap2-bw/PLIST +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2005/05/10 17:00:39 tv Exp $ -lib/httpd/mod_bw.so -share/doc/apache_mod_bw.txt diff --git a/www/ap2-bw/distinfo b/www/ap2-bw/distinfo deleted file mode 100644 index 479d89f9516..00000000000 --- a/www/ap2-bw/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.2 2015/11/04 02:46:48 agc Exp $ - -SHA1 (bw_mod-0.6.tgz) = 97827dc13daa2f04d3d28e267463a3f36e1acdbd -RMD160 (bw_mod-0.6.tgz) = bda6bad38850cf36c942adc041ed209617fe3922 -SHA512 (bw_mod-0.6.tgz) = ad1ee725fc4ce323faf686c715d7b7b8a3298ed535c79d4035f9bd9b119413912aea953df5b6c0030ff34c43f34eeae03a8b796f8ed676477c3e9e77d92cbb83 -Size (bw_mod-0.6.tgz) = 50298 bytes diff --git a/www/ap2-cband/DESCR b/www/ap2-cband/DESCR deleted file mode 100644 index f3fff82fcf2..00000000000 --- a/www/ap2-cband/DESCR +++ /dev/null @@ -1,8 +0,0 @@ -mod_cband - A per-user, per-virtualhost and per-destination bandwidth -limiter for the Apache HTTP Server Version 2 - -mod_cband is an Apache 2 module provided to solve the problem of limiting -users' and virtualhosts' bandwidth usage. The current versions can set -virtualhosts' and users' bandwidth quotas, maximal download speed (like in -mod_bandwidth), requests-per-second speed and the maximal number of -simultanous IP connections (like in mod_limitipconn). diff --git a/www/ap2-cband/MESSAGE b/www/ap2-cband/MESSAGE deleted file mode 100644 index 3a794bf7b55..00000000000 --- a/www/ap2-cband/MESSAGE +++ /dev/null @@ -1,9 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.1.1.1 2009/11/10 10:44:57 sborrill Exp $ - -In order to use this module in your Apache 2.x installation, you need to -add the following to your httpd.conf file: - - LoadModule cband_module lib/httpd/mod_cband.so - -=========================================================================== diff --git a/www/ap2-cband/Makefile b/www/ap2-cband/Makefile deleted file mode 100644 index 73e29b16714..00000000000 --- a/www/ap2-cband/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# $NetBSD: Makefile,v 1.7 2017/08/01 17:40:17 wiz Exp $ -# - -DISTNAME= mod-cband-0.9.7.5 -PKGNAME= ${APACHE_PKG_PREFIX}-cband-${DISTNAME:S/mod-cband-//} -CATEGORIES= www -MASTER_SITES= http://cband.linux.pl/download/ -EXTRACT_SUFX= .tgz - -MAINTAINER= pkgsrc-users@NetBSD.org -#HOMEPAGE= http://codee.pl/cband.html -COMMENT= Bandwidth and connection limiting module for Apache 2 -LICENSE= gnu-gpl-v2 - -APACHE_MODULE_NAME= mod_cband -DOC_DIR= ${PREFIX}/share/doc/${APACHE_MODULE_NAME} - -APACHE_MODULE= yes -PKG_APACHE_ACCEPTED= apache22 - -USE_LIBTOOL= yes -HAS_CONFIGURE= yes -BUILD_TARGET= - -INSTALLATION_DIRS+= lib/httpd share/doc/${APACHE_MODULE_NAME} - -CONFIGURE_ENV+= APXS=${APXS} - -do-install: - cd ${WRKSRC}/src && \ - libexecdir=`${APXS} -q LIBEXECDIR` && \ - ${APXS} -i -S LIBEXECDIR=${DESTDIR}"$${libexecdir}" \ - -n ${APACHE_MODULE_NAME} -i ${APACHE_MODULE_NAME}.la - ${INSTALL_DATA} ${WRKSRC}/doc/documentation.txt \ - ${DESTDIR}${DOC_DIR}/documentation.txt - ${INSTALL_DATA} ${WRKSRC}/doc/faq.txt ${DESTDIR}${DOC_DIR}/faq.txt - -.include "../../mk/apache.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/www/ap2-cband/PLIST b/www/ap2-cband/PLIST deleted file mode 100644 index 3d0608b3a3d..00000000000 --- a/www/ap2-cband/PLIST +++ /dev/null @@ -1,4 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2009/11/10 10:44:57 sborrill Exp $ -lib/httpd/mod_cband.so -share/doc/mod_cband/documentation.txt -share/doc/mod_cband/faq.txt diff --git a/www/ap2-cband/distinfo b/www/ap2-cband/distinfo deleted file mode 100644 index 80794d53204..00000000000 --- a/www/ap2-cband/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.2 2015/11/04 02:46:48 agc Exp $ - -SHA1 (mod-cband-0.9.7.5.tgz) = 316ba3068fea6b58c0cbd173b1f58df882643728 -RMD160 (mod-cband-0.9.7.5.tgz) = 19ea621a1f46878dd9178dd2186479ce2fb9a922 -SHA512 (mod-cband-0.9.7.5.tgz) = 71b6b9946c24a7f424746c8f9add721ed1a14681b97a3d41115fbc228b83dba7068089f48d8acc41b108117f4abe3f0b55a77af0faefd0c84975e7003607714a -Size (mod-cband-0.9.7.5.tgz) = 70713 bytes diff --git a/www/ap2-encoding/Makefile b/www/ap2-encoding/Makefile index 39b3f2f3935..393ef393a8a 100644 --- a/www/ap2-encoding/Makefile +++ b/www/ap2-encoding/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2016/08/30 12:34:39 manu Exp $ +# $NetBSD: Makefile,v 1.2 2018/01/01 10:23:07 wiz Exp $ DISTNAME= mod_encoding-20021209 PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//} @@ -10,8 +10,6 @@ HOMEPAGE= http://webdav.todo.gr.jp/ COMMENT= Non-ascii filename interoperability #LICENSE= # Pending change from Internet Initiative Japan, Inc. -PKG_APACHE_ACCEPTED= apache22 apache24 - APACHE_MODULE_NAME= ${DISTNAME:C/-.*//}.la GNU_CONFIGURE= yes diff --git a/www/ap2-fcgid/Makefile b/www/ap2-fcgid/Makefile index 2531656cb53..bf14b969828 100644 --- a/www/ap2-fcgid/Makefile +++ b/www/ap2-fcgid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2014/06/10 15:22:17 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2018/01/01 10:23:07 wiz Exp $ DISTNAME= mod_fcgid-2.3.9 PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//} @@ -10,7 +10,6 @@ HOMEPAGE= http://httpd.apache.org/mod_fcgid/ COMMENT= High performance alternative to mod_cgi or mod_cgid LICENSE= apache-2.0 -PKG_APACHE_ACCEPTED= apache22 apache24 APACHE_MODULE= YES USE_LIBTOOL= YES diff --git a/www/ap2-jk/Makefile b/www/ap2-jk/Makefile index a1e5f78cf21..9c87e5669b1 100644 --- a/www/ap2-jk/Makefile +++ b/www/ap2-jk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2015/02/28 23:47:25 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2018/01/01 10:23:07 wiz Exp $ DISTNAME= tomcat-connectors-${JK_VERSION}-src PKGNAME= ${APACHE_PKG_PREFIX}-jk-${JK_VERSION} @@ -9,15 +9,13 @@ MASTER_SITES= ${MASTER_SITE_APACHE:=tomcat/tomcat-connectors/jk/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://tomcat.apache.org/connectors-doc/ COMMENT= Apache connector for accessing Jakarta Tomcat -LICENSE= apache-2.0 +LICENSE= apache-2.0 CONFLICTS= ap-jk-[0-9]* MAKE_PARAMS+= USE_APXS=1 MAKE_PARAMS+= WITH_APXS=${APXS} -PKG_APACHE_ACCEPTED= apache22 apache24 - INSTALLATION_DIRS+= lib/httpd do-install: diff --git a/www/ap2-mkdir/Makefile b/www/ap2-mkdir/Makefile index c1315e0095b..ece42790444 100644 --- a/www/ap2-mkdir/Makefile +++ b/www/ap2-mkdir/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2016/08/30 12:47:49 manu Exp $ +# $NetBSD: Makefile,v 1.2 2018/01/01 10:23:07 wiz Exp $ DISTNAME= mod_mkdir-0.3 EXTRACT_SUFX= .tgz @@ -10,8 +10,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Home directory autocreation module LICENSE= original-bsd -PKG_APACHE_ACCEPTED= apache22 apache24 - APACHE_MODULE_NAME= ${DISTNAME:C/-.*//}.la DOC_DIR= share/doc/${DISTNAME:C/-.*//} diff --git a/www/ap2-perl/Makefile b/www/ap2-perl/Makefile index 2c3fdab1d03..b934a91bc48 100644 --- a/www/ap2-perl/Makefile +++ b/www/ap2-perl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2017/09/22 09:59:30 maya Exp $ +# $NetBSD: Makefile,v 1.55 2018/01/01 10:23:07 wiz Exp $ DISTNAME= mod_perl-2.0.10 PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//} @@ -13,8 +13,6 @@ LICENSE= apache-2.0 CONFLICTS= ap-perl-[0-9]* p5-Apache-Reload-[0-9]* p5-Apache-Test-[0-9]* -PKG_APACHE_ACCEPTED= apache22 apache24 - APACHE_MODULE= yes PERL5_PACKLIST= auto/mod_perl2/.packlist diff --git a/www/ap2-python/Makefile b/www/ap2-python/Makefile index 3cfd4cdf5a1..44347681c14 100644 --- a/www/ap2-python/Makefile +++ b/www/ap2-python/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2014/07/20 03:07:05 obache Exp $ +# $NetBSD: Makefile,v 1.35 2018/01/01 10:23:07 wiz Exp $ DISTNAME= mod_python-3.5.0 PKGNAME= ${APACHE_PKG_PREFIX}-${PYPKGPREFIX}-${DISTNAME:S/mod_//} @@ -12,8 +12,6 @@ HOMEPAGE= http://www.modpython.org/ COMMENT= Apache module that embeds the Python interpreter LICENSE= apache-2.0 -PKG_APACHE_ACCEPTED= apache22 apache24 - MAKE_JOBS_SAFE= no APACHE_MODULE= yes diff --git a/www/ap2-subversion/Makefile b/www/ap2-subversion/Makefile index 6f259626fb7..3bd90e52309 100644 --- a/www/ap2-subversion/Makefile +++ b/www/ap2-subversion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.81 2017/11/30 16:45:40 adam Exp $ +# $NetBSD: Makefile,v 1.82 2018/01/01 10:23:07 wiz Exp $ PKGNAME= ${APACHE_PKG_PREFIX}-subversion-${SVNVER} PKGREVISION= 2 @@ -21,8 +21,6 @@ post-patch: ${RM} ${WRKSRC}/build-outputs.mk ${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC}/build-outputs.mk -PKG_APACHE_ACCEPTED= apache22 apache24 - .include "../../devel/subversion-base/buildlink3.mk" .include "../../mk/apache.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap2-suphp/DESCR b/www/ap2-suphp/DESCR deleted file mode 100644 index aa296ea062f..00000000000 --- a/www/ap2-suphp/DESCR +++ /dev/null @@ -1,7 +0,0 @@ -The suPHP Apache module together with suPHP itself provides an easy way -to run PHP scripts with different users on the same server. - -It provides security, because the PHP scripts are not run with the -rights of the webserver's user. In addition to that you probably won't -have to use PHP's "safe mode", which applies many restrictions on the -scripts. diff --git a/www/ap2-suphp/MESSAGE b/www/ap2-suphp/MESSAGE deleted file mode 100644 index c111086ce88..00000000000 --- a/www/ap2-suphp/MESSAGE +++ /dev/null @@ -1,8 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.1 2011/04/11 19:57:54 gls Exp $ - -The configuration syntax for suphp.conf has slightly changed with this release. -Be sure to read the documentation before upgrading, because existing -configuration files will not work without changing them. - -=========================================================================== diff --git a/www/ap2-suphp/Makefile b/www/ap2-suphp/Makefile deleted file mode 100644 index d0833c9d459..00000000000 --- a/www/ap2-suphp/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# $NetBSD: Makefile,v 1.20 2014/08/19 13:44:07 joerg Exp $ - -DISTNAME= suphp-0.7.2 -PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME} -CATEGORIES= www -MASTER_SITES= http://www.suphp.org/download/ - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.suphp.org/ -COMMENT= SuEXEC-like wrapper for PHP scripts -LICENSE= gnu-gpl-v2 - -USE_LANGUAGES= c c++ -USE_PKGLOCALEDIR= yes -USE_TOOLS+= aclocal autoconf autoheader automake lex -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -GCC_REQD+= 3.0 # the C++ code uses the .at() method -CONFIGURE_ARGS+= APXS=${APXS} -CONFIGURE_ARGS+= --with-apache-user=${APACHE_USER} -CONFIGURE_ARGS+= --with-logfile=${VARBASE}/httpd/suphp_log -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} - -PKG_USERS_VARS+= APACHE_USER -BUILD_DEFS+= VARBASE - -EGDIR= ${PREFIX}/share/examples/suphp -CONF_FILES= ${EGDIR}/suphp.conf ${PKG_SYSCONFDIR}/suphp.conf - -USE_APR= yes -PKG_APACHE_ACCEPTED= apache22 - -SUBST_CLASSES+= suphp -SUBST_STAGE.suphp= post-configure -SUBST_FILES.suphp= doc/suphp.conf-example -SUBST_SED.suphp= -e "s,wwwrun,${APACHE_USER},g" -SUBST_SED.suphp+= -e "s,/var/log/suphp.log,${VARBASE}/httpd/suphp_log,g" -SUBST_SED.suphp+= -e "s,/usr/bin/php,${PREFIX}/libexec/cgi-bin/php,g" - -# suPHP 0.7.2 is missing some configuration files -pre-configure: - set -e; cd ${WRKSRC}; \ - aclocal; autoheader; automake -a --foreign -i; autoconf - -post-install: - ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/suphp.conf-example ${DESTDIR}${EGDIR}/suphp.conf - -.include "../../mk/apache.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/www/ap2-suphp/PLIST b/www/ap2-suphp/PLIST deleted file mode 100644 index 17b8ddcedf2..00000000000 --- a/www/ap2-suphp/PLIST +++ /dev/null @@ -1,4 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2009/06/14 22:00:17 joerg Exp $ -lib/httpd/mod_suphp.so -sbin/suphp -share/examples/suphp/suphp.conf diff --git a/www/ap2-suphp/distinfo b/www/ap2-suphp/distinfo deleted file mode 100644 index e44c97597b4..00000000000 --- a/www/ap2-suphp/distinfo +++ /dev/null @@ -1,9 +0,0 @@ -$NetBSD: distinfo,v 1.9 2015/11/04 02:46:48 agc Exp $ - -SHA1 (suphp-0.7.2.tar.gz) = 2a83dcbf6dc8ede37c6556529783425aae7e4754 -RMD160 (suphp-0.7.2.tar.gz) = 8b7acea73bba36a22b81f0535ebf5bdcdd7e683a -SHA512 (suphp-0.7.2.tar.gz) = 703d79346bf8bde9dacc3db6f8e61b7283e3912fc22b97e6ac5968b2a877f0debc88ab03339ad4710419c0b8dc6a693fa90c9317733e55a84f408f9051c222ba -Size (suphp-0.7.2.tar.gz) = 343223 bytes -SHA1 (patch-src_IniSection.cpp) = 8effa733d567c6a724370e53b008e271aab23ad3 -SHA1 (patch-src_IniSection.hpp) = c97e0e71fc2041d19026bae41838018d5fb991d3 -SHA1 (patch-src_SmartPtr.hpp) = 91c20832b140d6fa49ddb2a6fa9b616ff7fc565d diff --git a/www/ap2-suphp/patches/patch-src_IniSection.cpp b/www/ap2-suphp/patches/patch-src_IniSection.cpp deleted file mode 100644 index bb910e1595e..00000000000 --- a/www/ap2-suphp/patches/patch-src_IniSection.cpp +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-src_IniSection.cpp,v 1.1 2013/05/06 15:02:13 joerg Exp $ - ---- src/IniSection.cpp.orig 2013-05-04 14:22:11.000000000 +0000 -+++ src/IniSection.cpp -@@ -36,8 +36,8 @@ void suPHP::IniSection::putValue(const s - const std::vector<std::string> suPHP::IniSection::getValues(const std::string& key) const - throw (KeyNotFoundException) { - std::vector<std::string> values; -- std::pair<std::multimap<const std::string, const std::string>::const_iterator, std::multimap<const std::string, const std::string>::const_iterator> range = this->entries.equal_range(key); -- for (std::multimap<const std::string, const std::string>::const_iterator pos = -+ std::pair<std::multimap<std::string, std::string>::const_iterator, std::multimap<std::string, std::string>::const_iterator> range = this->entries.equal_range(key); -+ for (std::multimap<std::string, std::string>::const_iterator pos = - range.first; pos != range.second; pos++) { - values.push_back(pos->second); - } -@@ -62,7 +62,7 @@ std::string suPHP::IniSection::getValue( - - const std::vector<std::string> suPHP::IniSection::getKeys() const { - std::vector<std::string> keys; -- for (std::multimap<const std::string, const std::string>::const_iterator pos = -+ for (std::multimap<std::string, std::string>::const_iterator pos = - this->entries.begin(); - pos != this->entries.end(); pos++) { - keys.push_back(pos->first); diff --git a/www/ap2-suphp/patches/patch-src_IniSection.hpp b/www/ap2-suphp/patches/patch-src_IniSection.hpp deleted file mode 100644 index 701b197616f..00000000000 --- a/www/ap2-suphp/patches/patch-src_IniSection.hpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_IniSection.hpp,v 1.1 2013/05/06 15:02:14 joerg Exp $ - ---- src/IniSection.hpp.orig 2013-05-04 14:21:17.000000000 +0000 -+++ src/IniSection.hpp -@@ -40,7 +40,7 @@ namespace suPHP { - */ - class IniSection { - private: -- std::multimap<const std::string, const std::string> entries; -+ std::multimap<std::string, std::string> entries; - void putValue(const std::string key, const std::string value); - void removeValues(const std::string& key); - diff --git a/www/ap2-suphp/patches/patch-src_SmartPtr.hpp b/www/ap2-suphp/patches/patch-src_SmartPtr.hpp deleted file mode 100644 index ce0bae544f8..00000000000 --- a/www/ap2-suphp/patches/patch-src_SmartPtr.hpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_SmartPtr.hpp,v 1.1 2011/09/21 12:54:16 adam Exp $ - -Fix C++ syntax - ---- src/SmartPtr.hpp.orig 2011-09-21 12:48:02.000000000 +0000 -+++ src/SmartPtr.hpp -@@ -150,7 +150,7 @@ namespace suPHP { - template<class T> - const SmartPtr<T>& suPHP::SmartPtr<T>::operator=( - const SmartPtr<T>& ref) { -- this.reset(ref.ptr); -+ this->reset(ref.ptr); - return *this; - } - diff --git a/www/ap2-transform/DESCR b/www/ap2-transform/DESCR deleted file mode 100644 index d6388f5d1df..00000000000 --- a/www/ap2-transform/DESCR +++ /dev/null @@ -1,3 +0,0 @@ -mod_transform is a filter module that allows Apache 2.0 to do dynamic XSL -Transformations on either static XML documents, or XML documents generated -from another Apache module or CGI program. diff --git a/www/ap2-transform/Makefile b/www/ap2-transform/Makefile deleted file mode 100644 index 7d0e6c38196..00000000000 --- a/www/ap2-transform/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# $NetBSD: Makefile,v 1.20 2014/06/10 15:22:17 joerg Exp $ -# - -DISTNAME= mod_transform-0.4.0 -PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//} -PKGREVISION= 7 -CATEGORIES= www -MASTER_SITES= http://www.outoforder.cc/downloads/mod_transform/ - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.outoforder.cc/projects/apache/mod_transform/ -COMMENT= Filter module for Apache 2.0 to do dynamic XSL transformations -LICENSE= gnu-gpl-v2 # or later - -USE_TOOLS+= pkg-config -USE_LIBTOOL= yes -GNU_CONFIGURE= yes - -PKG_APACHE_ACCEPTED= apache22 - -CONFIGURE_ARGS+= --with-apxs=${APXS:Q} - -INSTALLATION_DIRS+= lib/httpd include/httpd - -.include "../../textproc/libxslt/buildlink3.mk" -.include "../../mk/apache.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/www/ap2-transform/PLIST b/www/ap2-transform/PLIST deleted file mode 100644 index 35706292da2..00000000000 --- a/www/ap2-transform/PLIST +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/05/30 13:27:16 xtraeme Exp $ -include/httpd/mod_transform.h -lib/httpd/mod_transform.so diff --git a/www/ap2-transform/distinfo b/www/ap2-transform/distinfo deleted file mode 100644 index 3cef41bde1b..00000000000 --- a/www/ap2-transform/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -$NetBSD: distinfo,v 1.4 2015/11/04 02:46:49 agc Exp $ - -SHA1 (mod_transform-0.4.0.tar.gz) = 68b77150120783991385f9d3d9602c728f18093f -RMD160 (mod_transform-0.4.0.tar.gz) = 970a9823a1321d250c6f434a756087c02ac2a043 -SHA512 (mod_transform-0.4.0.tar.gz) = 2e25e5c9863802a5475ca6efc906a73f5c04f8914cc0be60ef09cb4b9090c1635e5da0beefff77cb04b8b4b3d57ba9d4a7c51a35e887cd6e16188bbfdb23109c -Size (mod_transform-0.4.0.tar.gz) = 202673 bytes -SHA1 (patch-src_Makefile.in) = 66b171747b6edee0a0d56c44a441ca7c627d92fa diff --git a/www/ap2-transform/patches/patch-src_Makefile.in b/www/ap2-transform/patches/patch-src_Makefile.in deleted file mode 100644 index 41f86d13df0..00000000000 --- a/www/ap2-transform/patches/patch-src_Makefile.in +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-src_Makefile.in,v 1.1 2011/03/18 08:11:03 obache Exp $ - -* staged installation support - ---- src/Makefile.in.orig 2004-05-19 05:58:22.000000000 +0000 -+++ src/Makefile.in -@@ -486,8 +486,8 @@ clean: - rm -f mod_transform.so - - install: make_so -- @${APXS_BIN} -i -n transform mod_transform.so -- cp ../include/mod_transform.h ${AP_INCLUDEDIR} -+ @${APXS_BIN} -i -S LIBEXECDIR=${DESTDIR}${AP_LIBEXECDIR} -n transform mod_transform.so -+ cp ../include/mod_transform.h ${DESTDIR}${AP_INCLUDEDIR} - @echo "" - @echo "" - @echo "***********************************************" diff --git a/www/ap2-upload/Makefile b/www/ap2-upload/Makefile index 6084481165f..c42e44b9760 100644 --- a/www/ap2-upload/Makefile +++ b/www/ap2-upload/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2017/12/21 03:47:25 manu Exp $ +# $NetBSD: Makefile,v 1.2 2018/01/01 10:23:08 wiz Exp $ DISTNAME= mod_upload-0.7 PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//} @@ -10,8 +10,6 @@ HOMEPAGE= https://ftp.espci.fr/pub/mod_upload/ COMMENT= High performance file upload helper for PHP LICENSE= gnu-gpl-v2 -PKG_APACHE_ACCEPTED= apache22 apache24 - APACHE_MODULE_NAME= ${DISTNAME:C/-.*//}.la GNU_CONFIGURE= yes diff --git a/www/ap2-xsendfile/Makefile b/www/ap2-xsendfile/Makefile index 271a3cb5b64..5d36e0f20d8 100644 --- a/www/ap2-xsendfile/Makefile +++ b/www/ap2-xsendfile/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2017/08/01 14:59:06 wiz Exp $ -# +# $NetBSD: Makefile,v 1.4 2018/01/01 10:23:08 wiz Exp $ DISTNAME= mod_xsendfile-0.12 PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//} @@ -16,8 +15,6 @@ APACHE_MODULE_NAME= ${DISTNAME:C|-.*||}.so APACHE_MODULE_SRC= ${DISTNAME:C|-.*||}.c APACHE_MODULE_LA= ${DISTNAME:C|-.*||}.la -PKG_APACHE_ACCEPTED= apache22 apache24 - do-build: cd ${WRKSRC} && ${APXS} ${CPPFLAGS} ${LDFLAGS} -c -o ${APACHE_MODULE_NAME} ${APACHE_MODULE_SRC} diff --git a/www/ap22-auth-ofba/Makefile b/www/ap22-auth-ofba/Makefile index 7c8ae521fc6..307c4f30c84 100644 --- a/www/ap22-auth-ofba/Makefile +++ b/www/ap22-auth-ofba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2017/12/21 03:50:43 manu Exp $ +# $NetBSD: Makefile,v 1.2 2018/01/01 10:23:08 wiz Exp $ DISTNAME= mod_auth_ofba-0.6 PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//:S/_/-/g} @@ -15,7 +15,6 @@ USE_TOOLS+= pkg-config GNU_CONFIGURE= yes USE_APR= yes -PKG_APACHE_ACCEPTED= apache22 apache24 .include "../../mk/apache.mk" APACHE_MODULE_NAME= mod_auth_ofba.${MODULE_EXT} diff --git a/www/ap22-authn-sasl/DESCR b/www/ap22-authn-sasl/DESCR deleted file mode 100644 index 0dcf3631b5f..00000000000 --- a/www/ap22-authn-sasl/DESCR +++ /dev/null @@ -1,7 +0,0 @@ -This module provides the mod_auth_basic authentication front-end a way to -authenticate users by checking credentials via the Cyrus SASL library. -This may be interesting for setups where other daemons (e.g. for SMTP, IMAP -or LDAP) already running at a machine use SASL to authenticate users. The -module is also useful to authenticate users against databases that use shadow -passwords. You do not need to elevate Apache HTTPD's access rights to -superuser privileges. diff --git a/www/ap22-authn-sasl/MESSAGE b/www/ap22-authn-sasl/MESSAGE deleted file mode 100644 index 3f53072082e..00000000000 --- a/www/ap22-authn-sasl/MESSAGE +++ /dev/null @@ -1,9 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.1.1.1 2008/11/12 09:10:00 martti Exp $ - -In order to use this module in your Apache installation, you need to -add the following to your httpd.conf file: - - LoadModule ${MODULE_NAME} lib/httpd/mod_authn_sasl.so - -=========================================================================== diff --git a/www/ap22-authn-sasl/Makefile b/www/ap22-authn-sasl/Makefile deleted file mode 100644 index 6cb6c78e7ab..00000000000 --- a/www/ap22-authn-sasl/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# $NetBSD: Makefile,v 1.5 2014/06/11 12:57:23 joerg Exp $ - -DISTNAME= mod_authn_sasl-${DISTVERS} -#PKGREVISION= 1 -PKGNAME= ${APACHE_PKG_PREFIX}-authn-sasl-${DISTVERS} -PKGREVISION= 1 -CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mod-authn-sasl/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://mod-authn-sasl.sourceforge.net/ -COMMENT= Apache module for SASL authentication - -PKG_APACHE_ACCEPTED= apache22 - -.include "../../mk/apache.mk" - -APACHE_MODULE_NAME= mod_authn_sasl.${MODULE_EXT} - -DISTVERS= 1.0.2 -MODULE_EXT= la -MESSAGE_SUBST+= MODULE_NAME=authn_sasl_module - -.include "../../security/cyrus-sasl/buildlink3.mk" -.include "../../mk/apache.module.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/www/ap22-authn-sasl/PLIST b/www/ap22-authn-sasl/PLIST deleted file mode 100644 index a71d8bbd1c4..00000000000 --- a/www/ap22-authn-sasl/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2008/11/12 09:10:00 martti Exp $ -lib/httpd/mod_authn_sasl.so diff --git a/www/ap22-authn-sasl/distinfo b/www/ap22-authn-sasl/distinfo deleted file mode 100644 index eb2bc2505fa..00000000000 --- a/www/ap22-authn-sasl/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.2 2015/11/04 02:46:49 agc Exp $ - -SHA1 (mod_authn_sasl-1.0.2.tar.bz2) = 83beef4940cd4e7bb771245c66001a37abe05841 -RMD160 (mod_authn_sasl-1.0.2.tar.bz2) = 6e9ee7d9c1d710e9b395e8d9e99bff712cee61f2 -SHA512 (mod_authn_sasl-1.0.2.tar.bz2) = c37bef3698691f9dd141a8df059d4830f092cd0b3f4c0c533b6fc5c7a1f60c28211eced94c32cb3c60ad4242d4870b4adb01a194e6dbb8f25f6d4d810e77969f -Size (mod_authn_sasl-1.0.2.tar.bz2) = 244838 bytes diff --git a/www/ap22-authnz-external/DESCR b/www/ap22-authnz-external/DESCR deleted file mode 100644 index 0a4e81c24c1..00000000000 --- a/www/ap22-authnz-external/DESCR +++ /dev/null @@ -1,20 +0,0 @@ -The Apache HTTP Daemon can be configured to require users to supply logins -and passwords before accessing pages in some directories. Authentication is -the process of checking if the password given is correct for a user. Apache -has standard modules for authenticating out of several different kinds of -databases. The external authentication module provides a flexible tool for -creating authentication systems based on other databases. - -The module can be used in either of two somewhat divergent ways: -1) External Authentication: - -When a user supplies a login and password, mod_auth*_external runs a program -you write, passing it the login and password. Your program does whatever -checking and logging it needs to, and then returns a Accept/Reject flag to -Apache. - -2) Hardcoded Authentication: - -Some hooks have been inserted into mod_auth*_external to make it easy to -replace the call to the external authentication program with a call to a -hardcoded internal authentication routine that you write. diff --git a/www/ap22-authnz-external/MESSAGE b/www/ap22-authnz-external/MESSAGE deleted file mode 100644 index ffdd6c0c793..00000000000 --- a/www/ap22-authnz-external/MESSAGE +++ /dev/null @@ -1,9 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.1.1.1 2008/07/29 05:07:46 schmonz Exp $ - -In order to use this module in your Apache installation, you need to -add the following to your httpd.conf file: - - LoadModule ${MODULE_NAME} lib/httpd/mod_authnz_external.so - -=========================================================================== diff --git a/www/ap22-authnz-external/Makefile b/www/ap22-authnz-external/Makefile deleted file mode 100644 index bf084cad10f..00000000000 --- a/www/ap22-authnz-external/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# $NetBSD: Makefile,v 1.8 2017/08/01 16:51:20 wiz Exp $ - -DISTNAME= mod_authnz_external-${DISTVERS} -PKGNAME= ${APACHE_PKG_PREFIX}-authnz-external-${DISTVERS} -PKGREVISION= 1 -CATEGORIES= www -MASTER_SITES= http://mod-auth-external.googlecode.com/files/ - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= https://github.com/phokz/mod-auth-external -COMMENT= Apache module for external program authentication - -PKG_APACHE_ACCEPTED= apache22 - -APACHE_MODULE_NAME= mod_authnz_external.${MODULE_EXT} - -DISTVERS= 3.2.3 -MODULE_EXT= la -MESSAGE_SUBST+= MODULE_NAME=authnz_external_module - -INSTALLATION_DIRS+= share/doc/authnz-external - -post-install: - ${INSTALL_DATA} ${WRKSRC}/AUTHENTICATORS \ - ${DESTDIR}${PREFIX}/share/doc/authnz-external - ${INSTALL_DATA} ${WRKSRC}/INSTALL \ - ${DESTDIR}${PREFIX}/share/doc/authnz-external - ${INSTALL_DATA} ${WRKSRC}/INSTALL.HARDCODE \ - ${DESTDIR}${PREFIX}/share/doc/authnz-external - ${INSTALL_DATA} ${WRKSRC}/TODO \ - ${DESTDIR}${PREFIX}/share/doc/authnz-external - ${INSTALL_DATA} ${WRKSRC}/UPGRADE \ - ${DESTDIR}${PREFIX}/share/doc/authnz-external - -.include "../../mk/apache.module.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/www/ap22-authnz-external/PLIST b/www/ap22-authnz-external/PLIST deleted file mode 100644 index 02656142ab4..00000000000 --- a/www/ap22-authnz-external/PLIST +++ /dev/null @@ -1,7 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2009/06/14 22:00:17 joerg Exp $ -lib/httpd/mod_authnz_external.so -share/doc/authnz-external/AUTHENTICATORS -share/doc/authnz-external/INSTALL -share/doc/authnz-external/INSTALL.HARDCODE -share/doc/authnz-external/TODO -share/doc/authnz-external/UPGRADE diff --git a/www/ap22-authnz-external/distinfo b/www/ap22-authnz-external/distinfo deleted file mode 100644 index 4c0740a2b9f..00000000000 --- a/www/ap22-authnz-external/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -$NetBSD: distinfo,v 1.4 2015/11/04 02:46:49 agc Exp $ - -SHA1 (mod_authnz_external-3.2.3.tar.gz) = a5e24392d6f9268ce94d3f899cfbcb5a43d1eddc -RMD160 (mod_authnz_external-3.2.3.tar.gz) = 738e1e2a59771a9b6f09adcf3ff38fd60cdd42d7 -SHA512 (mod_authnz_external-3.2.3.tar.gz) = e034e5a2a6ec7f5a1ca32611672847da260e43461f24f4e42f07ac0951559decdfafde68fa3d0f5fce02871aadcdf6f0a3d09095e745eaeb7a264bfdff83d9fd -Size (mod_authnz_external-3.2.3.tar.gz) = 59642 bytes -SHA1 (patch-aa) = a566906fe7c50452979f3bd6c618ee8b08cce645 diff --git a/www/ap22-authnz-external/patches/patch-aa b/www/ap22-authnz-external/patches/patch-aa deleted file mode 100644 index e7ec1126a20..00000000000 --- a/www/ap22-authnz-external/patches/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2008/11/12 09:07:56 martti Exp $ - ---- mod_authnz_external.c.orig 2008-07-31 22:11:46.000000000 +0300 -+++ mod_authnz_external.c 2008-11-12 10:53:39.000000000 +0200 -@@ -90,6 +90,7 @@ - #define ENV_PASS "PASS" - #define ENV_GROUP "GROUP" - #define ENV_URI "URI" -+#define ENV_METHOD "METHOD" - #define ENV_IP "IP" - #define ENV_HOST "HOST" /* Remote Host */ - #define ENV_HTTP_HOST "HTTP_HOST" /* Local Host */ -@@ -446,6 +447,9 @@ - if (r->uri) - child_env[i++]= apr_pstrcat(p, ENV_URI"=", r->uri, NULL); - -+ if (r->method) -+ child_env[i++]= apr_pstrcat(r->pool, ENV_METHOD"=", r->method, NULL); -+ - if ((host= apr_table_get(r->headers_in, "Host")) != NULL) - child_env[i++]= apr_pstrcat(p, ENV_HTTP_HOST"=", host, NULL); - diff --git a/www/ap22-authz-ldap/Makefile b/www/ap22-authz-ldap/Makefile index be2047a0e2f..a178b80d41f 100644 --- a/www/ap22-authz-ldap/Makefile +++ b/www/ap22-authz-ldap/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2016/03/05 11:29:35 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.4 2018/01/01 10:23:08 wiz Exp $ DISTNAME= mod_authz_ldap-0.30 PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:C/^mod_//:C/_/-/} @@ -12,8 +11,6 @@ HOMEPAGE= http://authzldap.othello.ch/ COMMENT= Apache LDAP Authorization module LICENSE= apache-2.0 -PKG_APACHE_ACCEPTED= apache24 apache22 - .include "../../mk/apache.mk" .include "options.mk" diff --git a/www/ap22-limitipconn/DESCR b/www/ap22-limitipconn/DESCR deleted file mode 100644 index 5d38e8c7ccb..00000000000 --- a/www/ap22-limitipconn/DESCR +++ /dev/null @@ -1,3 +0,0 @@ -Apache 2.0 C module to limit the maximum number of simultaneous -connections per IP address. Allows inclusion and exclusion of files -based on MIME type. diff --git a/www/ap22-limitipconn/Makefile b/www/ap22-limitipconn/Makefile deleted file mode 100644 index 4b5cbc89e35..00000000000 --- a/www/ap22-limitipconn/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# $NetBSD: Makefile,v 1.7 2016/03/05 11:29:35 jperkin Exp $ -# - -DISTNAME= mod_limitipconn-0.23 -EXTRACT_SUFX= .tar.bz2 -PKGNAME= ${DISTNAME:S/mod_/ap22-/} -PKGREVISION= 6 -CATEGORIES= www -MASTER_SITES= http://dominia.org/djao/limit/ -LICENSE= apache-2.0 - - -PATCH_SITES= http://dominia.org/djao/limit/contrib/dg/ -PATCHFILES= mod_limitipconn_local_IP_patch_2.diff - -MAINTAINER= is@NetBSD.org -HOMEPAGE= http://dominia.org/djao/limitipconn2.html -COMMENT= Limits per-IP connections to an Apache 2 server - -APACHE_MODULE= yes -MAKE_FLAGS+= APXS=${APXS:Q} -USE_LIBTOOL= yes - -INSTALLATION_DIRS+= lib/httpd - -do-install: - ${BUILDLINK_PREFIX.apache}/share/httpd/build/instdso.sh \ - SH_LIBTOOL=${BUILDLINK_PREFIX.apache}/share/httpd/build/libtool \ - ${WRKSRC}/mod_limitipconn.la \ - ${DESTDIR}${PREFIX}/lib/httpd -post-install: - ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/mod_limitipconn - ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/mod_limitipconn/ - -.include "../../www/apache22/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/www/ap22-limitipconn/PLIST b/www/ap22-limitipconn/PLIST deleted file mode 100644 index 5bdda2867ba..00000000000 --- a/www/ap22-limitipconn/PLIST +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2011/11/08 14:45:14 is Exp $ -lib/httpd/mod_limitipconn.so -share/doc/mod_limitipconn/README diff --git a/www/ap22-limitipconn/distinfo b/www/ap22-limitipconn/distinfo deleted file mode 100644 index a25d77c8a9c..00000000000 --- a/www/ap22-limitipconn/distinfo +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: distinfo,v 1.2 2015/11/04 02:46:49 agc Exp $ - -SHA1 (mod_limitipconn-0.23.tar.bz2) = 8a7d2d991328fa67fffa617942436049799bfa02 -RMD160 (mod_limitipconn-0.23.tar.bz2) = 13b4d8ce48965e337fabaed224c00db41fbecdaf -SHA512 (mod_limitipconn-0.23.tar.bz2) = 090f70a3bc4f63a99337630cead07f713c4657302f5e3aca9b30927efe06e7e3ae21a28e5a3fbcd2a7ef596bc9b5a2c918b26155a71615593420fc007d95f348 -Size (mod_limitipconn-0.23.tar.bz2) = 9851 bytes -SHA1 (mod_limitipconn_local_IP_patch_2.diff) = 925b15a3bdc33653deda286d504664bdfaff7c2a -RMD160 (mod_limitipconn_local_IP_patch_2.diff) = f8b5e18697139343a5801f8fd94edad890797481 -SHA512 (mod_limitipconn_local_IP_patch_2.diff) = e5119f663830e3332a01f970df05ac6ad5d67973d4223b963b1b7c5528acce42369060cebc1da678c2d01778865bb787abee7005a220f571d3bd18a631214ec5 -Size (mod_limitipconn_local_IP_patch_2.diff) = 4080 bytes diff --git a/www/ap22-vhost-ldap/DESCR b/www/ap22-vhost-ldap/DESCR deleted file mode 100644 index 205e0d1febe..00000000000 --- a/www/ap22-vhost-ldap/DESCR +++ /dev/null @@ -1,5 +0,0 @@ -mod-vhost-ldap is an Apache 2.2 module for storing and configuring -Virtual Hosts from LDAP. It supports DocumentRoot, ScriptAlias, -ServerName, ServerAlias, ServerAdmin and SuexecUserGroup directives. -It's built on top of mod_ldap, so it uses it's caching capabilities -and can be used with threaded apache. diff --git a/www/ap22-vhost-ldap/MESSAGE b/www/ap22-vhost-ldap/MESSAGE deleted file mode 100644 index 00d6bfff605..00000000000 --- a/www/ap22-vhost-ldap/MESSAGE +++ /dev/null @@ -1,9 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.1.1.1 2009/02/21 15:59:20 imil Exp $ - -In order to use this module in your Apache installation, you need to -add the following to your httpd.conf file: - - LoadModule vhost_ldap_module lib/httpd/mod_vhost_ldap.so - -=========================================================================== diff --git a/www/ap22-vhost-ldap/Makefile b/www/ap22-vhost-ldap/Makefile deleted file mode 100644 index 6c947d2c0ce..00000000000 --- a/www/ap22-vhost-ldap/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# $NetBSD: Makefile,v 1.10 2017/08/01 14:59:06 wiz Exp $ - -MVL_VERSION= 1.2.0 -DISTNAME= mod-vhost-ldap_${MVL_VERSION}.orig -PKGNAME= ${APACHE_PKG_PREFIX}-vhost-ldap-${MVL_VERSION} -PKGREVISION= 7 -CATEGORIES= www databases -MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/m/mod-vhost-ldap/} - -MAINTAINER= imil@gcu.info -HOMEPAGE= https://packages.qa.debian.org/m/mod-vhost-ldap.html -COMMENT= Apache 2.2 module LDAP Virtual Hosts support - -WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/:S/.orig//} -NO_CONFIGURE= yes - -APACHE_MODULE_NAME= mod_vhost_ldap - -PKG_APACHE_ACCEPTED= apache22 - -AUTO_MKDIRS= yes - -do-build: - cd ${WRKSRC} && \ - ${APXS} -c -n ${APACHE_MODULE_NAME} \ - -I${BUILDLINK_PREFIX.openldap-client}/include \ - -L${BUILDLINK_PREFIX.openldap-client}/lib \ - ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openldap-client}/lib \ - -DMOD_VHOST_LDAP_VERSION=\\\"mod_vhost_ldap/${MVL_VERSION}\\\" \ - -lldap_r mod_vhost_ldap.c - -do-install: - cd ${WRKSRC} && \ - ${APXS} -i -n ${APACHE_MODULE_NAME} ${APACHE_MODULE_NAME}.la - ${INSTALL_DATA} ${WRKSRC}/vhost_ldap.conf \ - ${DESTDIR}${PREFIX}/share/examples/mod_vhost_ldap - ${INSTALL_DATA} ${WRKSRC}/mod_vhost_ldap.schema \ - ${DESTDIR}${PREFIX}/share/examples/mod_vhost_ldap - -.include "../../devel/apr-util/buildlink3.mk" -.if empty(PKG_BUILD_OPTIONS.apr-util:Mldap) -PKG_FAIL_REASON+= "PKG_OPTIONS.apr-util must contain the ldap parameter" -.endif - -.include "../../mk/apache.mk" -.include "../../databases/openldap-client/buildlink3.mk" - -.include "../../mk/bsd.pkg.mk" diff --git a/www/ap22-vhost-ldap/PLIST b/www/ap22-vhost-ldap/PLIST deleted file mode 100644 index 9162cf1090d..00000000000 --- a/www/ap22-vhost-ldap/PLIST +++ /dev/null @@ -1,4 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 22:00:17 joerg Exp $ -lib/httpd/mod_vhost_ldap.so -share/examples/mod_vhost_ldap/vhost_ldap.conf -share/examples/mod_vhost_ldap/mod_vhost_ldap.schema diff --git a/www/ap22-vhost-ldap/distinfo b/www/ap22-vhost-ldap/distinfo deleted file mode 100644 index 9e5cdc476de..00000000000 --- a/www/ap22-vhost-ldap/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.2 2015/11/04 02:46:49 agc Exp $ - -SHA1 (mod-vhost-ldap_1.2.0.orig.tar.gz) = 5152a928bdee6f6e9e3a2e02dc20ef3de24528d4 -RMD160 (mod-vhost-ldap_1.2.0.orig.tar.gz) = b4bcd45d4fab70acc69e1a65a3f3f94447591889 -SHA512 (mod-vhost-ldap_1.2.0.orig.tar.gz) = 72a09612dbc6fdb9eb544e44ac2f3d3e004899cdbd8c98c2a41affede282391a5a138be9e747e3c22091b4ee0058b7dde29cdbd464a5206f475e3cc294d47d43 -Size (mod-vhost-ldap_1.2.0.orig.tar.gz) = 8593 bytes diff --git a/www/gitweb/Makefile b/www/gitweb/Makefile index f4281ea2867..12f0bead994 100644 --- a/www/gitweb/Makefile +++ b/www/gitweb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2016/07/21 13:12:25 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2018/01/01 10:23:09 wiz Exp $ .include "../../devel/git/Makefile.common" @@ -7,7 +7,7 @@ CATEGORIES= www COMMENT= Web interface for GIT repositories -#DEPENDS+= apache{,2,22}-[0-9]*:../../www/apache22 +#DEPENDS+= apache-[0-9]*:../../www/apache24 DEPENDS+= git-base>=${GIT_VERSION}:../../devel/git-base #DEPENDS+= {perl>=5.15.8,p5-Time-HiRes>=1.9725}:../../time/p5-Time-HiRes DEPENDS+= p5-CGI-[0-9]*:../../www/p5-CGI diff --git a/www/matcha-sns/MESSAGE b/www/matcha-sns/MESSAGE index 90196dd245f..3bce60d4197 100644 --- a/www/matcha-sns/MESSAGE +++ b/www/matcha-sns/MESSAGE @@ -1,10 +1,10 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.1 2015/04/08 19:11:09 ryoon Exp $ +$NetBSD: MESSAGE,v 1.2 2018/01/01 10:23:09 wiz Exp $ To use Matcha SNS with Apache httpd 2.2, you will need to perform the following steps. -1. Install www/apache22 and www/ap-php . +1. Install www/apache24 and www/ap-php . 2. Setup PHP. At least, ${PREFIX}/etc/php.ini should have date.timezone line. If your machine are located in Tokyo, Japan, you should get the following. @@ -58,7 +58,7 @@ the following steps. Require all granted </Directory> -9. Start Apache httpd 2.2 +9. Start Apache httpd # ${RCD_SCRIPTS_DIR}/apache start diff --git a/www/php-basercms/MESSAGE b/www/php-basercms/MESSAGE index c52b9f8da5b..3ea31a7df1e 100644 --- a/www/php-basercms/MESSAGE +++ b/www/php-basercms/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.2 2014/11/29 12:26:16 ryoon Exp $ +$NetBSD: MESSAGE,v 1.3 2018/01/01 10:23:09 wiz Exp $ To use baserCMS, you will need to perform the following steps. @@ -12,7 +12,7 @@ To use baserCMS, you will need to perform the following steps. mysql> create database basercms character set utf8 ; mysql> grant all privileges on basercms.* to baser@localhost identified by 'baser-password'; -2. Install apache httpd server, for example www/apache22 and www/ap-php. +2. Install apache httpd server, for example www/apache24 and www/ap-php. 3. Be sure to have the following lines in ${PREFIX}/etc/httpd/httpd.conf diff --git a/www/php-tiki6/MESSAGE b/www/php-tiki6/MESSAGE index 395ed15defe..18436cf80a6 100644 --- a/www/php-tiki6/MESSAGE +++ b/www/php-tiki6/MESSAGE @@ -1,9 +1,9 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.3 2011/12/11 13:01:50 ryoon Exp $ +$NetBSD: MESSAGE,v 1.4 2018/01/01 10:23:09 wiz Exp $ -To use tiki with Apache 2.2, you will need to perform the following steps. +To use tiki with Apache, you will need to perform the following steps. -1. Install www/apache22 and www/ap-php +1. Install www/apache24 and www/ap-php 2. Setup PHP. At least, ${PREFIX}/etc/php.ini should have date.timezone line. If your machine are located in Tokyo, Japan, you should get the following. diff --git a/www/py-mod_wsgi/Makefile b/www/py-mod_wsgi/Makefile index 60940b5763c..bff10ada93c 100644 --- a/www/py-mod_wsgi/Makefile +++ b/www/py-mod_wsgi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2017/12/16 07:46:30 adam Exp $ +# $NetBSD: Makefile,v 1.16 2018/01/01 10:23:09 wiz Exp $ DISTNAME= mod_wsgi-4.5.24 PKGNAME= ${PYPKGPREFIX}-${APACHE_PKG_PREFIX}-${DISTNAME} @@ -10,8 +10,6 @@ HOMEPAGE= http://www.modwsgi.org/ COMMENT= WSGI module for apache LICENSE= apache-2.0 -PKG_APACHE_ACCEPTED= apache22 apache24 - DEPENDS+= ${PYPKGPREFIX}-mod_wsgi-metrics>=1.0.0:../../www/py-mod_wsgi-metrics APACHE_MODULE= yes |