diff options
| author | ohauer <ohauer@FreeBSD.org> | 2014-10-04 18:29:54 +0800 |
|---|---|---|
| committer | ohauer <ohauer@FreeBSD.org> | 2014-10-04 18:29:54 +0800 |
| commit | de487d66c06fc7901c06564bf05f772d44f4e549 (patch) | |
| tree | 0ce60fe6cc2ddb0aa6946765a92a09932d14779d | |
| parent | 560283138a23a26fd3921511f60882770ee2a3d5 (diff) | |
| download | freebsd-ports-gnome-de487d66c06fc7901c06564bf05f772d44f4e549.tar.gz freebsd-ports-gnome-de487d66c06fc7901c06564bf05f772d44f4e549.tar.zst freebsd-ports-gnome-de487d66c06fc7901c06564bf05f772d44f4e549.zip | |
- remove FreeBSD-specific bits
- bump PORTREVISION
PR: 194123
Submitted by: mva
Reviewed by: eadler
| -rw-r--r-- | devel/bugzilla44/Makefile | 5 | ||||
| -rw-r--r-- | devel/bugzilla44/Makefile.options | 4 | ||||
| -rw-r--r-- | devel/bugzilla44/files/freebsd-project-ldap.diff | 24 |
3 files changed, 2 insertions, 31 deletions
diff --git a/devel/bugzilla44/Makefile b/devel/bugzilla44/Makefile index b446640aacd4..16fc2b4ed269 100644 --- a/devel/bugzilla44/Makefile +++ b/devel/bugzilla44/Makefile @@ -2,6 +2,7 @@ PORTNAME= bugzilla PORTVERSION= 4.4.5 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= BUGZILLA MASTER_SITE_SUBDIR= webtools webtools/archived @@ -154,10 +155,6 @@ RUN_DEPENDS+= p5-File-MimeInfo>=0.16:${PORTSDIR}/devel/p5-File-MimeInfo \ p5-IO-stringy>=2.110:${PORTSDIR}/devel/p5-IO-stringy .endif -.if ${PORT_OPTIONS:MFREEBSD} -EXTRA_PATCHES= ${FILESDIR}/freebsd-project-ldap.diff -.endif - post-extract: @${RM} -rf ${WRKSRC}/.bzr @${RM} -f ${WRKSRC}/.bzrignore ${WRKSRC}/.gitignore ${WRKSRC}/.gitrev \ diff --git a/devel/bugzilla44/Makefile.options b/devel/bugzilla44/Makefile.options index b8531d7fdfb0..fdc40ae6c24e 100644 --- a/devel/bugzilla44/Makefile.options +++ b/devel/bugzilla44/Makefile.options @@ -2,8 +2,7 @@ OPTIONS_DEFINE= \ DOCS \ - MODPERL \ - FREEBSD + MODPERL OPTIONS_GROUP= UI DBBACKEND REPORTING ATTACHMENT EMAIL WEBSERVICE AUTH ADMIN @@ -55,7 +54,6 @@ BMP2PNG_DESC= BMP Attachments to PNGs CHARTING_MODULES_DESC= Bug charting support CONTRIB_DESC= Install user-contributed scripts EXPORT_IMPORT_DESC= Import/export bugs (via XML) -FREEBSD_DESC= Patch used internally by the FreeBSD project GRAPH_REPORTS_DESC= Graphical Reports INBOUND_EMAIL_DESC= Inbound Email JSONRPC_DESC= JSON-RPC Interface diff --git a/devel/bugzilla44/files/freebsd-project-ldap.diff b/devel/bugzilla44/files/freebsd-project-ldap.diff deleted file mode 100644 index b6769de3d795..000000000000 --- a/devel/bugzilla44/files/freebsd-project-ldap.diff +++ /dev/null @@ -1,24 +0,0 @@ ---- Bugzilla/Auth/Verify/LDAP.pm 2014-05-06 17:26:02.000000000 +0100 -+++ Bugzilla/Auth/Verify/LDAP.pm 2014-05-11 20:59:58.715356171 +0100 -@@ -132,7 +132,7 @@ - } - - } else { -- $params->{bz_username} = $username; -+ $params->{bz_username} = $username . '@freebsd.org'; - } - - $params->{realname} ||= $user_entry->get_value("displayName"); ---- token.cgi.dist 2014-06-03 00:27:29.279355734 +0000 -+++ token.cgi 2014-06-03 00:37:48.727359133 +0000 -@@ -122,6 +122,10 @@ - my $login_name = $cgi->param('loginname') - or ThrowUserError("login_needed_for_password_change"); - -+ if ($login_name =~ /[@.]FreeBSD\.org$/i) { -+ ThrowUserError("password_change_requests_not_allowed"); -+ } -+ - check_email_syntax($login_name); - my $user = Bugzilla::User->check($login_name); - |