saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 8a45d17732e2c0ff9994f34e2fb70c7b2adae6f1..5a0f2128d97a30bcedbc002e19e30c8c80a3d831 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -609,8 +609,7 @@ maybe chmod 0644 'openldap/schema/rfc2307bis.schema'
 maybe chmod 0644 'openldap/schema/sudo.schema'
 maybe chgrp 'ldap' 'openldap/slapd.conf'
 maybe chmod 0640 'openldap/slapd.conf'
-maybe chgrp 'ldap' 'openldap/slapd.conf.default'
-maybe chmod 0640 'openldap/slapd.conf.default'
+maybe chmod 0600 'openldap/slapd.conf.default'
 maybe chmod 0600 'openldap/slapd.ldif'
 maybe chmod 0600 'openldap/slapd.ldif.default'
 maybe chmod 0755 'openldap/ssl'

diff --git a/openldap/schema/README b/openldap/schema/README
index aa05a02a04e9435009cd310b971591de96009df7..a15fb5af5009fbe531d42f1bd2400645c8bddc95 100644 (file)
--- a/openldap/schema/README
+++ b/openldap/schema/README
@@ -34,7 +34,7 @@ convert schema files in general.
 
 This notice applies to all files in this directory.
 
-Copyright 1998-2015 The OpenLDAP Foundation, Redwood City, California, USA
+Copyright 1998-2016 The OpenLDAP Foundation, Redwood City, California, USA
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/openldap/schema/collective.ldif b/openldap/schema/collective.ldif
index a762cc609fe9ff939963026da10d83469de58305..bacb9ef619df1a7e514c0a077cad9c5b34514a5b 100644 (file)
--- a/openldap/schema/collective.ldif
+++ b/openldap/schema/collective.ldif
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2015 The OpenLDAP Foundation.
+## Copyright 1998-2016 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without

diff --git a/openldap/schema/collective.schema b/openldap/schema/collective.schema
index 4912b75d3aff324e3772bc5f3367b192179accd1..1c1b65ebfa155e17cd025ccfb40f6fc653bc519f 100644 (file)
--- a/openldap/schema/collective.schema
+++ b/openldap/schema/collective.schema
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2015 The OpenLDAP Foundation.
+## Copyright 1998-2016 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without

diff --git a/openldap/schema/corba.ldif b/openldap/schema/corba.ldif
index 47675a594803538484289b68eb955aa93f4fce32..caa98c116be06e107e0395c4278648d48a2cfbb0 100644 (file)
--- a/openldap/schema/corba.ldif
+++ b/openldap/schema/corba.ldif
@@ -3,7 +3,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2015 The OpenLDAP Foundation.
+## Copyright 1998-2016 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without

diff --git a/openldap/schema/corba.schema b/openldap/schema/corba.schema
index 731080e03489d61ca3ba883a68e232199aa31845..e05ba13c823bc621db03a5ca36c8d0c4a2b137ed 100644 (file)
--- a/openldap/schema/corba.schema
+++ b/openldap/schema/corba.schema
@@ -4,7 +4,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2015 The OpenLDAP Foundation.
+## Copyright 1998-2016 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without

diff --git a/openldap/schema/core.ldif b/openldap/schema/core.ldif
index aed7349e00844c81f79268265b71710a0735cf5e..7cc53c59f5c2e2a24eff14dd2b27122ed96bffdd 100644 (file)
--- a/openldap/schema/core.ldif
+++ b/openldap/schema/core.ldif
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2015 The OpenLDAP Foundation.
+## Copyright 1998-2016 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without

diff --git a/openldap/schema/core.schema b/openldap/schema/core.schema
index 0257cff2528e3295d334e07ea52b28a3a613f2a7..3ae58187ee9a8cd482847c5110304c67b45200fe 100644 (file)
--- a/openldap/schema/core.schema
+++ b/openldap/schema/core.schema
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2015 The OpenLDAP Foundation.
+## Copyright 1998-2016 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without

diff --git a/openldap/schema/cosine.ldif b/openldap/schema/cosine.ldif
index 340ca11fdd9ec4ea5287f0d43145c5f4a35c975d..a64e8b0b30850365198ce3d1e43d4e31b228464e 100644 (file)
--- a/openldap/schema/cosine.ldif
+++ b/openldap/schema/cosine.ldif
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2015 The OpenLDAP Foundation.
+## Copyright 1998-2016 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without

diff --git a/openldap/schema/cosine.schema b/openldap/schema/cosine.schema
index bc1d7f7e38c7a2841cb49255c34f3bdee76b5db0..a270e5925ce66829c9d9894e2d9278fa36688bef 100644 (file)
--- a/openldap/schema/cosine.schema
+++ b/openldap/schema/cosine.schema
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2015 The OpenLDAP Foundation.
+## Copyright 1998-2016 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without

diff --git a/openldap/schema/duaconf.ldif b/openldap/schema/duaconf.ldif
index 840965a9a595a1cdc590ba51807733479798ab54..418103025c2d802001aad4945611bb5190765e91 100644 (file)
--- a/openldap/schema/duaconf.ldif
+++ b/openldap/schema/duaconf.ldif
@@ -1,7 +1,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2015 The OpenLDAP Foundation.
+## Copyright 1998-2016 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without

diff --git a/openldap/schema/duaconf.schema b/openldap/schema/duaconf.schema
index c0cdaa5897ac5da5da3ab8f67f10db633e41f7fe..d450b356587c20299b4681e6e1b60333b09f0393 100644 (file)
--- a/openldap/schema/duaconf.schema
+++ b/openldap/schema/duaconf.schema
@@ -1,7 +1,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2015 The OpenLDAP Foundation.
+## Copyright 1998-2016 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without

diff --git a/openldap/schema/dyngroup.ldif b/openldap/schema/dyngroup.ldif
index 595ae614f1ec00ccda62bf8584ec0d6b133cce86..f54552a5c8cd156dc323f98152833de823982aa7 100644 (file)
--- a/openldap/schema/dyngroup.ldif
+++ b/openldap/schema/dyngroup.ldif
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2015 The OpenLDAP Foundation.
+## Copyright 1998-2016 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without

diff --git a/openldap/schema/dyngroup.schema b/openldap/schema/dyngroup.schema
index 035e23f7a113947450f6aad903b873342602818e..a4a246d17931927437fbb6ec4320e24237e3040f 100644 (file)
--- a/openldap/schema/dyngroup.schema
+++ b/openldap/schema/dyngroup.schema
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2015 The OpenLDAP Foundation.
+## Copyright 1998-2016 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without

diff --git a/openldap/schema/inetorgperson.ldif b/openldap/schema/inetorgperson.ldif
index d91b2bd9e5e5431a05159be5a4749977625210e9..4965533b593f46c3746e6b8b04f8fbef96a04002 100644 (file)
--- a/openldap/schema/inetorgperson.ldif
+++ b/openldap/schema/inetorgperson.ldif
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2015 The OpenLDAP Foundation.
+## Copyright 1998-2016 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without

diff --git a/openldap/schema/inetorgperson.schema b/openldap/schema/inetorgperson.schema
index 24c242106dd93ff37e4985e9293e6b37acba72a8..4a7077e6f2c7ca5b87ed3091dd88d7930d898120 100644 (file)
--- a/openldap/schema/inetorgperson.schema
+++ b/openldap/schema/inetorgperson.schema
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2015 The OpenLDAP Foundation.
+## Copyright 1998-2016 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without

diff --git a/openldap/schema/java.ldif b/openldap/schema/java.ldif
index e39723d8b265c81a014025ad41331fa22769cb4f..1c06d225a6abcc022b53a0ea7be391554316e5c6 100644 (file)
--- a/openldap/schema/java.ldif
+++ b/openldap/schema/java.ldif
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2015 The OpenLDAP Foundation.
+## Copyright 1998-2016 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without

diff --git a/openldap/schema/java.schema b/openldap/schema/java.schema
index bb9c01c167c8faff56b5d116b805bc57708497c9..f171d5793132f5802a77593ca7c565173861ad5d 100644 (file)
--- a/openldap/schema/java.schema
+++ b/openldap/schema/java.schema
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2015 The OpenLDAP Foundation.
+## Copyright 1998-2016 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without

diff --git a/openldap/schema/misc.ldif b/openldap/schema/misc.ldif
index 5117fd24d75cf1cb1ff94174c1c1aa1cef7e5105..8a7d2691364a3dc443ecc26a39f6915381269d74 100644 (file)
--- a/openldap/schema/misc.ldif
+++ b/openldap/schema/misc.ldif
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2015 The OpenLDAP Foundation.
+## Copyright 1998-2016 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without

diff --git a/openldap/schema/misc.schema b/openldap/schema/misc.schema
index e636135590d24443df72adc3653d949df7b7ccd6..f01118f1fbea783b673bfbcc127b11cc6f9deb35 100644 (file)
--- a/openldap/schema/misc.schema
+++ b/openldap/schema/misc.schema
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2015 The OpenLDAP Foundation.
+## Copyright 1998-2016 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without

diff --git a/openldap/schema/nis.ldif b/openldap/schema/nis.ldif
index 9d7f19c0fb22c7a3016fa28aff0c20d800467ce9..9cc7267e33b30856f46b4f937ce4913c501b3caa 100644 (file)
--- a/openldap/schema/nis.ldif
+++ b/openldap/schema/nis.ldif
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2015 The OpenLDAP Foundation.
+## Copyright 1998-2016 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without

diff --git a/openldap/schema/nis.schema b/openldap/schema/nis.schema
index 6e83c7e6e7725779771f9e25d7346b7865af3ceb..7d8e1c3d838134ae87094be8715b9eb479b2c43e 100644 (file)
--- a/openldap/schema/nis.schema
+++ b/openldap/schema/nis.schema
@@ -1,7 +1,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2015 The OpenLDAP Foundation.
+## Copyright 1998-2016 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without

diff --git a/openldap/schema/openldap.ldif b/openldap/schema/openldap.ldif
index 79ccac5dd51ff110748bb0d3c2b19b4b5845ab4e..162496f6715223144fda08423877a3e8daceffdd 100644 (file)
--- a/openldap/schema/openldap.ldif
+++ b/openldap/schema/openldap.ldif
@@ -1,7 +1,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2015 The OpenLDAP Foundation.
+## Copyright 1998-2016 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without

diff --git a/openldap/schema/openldap.schema b/openldap/schema/openldap.schema
index cd00946a0593644ac3b9f9f3e594c288238c0b2e..594fc8aa90caec6c1b5fb7419a1a48fb7a6628a9 100644 (file)
--- a/openldap/schema/openldap.schema
+++ b/openldap/schema/openldap.schema
@@ -1,7 +1,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2015 The OpenLDAP Foundation.
+## Copyright 1998-2016 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without

diff --git a/openldap/schema/pmi.ldif b/openldap/schema/pmi.ldif
index b2afb5df96014021fa529ac563525c1dc7a62bc7..8b2055a063ca3b8673bd22016a4181a239a03021 100644 (file)
--- a/openldap/schema/pmi.ldif
+++ b/openldap/schema/pmi.ldif
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2015 The OpenLDAP Foundation.
+## Copyright 1998-2016 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without

diff --git a/openldap/schema/pmi.schema b/openldap/schema/pmi.schema
index 5452a221ba5d1a01cd308a9997a30eb7a85782a0..2b4c706db9c497e7e00bc022a09b0fd96b6ba653 100644 (file)
--- a/openldap/schema/pmi.schema
+++ b/openldap/schema/pmi.schema
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2015 The OpenLDAP Foundation.
+## Copyright 1998-2016 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without

diff --git a/openldap/schema/ppolicy.ldif b/openldap/schema/ppolicy.ldif
index 759c96daae84fe99ff9ce37da59fb3125e45bf52..4695c839dd284514abe112958790f942b502a667 100644 (file)
--- a/openldap/schema/ppolicy.ldif
+++ b/openldap/schema/ppolicy.ldif
@@ -1,7 +1,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 2004-2015 The OpenLDAP Foundation.
+## Copyright 2004-2016 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without

diff --git a/openldap/schema/ppolicy.schema b/openldap/schema/ppolicy.schema
index 5cfe81b8bfbda920e2ca4ba680ea1d49122443b5..8c2540bda33fb8564cfc6a999b3034eff34a43a4 100644 (file)
--- a/openldap/schema/ppolicy.schema
+++ b/openldap/schema/ppolicy.schema
@@ -1,7 +1,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 2004-2015 The OpenLDAP Foundation.
+## Copyright 2004-2016 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without