saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index fab48a524343204e06c530c2e47bfa244092daf8..54c1e3d05e193d72422a68731d2c631c58379ab3 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -578,8 +578,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 a15fb5af5009fbe531d42f1bd2400645c8bddc95..31255ad0661090c76612a5961d914226e5e6757b 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-2016 The OpenLDAP Foundation, Redwood City, California, USA
+Copyright 1998-2017 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 bacb9ef619df1a7e514c0a077cad9c5b34514a5b..3d23f04df47b35b46053033485099e327dffbc53 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-2016 The OpenLDAP Foundation.
+## Copyright 1998-2017 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 1c1b65ebfa155e17cd025ccfb40f6fc653bc519f..c63c0cd58d1f0e0f6be49ce4dfc543b3b30d5d1e 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-2016 The OpenLDAP Foundation.
+## Copyright 1998-2017 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 caa98c116be06e107e0395c4278648d48a2cfbb0..b558aab526ab3a2be50b3b4873cf0754b159bab5 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-2016 The OpenLDAP Foundation.
+## Copyright 1998-2017 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 e05ba13c823bc621db03a5ca36c8d0c4a2b137ed..5f836c35bfc18e497725a71f6019d5b7bc539945 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-2016 The OpenLDAP Foundation.
+## Copyright 1998-2017 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 7cc53c59f5c2e2a24eff14dd2b27122ed96bffdd..545a6fb36dc9e6c767aaaffe129e4f76e5152b1e 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-2016 The OpenLDAP Foundation.
+## Copyright 1998-2017 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 3ae58187ee9a8cd482847c5110304c67b45200fe..ccffc7a2bbba561819a5a91e5343bfc893a58947 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-2016 The OpenLDAP Foundation.
+## Copyright 1998-2017 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 a64e8b0b30850365198ce3d1e43d4e31b228464e..f8661f67e3b1f043f4fdae175ca97361bce47425 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-2016 The OpenLDAP Foundation.
+## Copyright 1998-2017 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 a270e5925ce66829c9d9894e2d9278fa36688bef..3b0bba10e73b64a1de35e7839dbd69a9f42c5ca6 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-2016 The OpenLDAP Foundation.
+## Copyright 1998-2017 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 418103025c2d802001aad4945611bb5190765e91..feb7a9b72fa9b30c403a6b3155fcea8df356a4d8 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-2016 The OpenLDAP Foundation.
+## Copyright 1998-2017 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 d450b356587c20299b4681e6e1b60333b09f0393..ed1750b5bdb0efff0e0d8fb34cecf28ae4ae4fd3 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-2016 The OpenLDAP Foundation.
+## Copyright 1998-2017 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 f54552a5c8cd156dc323f98152833de823982aa7..a466303e31dd34310afb67b234eff53240ae29b3 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-2016 The OpenLDAP Foundation.
+## Copyright 1998-2017 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 a4a246d17931927437fbb6ec4320e24237e3040f..bb64ab1ea0a475416f1f54f56b84b639e5d7f300 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-2016 The OpenLDAP Foundation.
+## Copyright 1998-2017 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 4965533b593f46c3746e6b8b04f8fbef96a04002..34256670a012469ad652ac5947cfceaff1e35ce8 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-2016 The OpenLDAP Foundation.
+## Copyright 1998-2017 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 4a7077e6f2c7ca5b87ed3091dd88d7930d898120..f27a5901aee91cd068ca19573800c7c03b08c710 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-2016 The OpenLDAP Foundation.
+## Copyright 1998-2017 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 1c06d225a6abcc022b53a0ea7be391554316e5c6..5abdf850791bc6e0d67f9a3aaf3b1ae8420d0911 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-2016 The OpenLDAP Foundation.
+## Copyright 1998-2017 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 f171d5793132f5802a77593ca7c565173861ad5d..72496f6e2fe3250b33d10ff5a7434ac45f9e6886 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-2016 The OpenLDAP Foundation.
+## Copyright 1998-2017 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 8a7d2691364a3dc443ecc26a39f6915381269d74..ffff5413221e8ac40039f55ba1b5e30e4e8d2545 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-2016 The OpenLDAP Foundation.
+## Copyright 1998-2017 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 f01118f1fbea783b673bfbcc127b11cc6f9deb35..970511c690e2cfc05e538b9fd90280aa365ec58b 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-2016 The OpenLDAP Foundation.
+## Copyright 1998-2017 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 9cc7267e33b30856f46b4f937ce4913c501b3caa..0badd9340b007c7e31e5447f29a0b9cb6a22fd66 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-2016 The OpenLDAP Foundation.
+## Copyright 1998-2017 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 7d8e1c3d838134ae87094be8715b9eb479b2c43e..53f9700a906832f1ca46aaafb5a8ca93106c8f7c 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-2016 The OpenLDAP Foundation.
+## Copyright 1998-2017 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 162496f6715223144fda08423877a3e8daceffdd..c6777f82c50fa18693909625b7ef42ed536be029 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-2016 The OpenLDAP Foundation.
+## Copyright 1998-2017 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 594fc8aa90caec6c1b5fb7419a1a48fb7a6628a9..d1dd2e79c8ae48d4aee78cafcb74a655fd008134 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-2016 The OpenLDAP Foundation.
+## Copyright 1998-2017 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 8b2055a063ca3b8673bd22016a4181a239a03021..a87e5fdacef8353814e434f4820e22351d7671a4 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-2016 The OpenLDAP Foundation.
+## Copyright 1998-2017 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 2b4c706db9c497e7e00bc022a09b0fd96b6ba653..cc21a58aadaf54445600ab2a51ade14597d509d0 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-2016 The OpenLDAP Foundation.
+## Copyright 1998-2017 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 4695c839dd284514abe112958790f942b502a667..64c5cda452ccf1d80eb5613442c6a8b11b6e8308 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-2016 The OpenLDAP Foundation.
+## Copyright 2004-2017 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 8c2540bda33fb8564cfc6a999b3034eff34a43a4..49071ac245ea5dbe79cf9c99a515542453658884 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-2016 The OpenLDAP Foundation.
+## Copyright 2004-2017 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without