summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2013-01-11 20:41:59 +0000
committerPacho Ramos <pacho@gentoo.org>2013-01-11 20:41:59 +0000
commit29d1ad46d836a4398ad85e1cb5e074b77b78e496 (patch)
tree2c3e74e808e4b40fd6c56005ab0215635892582c /www-apache
parentStable for amd64, wrt bug #451122 (diff)
downloadgentoo-2-29d1ad46d836a4398ad85e1cb5e074b77b78e496.tar.gz
gentoo-2-29d1ad46d836a4398ad85e1cb5e074b77b78e496.tar.bz2
gentoo-2-29d1ad46d836a4398ad85e1cb5e074b77b78e496.zip
Commit patch properly to prevent CVS keywords to be modified (#327445#c15 by Zac Medico)
(Portage version: 2.1.11.40/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'www-apache')
-rw-r--r--www-apache/mod_auth_kerb/ChangeLog7
-rw-r--r--www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-s4u2proxy.patch4
2 files changed, 8 insertions, 3 deletions
diff --git a/www-apache/mod_auth_kerb/ChangeLog b/www-apache/mod_auth_kerb/ChangeLog
index 44e4774c3304..51f8b99396dd 100644
--- a/www-apache/mod_auth_kerb/ChangeLog
+++ b/www-apache/mod_auth_kerb/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for www-apache/mod_auth_kerb
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_kerb/ChangeLog,v 1.12 2013/01/03 18:58:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_kerb/ChangeLog,v 1.13 2013/01/11 20:41:59 pacho Exp $
+
+ 11 Jan 2013; Pacho Ramos <pacho@gentoo.org>
+ files/mod_auth_kerb-5.4-s4u2proxy.patch:
+ Commit patch properly to prevent CVS keywords to be modified (#327445#c15 by
+ Zac Medico)
*mod_auth_kerb-5.4-r1 (03 Jan 2013)
diff --git a/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-s4u2proxy.patch b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-s4u2proxy.patch
index 5afc0fad70dc..c59968dc76bc 100644
--- a/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-s4u2proxy.patch
+++ b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-s4u2proxy.patch
@@ -37,7 +37,7 @@ KrbConstrainedDelegation. The default is off.
+
+The module itself will obtain and manage the necessary credentials.
+
- $Id: mod_auth_kerb-5.4-s4u2proxy.patch,v 1.1 2013/01/03 18:58:44 pacho Exp $
+ $Id: mod_auth_kerb-5.4-s4u2proxy.patch,v 1.2 2013/01/11 20:41:59 pacho Exp $
diff -up --recursive mod_auth_kerb-5.4.orig/src/mod_auth_kerb.c mod_auth_kerb-5.4/src/mod_auth_kerb.c
--- mod_auth_kerb-5.4.orig/src/mod_auth_kerb.c 2011-12-09 17:55:05.000000000 -0500
+++ mod_auth_kerb-5.4/src/mod_auth_kerb.c 2012-03-01 14:19:40.000000000 -0500
@@ -70,7 +70,7 @@ diff -up --recursive mod_auth_kerb-5.4.orig/src/mod_auth_kerb.c mod_auth_kerb-5.
+ * Copyright (C) 2012 Red Hat
+ */
+
- #ident "$Id: mod_auth_kerb-5.4-s4u2proxy.patch,v 1.1 2013/01/03 18:58:44 pacho Exp $"
+ #ident "$Id: mod_auth_kerb-5.4-s4u2proxy.patch,v 1.2 2013/01/11 20:41:59 pacho Exp $"
#include "config.h"
@@ -49,6 +74,7 @@