Bug 56247 - [patch] ftp/pure-ftpd: Utilize USE_MYSQL and USE_OPENLDAP
Summary: [patch] ftp/pure-ftpd: Utilize USE_MYSQL and USE_OPENLDAP
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2003-08-31 20:40 UTC by Clement Laforet
Modified: 2003-10-06 13:50 UTC (History)
1 user (show)

See Also:

Attachments
Makefile-pureftpd.diff (1.46 KB, patch)
2003-08-31 20:40 UTC, Clement Laforet 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Clement Laforet 2003-08-31 20:40:09 UTC 
	Make pureftpd port utilize USE_MYSQL and USE_OPENLDAP macro.
	Frank Denis is Cc'ed for notification and/or approval.

How-To-Repeat: 	N/A.
Comment 1 Clement Laforet 2003-08-31 20:46:20 UTC 
We can remove useless pre-fetch messages too ;)
this patch correct this

--- Makefile.orig	Sun Aug 31 19:20:58 2003
+++ Makefile	Sun Aug 31 19:44:24 2003
@@ -23,20 +23,13 @@
 MAINTAINER=	j@pureftpd.org
 COMMENT=	A small, easy to set up, fast and very secure FTP server
 
-.if defined(WITH_LDAP) && !defined(WITH_LDAP21)
-LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap20-client
-.elif defined(WITH_LDAP21) && !defined(WITH_LDAP)
-LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap21-client
-.elif defined(WITH_LDAP21) && defined(WITH_LDAP)
-BROKEN=		"You may only specify WITH_LDAP xor WITH_LDAP21, but not both together"
+.if defined(WITH_LDAP)
+USE_OPENLDAP=		YES
 .endif
 
-.if defined(WITH_MYSQL) && !defined(WITH_MYSQL4)
-LIB_DEPENDS+=	mysqlclient:${PORTSDIR}/databases/mysql323-client
-.elif defined(WITH_MYSQL4) && !defined(WITH_MYSQL)
-LIB_DEPENDS+=	mysqlclient.12:${PORTSDIR}/databases/mysql40-client
-.elif defined(WITH_MYSQL4) && defined(WITH_MYSQL)
-BROKEN=		"You may only specify WITH_MYSQL xor WITH_MYSQL4, but not both together"
+.if defined(WITH_MYSQL)
+USE_MYSQL=		YES
+BROKEN_WITH_MYSQL=	41
 .endif
 
 .if defined(WITH_PGSQL)
@@ -57,16 +50,16 @@
 .endif
 
 # ldap support requested?
-.if defined(WITH_LDAP) || defined(WITH_LDAP21)
+.if defined(WITH_LDAP)
 CONFIGURE_ARGS+=	--with-ldap
 .endif
 
 # mysql support requested?
-.if defined(WITH_MYSQL) || defined(WITH_MYSQL4)
+.if defined(WITH_MYSQL)
 CONFIGURE_ARGS+=	--with-mysql
 .endif
 
-# mysql support requested?
+# postgresql support requested?
 .if defined(WITH_PGSQL)
 CONFIGURE_ARGS+=	--with-pgsql
 .endif
@@ -109,10 +102,8 @@
 
 pre-fetch:
 	@${ECHO_CMD} "You can use the following additional options:"
-	@${ECHO_CMD} "WITH_LDAP=1           - Support for users in LDAP directories (openldap-2.0)"
-	@${ECHO_CMD} "WITH_LDAP21=1         - Support for users in LDAP directories (openldap-2.1)"
-	@${ECHO_CMD} "WITH_MYSQL=1          - Support for users in MySQL 3.23 databases"
-	@${ECHO_CMD} "WITH_MYSQL4=1         - Support for users in MySQL 4 databases"
+	@${ECHO_CMD} "WITH_LDAP=1           - Support for users in LDAP directories"
+	@${ECHO_CMD} "WITH_MYSQL=1          - Support for users in MySQL databases"
 	@${ECHO_CMD} "WITH_PGSQL=1          - Support for users in PostgreSQL databases"
 	@${ECHO_CMD} "WITH_PRIVSEP=1        - Enable privilege separation"
 	@${ECHO_CMD} "WITH_LANG=lang        - Enable compilation of language support, lang is one of"
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: feedback->closed

If this is still a problem with the latest (3.23.58) one, please 
resubmit the problem. Most likely it was caused by the not running 
of ldconfig by the port. If it still occures, please add the output 
of "ldconfig -r" to the PR.
Comment 3 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

euhmm.. I'll redit this PR.
Comment 4 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open
Comment 5 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open
Comment 6 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

Fix synopses.
Comment 7 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

Fix synopses
Comment 8 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

Fix synopses
Comment 9 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

Fix synopses
Comment 10 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

Fix synopses
Comment 11 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

Fix synopses
Comment 12 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

Fix synopses
Comment 13 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

Fix synopses
Comment 14 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

Fix category
Comment 15 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

Fix synopsesFix synopsesFix synopses
Comment 16 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

Fix synopses
Comment 17 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

Fix synopses
Comment 18 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

Fix synopses
Comment 19 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

Fix synopses
Comment 20 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: analyzed->analyzed

Fix synopses
Comment 21 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

Fix synopses
Comment 22 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

Fix synopses
Comment 23 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

Fix synopses
Comment 24 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

FIx category
Comment 25 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

Fix synopses
Comment 26 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

Fix synopses
Comment 27 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

Fix synopses
Comment 28 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

Fix synopses
Comment 29 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

Fix synopses
Comment 30 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

Fix synopses
Comment 31 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

Fix synopses
Comment 32 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

Fix category
Comment 33 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: feedback->feedback

Fix synopses
Comment 34 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

Fix synopses
Comment 35 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

Fix synopses
Comment 36 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

Fix synopses
Comment 37 Edwin Groothuis freebsd_committer freebsd_triage 2003-09-28 02:35:21 UTC 
State Changed
From-To: open->open

Fix synopses
Comment 38 Edwin Groothuis freebsd_committer freebsd_triage 2003-10-06 13:50:33 UTC 
State Changed
From-To: open->closed

Commited, thanks!