[gentoo-commits] data/api:master commit in: files/mirrors/

[Robin H. Johnson]

commit: 6c8a270c8f844d447bda625ea0a7fcdedaf9c71d
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Wed Aug  7 05:01:55 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Wed Aug  7 05:02:22 2024 +
URL:https://gitweb.gentoo.org/data/api.git/commit/?id=6c8a270c

mirrors: HEANet has announced their mirror service will end in August.

Signed-off-by: Robin H. Johnson  gentoo.org>

 files/mirrors/distfiles.xml | 6 --
 files/mirrors/rsync.xml | 5 -
 2 files changed, 11 deletions(-)

diff --git a/files/mirrors/distfiles.xml b/files/mirrors/distfiles.xml
index 96622e0..d3e8cd6 100644
--- a/files/mirrors/distfiles.xml
+++ b/files/mirrors/distfiles.xml
@@ -311,12 +311,6 @@ vim: ft=xml et ts=2 sts=2 sw=2:
 
   
   
-
-  HEAnet - Ireland's National Education and Research Network
-  https://ftp.heanet.ie/mirrors/gentoo.org/
-  http://ftp.heanet.ie/mirrors/gentoo.org/
-  rsync://ftp.heanet.ie/mirrors/gentoo.org/
-
   
   
 

diff --git a/files/mirrors/rsync.xml b/files/mirrors/rsync.xml
index e175eaa..2fb65b6 100644
--- a/files/mirrors/rsync.xml
+++ b/files/mirrors/rsync.xml
@@ -126,11 +126,6 @@ vim: ft=xml et ts=2 sts=2 sw=2:
   Any available mirror - rsync.ie.gentoo.org
   rsync://rsync.ie.gentoo.org
 
-
-  HEAnet - Ireland's National Education and Research Network -
-   rsync1.ie.gentoo.org
-  rsync://rsync1.ie.gentoo.org
-
   
   
 

[gentoo-commits] repo/gentoo:master commit in: eclass/

[Robin H. Johnson]

commit: b341ff7d283ccc6186eeb29c21baaa22499baadc
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Aug 19 18:14:45 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Aug 19 18:17:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b341ff7d

virtualx.eclass: addpredict /dev/dri/ for Xvfb w/ mesa-24.2.0

Newer Mesa tries to access /dev/dri/ when used in Xvfb, and this
triggers a sandbox error; discovered and verified w/
sci-mathematics/fricas-1.3.11-r2.

Reference: 
https://public-inbox.gentoo.org/gentoo-dev/bb4927ba-5ced-3352-86bb-d87f37ceaab6 
 woodpecker.gentoo.org/T/#t
Signed-off-by: Robin H. Johnson  gentoo.org>

 eclass/virtualx.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
index 6e77cd662bdd..f7318eafc59e 100644
--- a/eclass/virtualx.eclass
+++ b/eclass/virtualx.eclass
@@ -113,6 +113,7 @@ virtx() {
export XAUTHORITY=
 
einfo "Starting Xvfb ..."
+   addpredict /dev/dri/ # Needed for Xvfb w/ >=mesa-24.2.0
 
debug-print "${FUNCNAME}: Xvfb -displayfd 1 ${xvfbargs[*]}"
local logfile=${T}/Xvfb.log

[gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/files/, net-nds/openldap/

[Robin H. Johnson]

commit: 783532d33df25206c20ecc175a6910ab6b0a29fb
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Aug 25 00:33:46 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Aug 25 00:56:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=783532d3

net-nds/openldap: get 2.4.x building again, with atexit fix from upstream

2.4.x series should be announced as end-of-life in Gentoo; to get
remaining consumers to migrate to the 2.5 or 2.6 series.

2.4.59-r2 does not build with GCC14, and 2.4.59-r3 builds with warnings,
some of which are downgraded from error.

atexit-fix ensures that consumers of the libraries do not segfault
during their cleanup.

Please note that 2.4.x does NOT consistently pass src_test at this time.

Closes: https://bugs.gentoo.org/show_bug.cgi?id=920380
Closes: https://bugs.gentoo.org/show_bug.cgi?id=882183
Signed-off-by: Robin H. Johnson  gentoo.org>

 .../files/openldap-2.4.59-atexit-fix.patch |  60 ++
 .../files/openldap-2.4.59-implicit-function.patch  |  41 +
 net-nds/openldap/openldap-2.4.59-r3.ebuild | 928 +
 3 files changed, 1029 insertions(+)

diff --git a/net-nds/openldap/files/openldap-2.4.59-atexit-fix.patch 
b/net-nds/openldap/files/openldap-2.4.59-atexit-fix.patch
new file mode 100644
index ..4ffee325275b
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.4.59-atexit-fix.patch
@@ -0,0 +1,60 @@
+Port upstream commit 337455eb3a66176cc3f66d2c663a72cc7b4178bd to 2.4.59.
+
+With 2.4.x, gentoo-infra saw crashes in nsscache during exit.
+This patch was later reverted upstream because it was not portable to AIX And
+was fixed in a different way in 2.5 & 2.6 releases.
+
+original 
https://github.com/openldap/openldap/commit/337455eb3a66176cc3f66d2c663a72cc7b4178bd
+revert: 
https://github.com/openldap/openldap/commit/5e13ef87a94491f9339dbca709db29e76741f1a9
+AIX discussion: https://bugs.openldap.org/show_bug.cgi?id=10176
+diff '--color=auto' -NuarwbB --exclude '*.rej' --exclude '*.orig' 
openldap-2.4.59.orig/libraries/libldap/init.c 
openldap-2.4.59/libraries/libldap/init.c
+--- openldap-2.4.59.orig/libraries/libldap/init.c  2021-06-03 
11:40:31.0 -0700
 openldap-2.4.59/libraries/libldap/init.c   2024-08-24 11:15:06.727326650 
-0700
+@@ -508,9 +508,6 @@
+   gopts->ldo_def_sasl_authcid = NULL;
+   }
+ #endif
+-#ifdef HAVE_TLS
+-  ldap_int_tls_destroy( gopts );
+-#endif
+ }
+
+ /*
+diff '--color=auto' -NuarwbB --exclude '*.rej' --exclude '*.orig' 
openldap-2.4.59.orig/libraries/libldap/tls2.c 
openldap-2.4.59/libraries/libldap/tls2.c
+--- openldap-2.4.59.orig/libraries/libldap/tls2.c  2024-08-24 
11:14:46.910678897 -0700
 openldap-2.4.59/libraries/libldap/tls2.c   2024-08-24 11:15:38.103963402 
-0700
+@@ -155,6 +155,14 @@
+   tls_imp->ti_tls_destroy();
+ }
+
++static void
++ldap_exit_tls_destroy( void )
++{
++  struct ldapoptions *lo = LDAP_INT_GLOBAL_OPT();
++
++  ldap_int_tls_destroy( lo );
++}
++
+ /*
+  * Initialize a particular TLS implementation.
+  * Called once per implementation.
+@@ -163,6 +171,7 @@
+ tls_init(tls_impl *impl )
+ {
+   static int tls_initialized = 0;
++  int rc;
+
+   if ( !tls_initialized++ ) {
+ #ifdef LDAP_R_COMPILE
+@@ -175,7 +184,10 @@
+ #ifdef LDAP_R_COMPILE
+   impl->ti_thr_init();
+ #endif
+-  return impl->ti_tls_init();
++  rc = impl->ti_tls_init();
++
++  atexit( ldap_exit_tls_destroy );
++  return rc;
+ }
+
+ /*

diff --git a/net-nds/openldap/files/openldap-2.4.59-implicit-function.patch 
b/net-nds/openldap/files/openldap-2.4.59-implicit-function.patch
new file mode 100644
index ..ec7775c99dfa
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.4.59-implicit-function.patch
@@ -0,0 +1,41 @@
+--- openldap-2.4.59/servers/slapd/back-meta/conn.c 2021-06-03 
11:40:31.0 -0700
 openldap-2.4.59/servers/slapd/back-meta/conn.c 2024-08-24 
14:22:31.677357359 -0700
+@@ -31,6 +31,7 @@
+ 
+ #define AVL_INTERNAL
+ #include "slap.h"
++#include "proto-slap.h"
+ #include "../back-ldap/back-ldap.h"
+ #include "back-meta.h"
+ 
+--- openldap-2.4.59/servers/slapd/back-ldap/bind.c 2021-06-03 
11:40:31.0 -0700
 openldap-2.4.59/servers/slapd/back-ldap/bind.c 2024-08-24 
14:22:13.340701355 -0700
+@@ -31,6 +31,7 @@
+ 
+ #define AVL_INTERNAL
+ #include "slap.h"
++#include "proto-slap.h"
+ #include "back-ldap.h"
+ #include "lutil.h"
+ #include "lutil_ldap.h"
+--- openldap-2.4.59/servers/slapd/config.c 2021-06-03 11:40:31.0 
-0700
 openldap-2.4.59/servers/slapd/config.c 2024-08-24 14:22:13.414034645 
-0700
+@@ -43,6 +43,7 @@
+ #endif
+ 
+ #include "slap.h"
++#include "proto-slap.h"
+ #ifdef LDAP_SLAPI
+ #include "slapi/

[gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/

[Robin H. Johnson]

commit: 7d86c9da1effdbc18444b00ff438859a20d7256e
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Aug 25 00:45:39 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Aug 25 00:56:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d86c9da

net-nds/openldap: bump; passes src_test

Signed-off-by: Robin H. Johnson  gentoo.org>

 net-nds/openldap/Manifest   |   2 +
 net-nds/openldap/openldap-2.5.18.ebuild | 868 +++
 net-nds/openldap/openldap-2.6.8.ebuild  | 875 
 3 files changed, 1745 insertions(+)

diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 987dc7f896b3..13fcc87211c3 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,8 +1,10 @@
 DIST openldap-2.4.59.tgz 5886272 BLAKE2B 
a2a8bed1d2af97fd41d651668152fd4740871bc5a8abf4b50390839228af82ac103346b3500ae0f8dd31b708acabb30435b90cd48dfafe510e648df5150d96b8
 SHA512 
233459ab446da6e107a7fc4ecd5668d6b08c11a11359ee76449550393e8f586a29b59d7ae09a050a1fca4fcf388ea61438ef60831b3ae802d92c048365ae3968
 DIST openldap-OPENLDAP_REL_ENG_2_5_14.tar.bz2 5024359 BLAKE2B 
ffdffbd47e76545c2dc2d433d290945ab6eebd910031a60249cd8f6eac24f67841098e61c7e57864428e20a183a46d36dac422bba8cf6f3596f97439875af96b
 SHA512 
abd1e8bda0762500db028f283fe2da9480a419072927295d6f3e1448cae130592511f385a87585843cf88217417c90ef57174ca919cfcf163eb41642a72bb4e3
 DIST openldap-OPENLDAP_REL_ENG_2_5_16.tar.bz2 5022608 BLAKE2B 
829e416e3cf92d36df0d6642e44083f9b288ef9c3743a84aef3f03cdf7b08b21ea45231653a2659fe0da285ca47a346d336d02c8e0dda21f039fb9e49630262b
 SHA512 
629b92e275b69a540b200e61165492a4706afdf7b15d21bfe2f1fd4c338ecf397ad0c918e36dcef54d1f0cede2f039a8f73d4735f00e892d64ce9a177d490a07
+DIST openldap-OPENLDAP_REL_ENG_2_5_18.tar.bz2 5026131 BLAKE2B 
0f1a00995bd880b3ee42c4de2c3a405ebb7969de253f4b3866eb46c1856b61539ed7e1133a1b11636efc1da1ed5fc6cae53da60b22ab31486518000d34ff6324
 SHA512 
77a84950c905d2a4bd25f93108eb79f1416689176531246f12b4c3f6e8e3fe689504cd3f9875142e9bf665306a622ac8fe7e6b39aa4be67099f0965a16634526
 DIST openldap-OPENLDAP_REL_ENG_2_6_3.tar.gz 6244895 BLAKE2B 
97792a1b368de44867b0ce9eef38601c3e64b7d40e4ca206295bee110097697c919040d2220eea6f0581812e09a2cc3e6afb4a243a5072a8a0a95f24f9fb354b
 SHA512 
1c882a0cd0729b5d0f40b58588d0e36ae3b1cae6d569f0576e940c7c63d03c29ed2c9db87695a87594ba99a927ef4cba491bddba3ce049025fd5883463122ba7
 DIST openldap-OPENLDAP_REL_ENG_2_6_4.tar.bz2 5043227 BLAKE2B 
9bec77dbace0e52d1607d9ac13a77349e7d0b8876aa81fa635893638d00db58ec6bf8412f11fd266bba0440887be1aa21eb4a876122152f7f6de9fd8f75b6b4c
 SHA512 
bff11bf1ae125bcabbd307f6c4e1c102a8df6f1091f84f5e7053fdbaa89ccd6aa0c86cc8dcce4fb9b6ffd853b5f8d3c933733f5713aeb4d6a9d77ab145293b48
 DIST openldap-OPENLDAP_REL_ENG_2_6_5.tar.bz2 5040569 BLAKE2B 
d1835e560a81bc3df2eb44964162306057ad28869a1e41da7ab823460b4a33437cd385ec9448a6df9bc580afd04dff5c4680e0b91a2f16960ad2c5f3812410ba
 SHA512 
d259ca5ac8fbdcf9bb477e24c0feaf05678ab660007164a54463a954f1b26c3f9740855d16155fa249adcb2652223fdcfc682bb4005b46a5f36e2d5cae37f158
 DIST openldap-OPENLDAP_REL_ENG_2_6_6.tar.bz2 5040213 BLAKE2B 
2497b6698344674a9e8db5f2f2531541167065bb8ac9f512ecdb9349115140d5e83daef9b489e244eee08445de57599ddcfeeed71d4aab41edc58a3092910925
 SHA512 
3c235ff7b26f753afeb0176e95ecbf6a353bf76f00935c091323366bf97289f628d4d7b4ae3e2a31fe0797715d6c69e6704967dc79ccbae7add3023e226ad73b
+DIST openldap-OPENLDAP_REL_ENG_2_6_8.tar.bz2 5065637 BLAKE2B 
d55345c11bd8892a594c3f7114cd1368e017c2e29997da7a80bdd915308d498f62dfb5cc3a3360b50df78ef5f90a48a566a8ce3ace85ebf9aa6b288a37c4eff2
 SHA512 
556d1377afc73a84ee325c4d7bcc8446def936b67d3f07df4bd2a243ff30f268c5c0c298977482df1e1a86b2b7a0cd7846fc1f51d706748d39f67f5d621ccc04
 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 
98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99
 SHA512 
83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e

diff --git a/net-nds/openldap/openldap-2.5.18.ebuild 
b/net-nds/openldap/openldap-2.5.18.ebuild
new file mode 100644
index ..41d46debc6b3
--- /dev/null
+++ b/net-nds/openldap/openldap-2.5.18.ebuild
@@ -0,0 +1,868 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Re cleanups:
+# 2.5.x is an LTS release so we want to keep it for a while.
+
+inherit autotools flag-o-matic multilib multilib-minimal preserve-libs 
ssl-cert toolchain-funcs systemd tmpfiles
+
+MY_PV="$(ver_rs 1-2 _)"
+
+BIS_PN=rfc2307bis.schema
+BIS_PV=20140524
+BIS_P="${BIS_PN}-${BIS_PV}"
+
+DESCRIPTION="LDAP suite of application and development tools"
+HOMEPAGE="https://www.openldap.org/";
+SRC_URI="
+   
https://gitlab.com/openldap/${PN}/-/archive/OPENLDAP_REL_ENG_${MY_PV}/${PN}-OPENLDAP_RE

[gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/files/, net-nds/openldap/

[Robin H. Johnson]

commit: 5fffb10e6238d9e572ce84bb2b6fdd922eacdfcf
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Aug 25 18:02:30 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Aug 25 20:00:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fffb10e

net-nds/openldap: fix more -Werror=incompatible-pointer-types cases

Signed-off-by: Robin H. Johnson  gentoo.org>
Closes: https://bugs.gentoo.org/show_bug.cgi?id=933875

 .../openldap-2.6.x-gnutls-pointer-error.patch  | 40 
 .../files/openldap-2.6.x-slapd-pointer-types.patch | 71 ++
 net-nds/openldap/openldap-2.5.18.ebuild|  4 +-
 net-nds/openldap/openldap-2.6.6-r2.ebuild  |  2 +
 net-nds/openldap/openldap-2.6.8.ebuild |  4 +-
 5 files changed, 119 insertions(+), 2 deletions(-)

diff --git a/net-nds/openldap/files/openldap-2.6.x-gnutls-pointer-error.patch 
b/net-nds/openldap/files/openldap-2.6.x-gnutls-pointer-error.patch
new file mode 100644
index ..e6ab4e5a46cb
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.6.x-gnutls-pointer-error.patch
@@ -0,0 +1,40 @@
+From 634017950c1c920d0de63fffa5c52e621de1d603 Mon Sep 17 00:00:00 2001
+From: Wang Mingyu 
+Date: Wed, 26 Jun 2024 07:41:01 +
+Subject: Fix incompatible pointer type error with gcc option
+ -Wincompatible-pointer-types
+
+lib32-openldap do_compile failure with gcc-14:
+| tls_g.c:971:57: error: passing argument 4 of 'gnutls_fingerprint' from 
incompatible pointer type [-Wincompatible-pointer-types]
+|   971 | keyhash.bv_val, 
&keyhash.bv_len ) < 0 ) {
+|   | 
^~~
+|   | |
+|   | ber_len_t * 
{aka long unsigned int *}
+| In file included from tls_g.c:44:
+| /usr/include/gnutls/gnutls.h:2406:32: note: expected 'size_t *' {aka 
'unsigned int *'} but argument is of type 'ber_len_t *' {aka 'long unsigned int 
*'}
+|  2406 |size_t *result_size);
+|   |^~~
+
+Upstream-Status: Submitted
+
+Signed-off-by: Wang Mingyu 
+---
+ libraries/libldap/tls_g.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libraries/libldap/tls_g.c b/libraries/libldap/tls_g.c
+index 7c23875..b4b487d 100644
+--- a/libraries/libldap/tls_g.c
 b/libraries/libldap/tls_g.c
+@@ -968,7 +968,7 @@ tlsg_session_pinning( LDAP *ld, tls_session *sess, char 
*hashalg, struct berval
+   keyhash.bv_len = gnutls_hash_get_len( alg );
+   keyhash.bv_val = LDAP_MALLOC( keyhash.bv_len );
+   if ( !keyhash.bv_val || gnutls_fingerprint( alg, &key,
+-  keyhash.bv_val, &keyhash.bv_len ) < 0 ) 
{
++  keyhash.bv_val, (size_t 
*)&keyhash.bv_len ) < 0 ) {
+   goto done;
+   }
+   } else {
+-- 
+2.34.1
+

diff --git a/net-nds/openldap/files/openldap-2.6.x-slapd-pointer-types.patch 
b/net-nds/openldap/files/openldap-2.6.x-slapd-pointer-types.patch
new file mode 100644
index ..9f79048645d6
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.6.x-slapd-pointer-types.patch
@@ -0,0 +1,71 @@
+# 
https://git.openldap.org/openldap/openldap/-/commit/fb9e6a81bbee880549e7ec18f0a74bd2d1ab.patch
+From fb9e6a81bbee880549e7ec18f0a74bd2d1ab Mon Sep 17 00:00:00 2001
+From: Stephen Gallagher 
+Date: Tue, 6 Feb 2024 21:38:24 -0500
+Subject: [PATCH] ITS#10171 - Explicitly cast private values
+
+Fixes issues with -Werror=incompatible-pointer-types
+
+Signed-off-by: Stephen Gallagher 
+---
+ servers/slapd/config.c  | 2 +-
+ servers/slapd/overlays/constraint.c | 2 +-
+ servers/slapd/overlays/dyngroup.c   | 2 +-
+ servers/slapd/overlays/valsort.c| 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/servers/slapd/config.c b/servers/slapd/config.c
+index 80333f359c..987c862d91 100644
+--- a/servers/slapd/config.c
 b/servers/slapd/config.c
+@@ -151,7 +151,7 @@ int config_check_vals(ConfigTable *Conf, ConfigArgs *c, 
int check_only ) {
+   int rc, arg_user, arg_type, arg_syn, iarg;
+   unsigned uiarg;
+   long larg;
+-  size_t ularg;
++  unsigned long ularg;
+   ber_len_t barg;
+   
+   if(Conf->arg_type == ARG_IGNORED) {
+diff --git a/servers/slapd/overlays/constraint.c 
b/servers/slapd/overlays/constraint.c
+index f939b37762..0d6156af4d 100644
+--- a/servers/slapd/overlays/constraint.c
 b/servers/slapd/overlays/constraint.c
+@@ -557,7 +557,7 @@ done:;
+   a2->restrict_filter = ap.restrict_filter;
+   a2->restrict_val = ap.restrict_val;
+ 
+- 

[gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/

[Robin H. Johnson]

commit: a6311ebbdd9edc68c6e1590ca3d0b3928a4847ba
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Aug 25 20:00:15 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Aug 25 20:00:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6311ebb

net-nds/openldap: cleanup unused empty dir

Signed-off-by: Robin H. Johnson  gentoo.org>
Closes: https://bugs.gentoo.org/926725

 net-nds/openldap/openldap-2.6.6-r2.ebuild | 1 +
 net-nds/openldap/openldap-2.6.8.ebuild| 1 +
 2 files changed, 2 insertions(+)

diff --git a/net-nds/openldap/openldap-2.6.6-r2.ebuild 
b/net-nds/openldap/openldap-2.6.6-r2.ebuild
index f63e7a4effc9..fd2f6205da49 100644
--- a/net-nds/openldap/openldap-2.6.6-r2.ebuild
+++ b/net-nds/openldap/openldap-2.6.6-r2.ebuild
@@ -817,6 +817,7 @@ multilib_src_install() {
 multilib_src_install_all() {
dodoc ANNOUNCEMENT CHANGES COPYRIGHT README
docinto rfc ; dodoc doc/rfc/*.txt
+   rmdir -p "${D}"/var/openldap-lloadd # Created but not used by any part 
of current codebase.
 }
 
 pkg_preinst() {

diff --git a/net-nds/openldap/openldap-2.6.8.ebuild 
b/net-nds/openldap/openldap-2.6.8.ebuild
index d8034c51fae3..894ea2a9ae3a 100644
--- a/net-nds/openldap/openldap-2.6.8.ebuild
+++ b/net-nds/openldap/openldap-2.6.8.ebuild
@@ -821,6 +821,7 @@ multilib_src_install() {
 multilib_src_install_all() {
dodoc ANNOUNCEMENT CHANGES COPYRIGHT README
docinto rfc ; dodoc doc/rfc/*.txt
+   rmdir -p "${D}"/var/openldap-lloadd # Created but not used by any part 
of current codebase.
 }
 
 pkg_preinst() {

[gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/

[Robin H. Johnson]

commit: 7b3ab00f0043adb296acfac9135a4865dcab10ac
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Aug 25 20:12:19 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Aug 25 20:12:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b3ab00f

net-nds/openldap: QA trivial fix configure.in

Signed-off-by: Robin H. Johnson  gentoo.org>
Bug: https://bugs.gentoo.org/658674

 net-nds/openldap/openldap-2.4.59-r3.ebuild | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/net-nds/openldap/openldap-2.4.59-r3.ebuild 
b/net-nds/openldap/openldap-2.4.59-r3.ebuild
index 9de40ce840dd..367fb900d9bf 100644
--- a/net-nds/openldap/openldap-2.4.59-r3.ebuild
+++ b/net-nds/openldap/openldap-2.4.59-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -383,8 +383,12 @@ src_prepare() {
-e 's|/bin/sh|/bin/bash|g' \
-i tests/scripts/* || die "sed failed"
 
+   if test -e configure.in -a ! -e configure.ac ; then
+   mv -f configure.in configure.ac
+   fi
+
# Required for autoconf-2.70 #765043
-   sed 's@^AM_INIT_AUTOMAKE.*@AC_PROG_MAKE_SET@' -i configure.in || die
+   sed 's@^AM_INIT_AUTOMAKE.*@AC_PROG_MAKE_SET@' -i configure.ac || die
AT_NOEAUTOMAKE=yes eautoreconf
 }
 

[gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/

[Robin H. Johnson]

commit: 9fe404138fa2136da29108e542713187e5d13b75
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Aug 25 20:32:39 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Aug 25 20:34:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fe40413

net-nds/openldap: QA fix, false positive on strip

STRIP was already patched out in all the paths that actually generated
final objects or binaries, but that wasn't enough to stop the QA test
firing. Fix it a bit more (package output is identical).

Signed-off-by: Robin H. Johnson  gentoo.org>
Closes: https://bugs.gentoo.org/show_bug.cgi?id=840451

 net-nds/openldap/openldap-2.6.8.ebuild | 33 +
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/net-nds/openldap/openldap-2.6.8.ebuild 
b/net-nds/openldap/openldap-2.6.8.ebuild
index 894ea2a9ae3a..250d4ce0b66e 100644
--- a/net-nds/openldap/openldap-2.6.8.ebuild
+++ b/net-nds/openldap/openldap-2.6.8.ebuild
@@ -394,8 +394,11 @@ build_contrib_module() {
einfo "Compiling contrib-module: $1"
local target="${2:-all}"
emake \
-   LDAP_BUILD="${BUILD_DIR}" prefix="${EPREFIX}/usr" \
-   CC="${CC}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" \
+   CC="${CC}" \
+   LDAP_BUILD="${BUILD_DIR}" \
+   libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" \
+   prefix="${EPREFIX}/usr" \
+   STRIP=/bin/true \
"${target}"
popd &>/dev/null || die
 }
@@ -534,7 +537,9 @@ multilib_src_configure() {
 
tc-export AR CC CXX
 
-   ECONF_SOURCE="${S}" econf \
+   ECONF_SOURCE="${S}" \
+   STRIP=/bin/true \
+   econf \
--libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \
--localstatedir="${EPREFIX}"/var \
--runstatedir="${EPREFIX}"/run \
@@ -570,13 +575,19 @@ src_configure_cxx() {
append-ldflags -L"${BUILD_DIR}"/libraries/liblber/.libs 
-L"${BUILD_DIR}"/libraries/libldap/.libs
append-cppflags -I"${BUILD_DIR}"/include
 
-   ECONF_SOURCE="${S}"/contrib/ldapc++ econf "${myconf_ldapcpp[@]}"
+   ECONF_SOURCE="${S}"/contrib/ldapc++ \
+   STRIP=/bin/true \
+   econf \
+   "${myconf_ldapcpp[@]}"
popd &>/dev/null || die "popd contrib/ldapc++"
 }
 
 multilib_src_compile() {
tc-export AR CC CXX
-   emake CC="$(tc-getCC)" SHELL="${EPREFIX}"/bin/sh
+   emake \
+   CC="$(tc-getCC)" \
+   SHELL="${EPREFIX}"/bin/sh \
+   STRIP="/bin/true"
 
if ! use minimal && multilib_is_native_abi ; then
if use cxx ; then
@@ -614,8 +625,10 @@ multilib_src_compile() {
pushd "${S}/contrib/slapd-modules/samba4" &>/dev/null 
|| die "pushd contrib/slapd-modules/samba4"
 
emake \
+   CC="$(tc-getCC)" \
LDAP_BUILD="${BUILD_DIR}" \
-   CC="$(tc-getCC)" 
libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap"
+   
libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" \
+   STRIP=/bin/true
popd &>/dev/null || die
fi
 
@@ -695,8 +708,12 @@ multilib_src_test() {
 }
 
 multilib_src_install() {
-   emake CC="$(tc-getCC)" \
-   DESTDIR="${D}" SHELL="${EPREFIX}"/bin/sh install
+   emake \
+   CC="$(tc-getCC)" \
+   DESTDIR="${D}" \
+   SHELL="${EPREFIX}"/bin/sh \
+   STRIP=/bin/true \
+   install
 
if ! use minimal && multilib_is_native_abi; then
# openldap modules go here

[gentoo-commits] proj/elections:master commit in: council-202406/, trustees-202406/

[Robin H. Johnson]

commit: 4b7ca9c04c432c15b3882920141e056b486e0e3f
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Aug 31 22:09:44 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Aug 31 22:09:44 2024 +
URL:https://gitweb.gentoo.org/proj/elections.git/commit/?id=4b7ca9c0

feat: record casting voters for 202406 elections

Signed-off-by: Robin H. Johnson  gentoo.org>

 council-202406/casting-voters-council-202406   | 40 ++
 trustees-202406/casting-voters-trustees-202406 | 24 
 2 files changed, 64 insertions(+)

diff --git a/council-202406/casting-voters-council-202406 
b/council-202406/casting-voters-council-202406
new file mode 100644
index 000..767f624
--- /dev/null
+++ b/council-202406/casting-voters-council-202406
@@ -0,0 +1,40 @@
+ajak
+andrewammerlaan
+arkamar
+arsen
+arthurzam
+billie
+ceamac
+chewi
+conikost
+dilfridge
+dlan
+eras
+floppym
+flow
+grobian
+grozin
+hattya
+ionen
+jsmolic
+jstein
+kangie
+kumba
+lu_zero
+matsl
+matthew
+mattst88
+mgorny
+mjo
+mpagano
+neddyseagoon
+patrick
+rich0
+robbat2
+sam
+soap
+tamiko
+tomjbe
+tupone
+ulm
+xgqt

diff --git a/trustees-202406/casting-voters-trustees-202406 
b/trustees-202406/casting-voters-trustees-202406
new file mode 100644
index 000..9460479
--- /dev/null
+++ b/trustees-202406/casting-voters-trustees-202406
@@ -0,0 +1,24 @@
+ajak
+andrewammerlaan
+arsen
+arthurzam
+dilfridge
+eras
+floppym
+grobian
+hattya
+kumba
+lu_zero
+mattst88
+mgorny
+mpagano
+neddyseagoon
+patrick
+rich0
+robbat2
+sam
+soap
+tamiko
+tomjbe
+tupone
+ulm

[gentoo-commits] proj/elections:master commit in: completed/council-202306/, completed/council-202106/, completed/council-202206/, ...

[Robin H. Johnson]

commit: 602214965283e69cb5127cc4cb89eef3807369ad
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Aug 31 22:10:57 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Aug 31 22:10:57 2024 +
URL:https://gitweb.gentoo.org/proj/elections.git/commit/?id=60221496

feat: capture more casting-voters data

Signed-off-by: Robin H. Johnson  gentoo.org>

 .../casting-voters-basesystem-202108   | 10 +++
 .../casting-voters-basesystem-202205   | 10 +++
 .../council-202106/casting-voters-council-202106   | 73 ++
 .../council-202206/casting-voters-council-202206   | 64 +++
 .../council-202306/casting-voters-council-202306   | 50 +++
 .../casting-voters-metastructure-2023  | 52 +++
 .../security-202108/casting-voters-security-202108 |  5 ++
 7 files changed, 264 insertions(+)

diff --git a/completed/basesystem-202108/casting-voters-basesystem-202108 
b/completed/basesystem-202108/casting-voters-basesystem-202108
new file mode 100644
index 000..dcd9b12
--- /dev/null
+++ b/completed/basesystem-202108/casting-voters-basesystem-202108
@@ -0,0 +1,10 @@
+dilfridge
+floppym
+gyakovlev
+mattst88
+polynomial-c
+robbat2
+sam
+soap
+williamh
+zlogene

diff --git a/completed/basesystem-202205/casting-voters-basesystem-202205 
b/completed/basesystem-202205/casting-voters-basesystem-202205
new file mode 100644
index 000..29717c3
--- /dev/null
+++ b/completed/basesystem-202205/casting-voters-basesystem-202205
@@ -0,0 +1,10 @@
+chutzpah
+dilfridge
+floppym
+gyakovlev
+mattst88
+robbat2
+sam
+soap
+whissi
+williamh

diff --git a/completed/council-202106/casting-voters-council-202106 
b/completed/council-202106/casting-voters-council-202106
new file mode 100644
index 000..0130df1
--- /dev/null
+++ b/completed/council-202106/casting-voters-council-202106
@@ -0,0 +1,73 @@
+ago
+ajak
+alicef
+amadio
+anarchy
+andrewammerlaan
+andrey_utkin
+antarus
+billie
+bircoph
+bkohler
+bman
+chiitoo
+chutzpah
+conikost
+dabbott
+dilfridge
+dlan
+dolsen
+eras
+floppym
+fordfrog
+gokturk
+graaff
+grobian
+gyakovlev
+hattya
+heroxbd
+ionen
+jmbsvicetto
+juippis
+klausman
+klondike
+kumba
+leio
+lu_zero
+maekke
+marecki
+mattst88
+mgorny
+mjo
+mpagano
+mschiff
+neddyseagoon
+np-hardass
+pacho
+patrick
+perfinion
+pesa
+pinkbyte
+polynomial-c
+prometheanfire
+radhermit
+robbat2
+sam
+sbraz
+slashbeast
+slyfox
+soap
+steils
+sultan
+swegener
+tamiko
+tomjbe
+toralf
+tupone
+ulm
+voyageur
+whissi
+williamh
+wraeth
+zerochaos
+zlogene

diff --git a/completed/council-202206/casting-voters-council-202206 
b/completed/council-202206/casting-voters-council-202206
new file mode 100644
index 000..98eeaf7
--- /dev/null
+++ b/completed/council-202206/casting-voters-council-202206
@@ -0,0 +1,64 @@
+ajak
+alexxy
+alicef
+andrewammerlaan
+antarus
+arthurzam
+billie
+bircoph
+concord
+conikost
+dabbott
+dilfridge
+dlan
+eras
+floppym
+flow
+graaff
+grobian
+grozin
+gyakovlev
+hattya
+idl0r
+ionen
+jmbsvicetto
+john_r_graham
+jsmolic
+jstein
+juippis
+kensington
+kumba
+lu_zero
+maekke
+marecki
+matthew
+mattst88
+mgorny
+mjo
+mschiff
+neddyseagoon
+pacho
+patrick
+perfinion
+pinkbyte
+polynomial-c
+prometheanfire
+rich0
+robbat2
+sam
+sarnex
+sbraz
+soap
+stasibear
+sultan
+swegener
+tamiko
+tomjbe
+toralf
+tupone
+ulm
+voyageur
+whissi
+williamh
+xen0n
+zlogene

diff --git a/completed/council-202306/casting-voters-council-202306 
b/completed/council-202306/casting-voters-council-202306
new file mode 100644
index 000..e9beef0
--- /dev/null
+++ b/completed/council-202306/casting-voters-council-202306
@@ -0,0 +1,50 @@
+ago
+ajak
+amynka
+andrewammerlaan
+arsen
+arthurzam
+billie
+bircoph
+ceamac
+conikost
+dabbott
+dilfridge
+dlan
+eras
+flow
+graaff
+grobian
+grozin
+hattya
+ionen
+jmbsvicetto
+jsmolic
+juippis
+klondike
+leio
+lu_zero
+maekke
+marecki
+matsl
+matthew
+mattst88
+mgorny
+mjo
+neddyseagoon
+pacho
+patrick
+pinkbyte
+prometheanfire
+robbat2
+sam
+soap
+sultan
+swegener
+tamiko
+tomjbe
+toralf
+tupone
+ulm
+voyageur
+xen0n

diff --git a/completed/metastructure-2023/casting-voters-metastructure-2023 
b/completed/metastructure-2023/casting-voters-metastructure-2023
new file mode 100644
index 000..ccb82ef
--- /dev/null
+++ b/completed/metastructure-2023/casting-voters-metastructure-2023
@@ -0,0 +1,52 @@
+ajak
+andrewammerlaan
+arsen
+arthurzam
+bircoph
+ceamac
+cedk
+chewi
+chutzpah
+concord
+conikost
+dabbott
+dilfridge
+eras
+flow
+graaff
+grobian
+gyakovlev
+hattya
+ionen
+jmbsvicetto
+john_r_graham
+juippis
+kumba
+leio
+lu_zero
+maffblaster
+marecki
+matthew
+mattst88
+mgorny
+mjo
+mpagano
+mschiff
+mva
+neddyseagoon
+patrick
+perfinion
+pinkbyte
+ris
+robbat2
+sam
+soap
+sultan
+tomjbe
+toralf
+tupone
+ulm
+voyageur
+williamh
+xen0n
+xgqt

diff --git a/completed/security-202108/casting-voters-security-202108 
b/completed/security-202108/casting-voters-security-202108
new file mode 100

[gentoo-commits] proj/elections:master commit in: completed/trustees-202406/, completed/council-202406/, council-202406/, ...

[Robin H. Johnson]

commit: f0f29336525635817270f4c75bfb0528d33389fa
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Aug 31 22:10:02 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Aug 31 22:10:02 2024 +
URL:https://gitweb.gentoo.org/proj/elections.git/commit/?id=f0f29336

feat: archive completed 202406 elections

Signed-off-by: Robin H. Johnson  gentoo.org>

 {council-202406 => completed/council-202406}/Votify.pm| 0
 {council-202406 => completed/council-202406}/ballot-council-202406| 0
 .../council-202406}/casting-voters-council-202406 | 0
 {council-202406 => completed/council-202406}/election-details | 0
 {council-202406 => completed/council-202406}/officials-council-202406 | 0
 {council-202406 => completed/council-202406}/start-council-202406 | 0
 {council-202406 => completed/council-202406}/stop-council-202406  | 0
 {council-202406 => completed/council-202406}/voters-council-202406| 0
 {trustees-202406 => completed/trustees-202406}/Votify.pm  | 0
 {trustees-202406 => completed/trustees-202406}/ballot-trustees-202406 | 0
 .../trustees-202406}/casting-voters-trustees-202406   | 0
 {trustees-202406 => completed/trustees-202406}/election-details   | 0
 {trustees-202406 => completed/trustees-202406}/officials-trustees-202406  | 0
 {trustees-202406 => completed/trustees-202406}/start-trustees-202406  | 0
 {trustees-202406 => completed/trustees-202406}/stop-trustees-202406   | 0
 {trustees-202406 => completed/trustees-202406}/voters-trustees-202406 | 0
 16 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/council-202406/Votify.pm b/completed/council-202406/Votify.pm
similarity index 100%
rename from council-202406/Votify.pm
rename to completed/council-202406/Votify.pm

diff --git a/council-202406/ballot-council-202406 
b/completed/council-202406/ballot-council-202406
similarity index 100%
rename from council-202406/ballot-council-202406
rename to completed/council-202406/ballot-council-202406

diff --git a/council-202406/casting-voters-council-202406 
b/completed/council-202406/casting-voters-council-202406
similarity index 100%
rename from council-202406/casting-voters-council-202406
rename to completed/council-202406/casting-voters-council-202406

diff --git a/council-202406/election-details 
b/completed/council-202406/election-details
similarity index 100%
rename from council-202406/election-details
rename to completed/council-202406/election-details

diff --git a/council-202406/officials-council-202406 
b/completed/council-202406/officials-council-202406
similarity index 100%
rename from council-202406/officials-council-202406
rename to completed/council-202406/officials-council-202406

diff --git a/council-202406/start-council-202406 
b/completed/council-202406/start-council-202406
similarity index 100%
rename from council-202406/start-council-202406
rename to completed/council-202406/start-council-202406

diff --git a/council-202406/stop-council-202406 
b/completed/council-202406/stop-council-202406
similarity index 100%
rename from council-202406/stop-council-202406
rename to completed/council-202406/stop-council-202406

diff --git a/council-202406/voters-council-202406 
b/completed/council-202406/voters-council-202406
similarity index 100%
rename from council-202406/voters-council-202406
rename to completed/council-202406/voters-council-202406

diff --git a/trustees-202406/Votify.pm b/completed/trustees-202406/Votify.pm
similarity index 100%
rename from trustees-202406/Votify.pm
rename to completed/trustees-202406/Votify.pm

diff --git a/trustees-202406/ballot-trustees-202406 
b/completed/trustees-202406/ballot-trustees-202406
similarity index 100%
rename from trustees-202406/ballot-trustees-202406
rename to completed/trustees-202406/ballot-trustees-202406

diff --git a/trustees-202406/casting-voters-trustees-202406 
b/completed/trustees-202406/casting-voters-trustees-202406
similarity index 100%
rename from trustees-202406/casting-voters-trustees-202406
rename to completed/trustees-202406/casting-voters-trustees-202406

diff --git a/trustees-202406/election-details 
b/completed/trustees-202406/election-details
similarity index 100%
rename from trustees-202406/election-details
rename to completed/trustees-202406/election-details

diff --git a/trustees-202406/officials-trustees-202406 
b/completed/trustees-202406/officials-trustees-202406
similarity index 100%
rename from trustees-202406/officials-trustees-202406
rename to completed/trustees-202406/officials-trustees-202406

diff --git a/trustees-202406/start-trustees-202406 
b/completed/trustees-202406/start-trustees-202406
similarity index 100%
rename from trustees-202406/start-trustees-202406
rename to completed/trustees-202406/start-trustees-202406

diff --git a/trustees-202406/stop-trustees-202406 
b/comple

[gentoo-commits] repo/gentoo:master commit in: acct-user/ldap/

[Robin H. Johnson]

commit: eba96f0351b144597378396410ee6fa330a2daf4
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Jul 28 15:42:11 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Jul 28 15:44:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eba96f03

acct-user/ldap: set LDAP project as maintainer

Signed-off-by: Robin H. Johnson  gentoo.org>

 acct-user/ldap/metadata.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/acct-user/ldap/metadata.xml b/acct-user/ldap/metadata.xml
index 115e9d64a669..7f0918bba851 100644
--- a/acct-user/ldap/metadata.xml
+++ b/acct-user/ldap/metadata.xml
@@ -1,5 +1,7 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-   
+   
+   ldap-b...@gentoo.org
+   
 

[gentoo-commits] repo/gentoo:master commit in: acct-group/ldap/

[Robin H. Johnson]

commit: 73d4ba16b1352a47efd42784b5950ad96f00af38
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Jul 28 15:41:40 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Jul 28 15:44:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73d4ba16

acct-group/ldap: set LDAP project as maintainer

Signed-off-by: Robin H. Johnson  gentoo.org>

 acct-group/ldap/metadata.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/acct-group/ldap/metadata.xml b/acct-group/ldap/metadata.xml
index 115e9d64a669..7f0918bba851 100644
--- a/acct-group/ldap/metadata.xml
+++ b/acct-group/ldap/metadata.xml
@@ -1,5 +1,7 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-   
+   
+   ldap-b...@gentoo.org
+   
 

[gentoo-commits] proj/openrc:master commit in: sh/

[Robin H. Johnson]

commit: a0596076dd97a35f0dfb6d601bc12e2297f66c7f
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon May 26 06:51:37 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon May 26 06:51:44 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=a0596076

sh/tmpfiles.sh: license under 2-clause BSD

As the author of our tmpfiles.sh script, I hereby license it under
2-clause BSD, like the rest of openrc.

Signed-off-by: Robin H. Johnson  gentoo.org>

---
 sh/tmpfiles.sh.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sh/tmpfiles.sh.in b/sh/tmpfiles.sh.in
index a903163..6d4c614 100755
--- a/sh/tmpfiles.sh.in
+++ b/sh/tmpfiles.sh.in
@@ -3,10 +3,11 @@
 # Control creation, deletion, and cleaning of volatile and temporary files
 #
 # Copyright (c) 2012 Gentoo Foundation
+# Released under the 2-clause BSD license.
 #
-# This instance based on the Arch Linux version:
+# This instance is a pure-POSIX sh version, written by Robin H Johnson
+# , based on the Arch Linux version as of 2012/01/01:
 # http://projects.archlinux.org/initscripts.git/tree/arch-tmpfiles
-# As of 2012/01/01
 #
 # See the tmpfiles.d manpage as well:
 # http://0pointer.de/public/systemd-man/tmpfiles.d.html

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit: b845016361b81ec43a4d84a77077ba9390c23a0e
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Apr  6 01:35:01 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Apr  6 01:35:01 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=b8450163

Fix install with kernel outputdir.

Signed-off-by: Robin H. Johnson  gentoo.org>

---
 gen_compile.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gen_compile.sh b/gen_compile.sh
index aab2716..f10aa04 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -342,6 +342,9 @@ compile_kernel() {
then
gen_die "Cannot locate kernel binary"
fi
+   # if source != outputdir, we need this:
+   tmp_kernel_binary="${KERNEL_OUTPUTDIR}"/"${tmp_kernel_binary}"
+   tmp_kernel_binary2="${KERNEL_OUTPUTDIR}"/"${tmp_kernel_binary2}"
 
if isTrue "${CMD_INSTALL}"
then

[gentoo-commits] proj/genkernel: New branch: debug-build

[Robin H. Johnson]

commit: 
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun Apr 06 02:07:53 2014 +

New branch: debug-build

[gentoo-commits] proj/genkernel:debug-build commit in: /

[Robin H. Johnson]

commit: 5898cdcd94a03b344ec1da90102e90236975840e
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Apr 13 21:43:41 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Apr 13 21:43:41 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=5898cdcd

Fix MDADM_CONFIG missing message.

Signed-off-by: Robin H. Johnson  gentoo.org>

---
 gen_initramfs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 5ac9ac1..61f0c41 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -396,7 +396,7 @@ append_mdadm(){
cp -a "${MDADM_CONFIG}" 
"${TEMP}/initramfs-mdadm-temp/etc/mdadm.conf" \
|| gen_die "Could not copy mdadm.conf!"
else
-   gen_die 'sl${MDADM_CONFIG} does not exist!'
+   gen_die "${MDADM_CONFIG} does not exist!"
fi
else
print_info 1 '  MDADM: Skipping inclusion of 
mdadm.conf'

[gentoo-commits] proj/genkernel:debug-build commit in: /

[Robin H. Johnson]

commit: 4f0697afaa4a62ab391bafc604fe5cb17a73ef46
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Apr 13 21:43:25 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Apr 13 21:43:25 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=4f0697af

Fix LVM build as non-root.

Signed-off-by: Robin H. Johnson  gentoo.org>

---
 gen_compile.sh | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index f0f8fee..7e85a86 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -470,9 +470,8 @@ compile_lvm() {
print_info 1 'lvm: >> Compiling...'
compile_generic '' utils
compile_generic "install DESTDIR=${TEMP}/lvm/" utils
-   echo "Finding static"
-   find ${TEMP}/lvm -name '*static'
-   echo "Done finding static"
+   # For some bizzare reason, upstream does u-w on files, and this 
breaks stuff.
+   chmod -R u+w "${TEMP}/lvm/"
 
cd "${TEMP}/lvm"
mkdir -p "${TEMP}/lvm/sbin"
@@ -480,7 +479,6 @@ compile_lvm() {
pwd
${UTILS_CROSS_COMPILE}strip "sbin/lvm.static" ||
gen_die 'Could not strip lvm.static!'
-   exit 99
# See bug 382555
${UTILS_CROSS_COMPILE}strip "sbin/dmsetup.static" ||
gen_die 'Could not strip dmsetup.static'

[gentoo-commits] proj/genkernel:debug-build commit in: /

[Robin H. Johnson]

commit: 81b2d47d33f0973556e88975fbcc66b442c81764
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Apr 13 23:52:13 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Apr 13 23:52:13 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=81b2d47d

Force ownership of files in building initramfs.

---
 gen_initramfs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 61f0c41..070dffc 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -2,7 +2,7 @@
 # $Id$
 
 COPY_BINARIES=false
-CPIO_ARGS="--quiet -o -H newc"
+CPIO_ARGS="--quiet -o -H newc --owner root:root --force-local"
 
 # The copy_binaries function is explicitly released under the CC0 license to
 # encourage wide adoption and re-use.  That means:

[gentoo-commits] proj/genkernel:debug-build commit in: /

[Robin H. Johnson]

commit: 5b079a52bf439ee9af3edd25e6d0229fa97ce17d
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Apr 13 23:01:25 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Apr 13 23:01:25 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=5b079a52

Make it possible to turn off all of the on-exit cleanup.

Signed-off-by: Robin H. Johnson  gentoo.org>

---
 gen_cmdline.sh   |  6 ++
 gen_determineargs.sh |  1 +
 genkernel| 37 ++---
 3 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 715ad49..7bee618 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -22,6 +22,8 @@ longusage() {
   echo "   --logfile= Output file for debug info"
   echo "   --color Output debug in color"
   echo "   --no-color  Do not output debug in color"
+  echo "   --debug-cleanup Clean up temporary build directories on exit"
+  echo "   --no-debug-cleanup  Do not remove any temporary directories 
on exit"
   echo "  Kernel Configuration settings"
   echo "   --menuconfigRun menuconfig after oldconfig"
   echo "   --no-menuconfig Do not run menuconfig after oldconfig"
@@ -471,6 +473,10 @@ parse_cmdline() {
print_info 2 "USECOLOR: ${USECOLOR}"
setColorVars
;;
+   --debug-cleanup|--no-debug-cleanup)
+   CMD_DEBUGCLEANUP=`parse_optbool "$*"`
+   print_info 2 "DEBUGCLEANUP: ${DEBUGCLEANUP}"
+   ;;
--logfile=*)
CMD_LOGFILE=`parse_opt "$*"`
LOGFILE=`parse_opt "$*"`

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index e0c9984..615f274 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -136,6 +136,7 @@ determine_real_args() {
set_config_with_override BOOL   DOKEYMAPAUTO CMD_DOKEYMAPAUTO
set_config_with_override STRING BUSYBOX_CONFIG   CMD_BUSYBOX_CONFIG
set_config_with_override BOOL   INSTALL  CMD_INSTALL
  "yes"
+   set_config_with_override BOOL   DEBUGCLEANUP CMD_DEBUGCLEANUP   
  "yes"
 
BOOTDIR=`arch_replace "${BOOTDIR}"`
BOOTDIR=${BOOTDIR%/}# Remove any trailing slash

diff --git a/genkernel b/genkernel
index b62c3f7..f10cd49 100755
--- a/genkernel
+++ b/genkernel
@@ -61,21 +61,28 @@ trap_cleanup(){
 }
 
 cleanup(){
-if [ -n "$TEMP" -a -d "$TEMP" ]; then
-   rm -rf "$TEMP"
-fi
-
-if isTrue ${POSTCLEAR}
-then
-   echo
-   print_info 1 'RUNNING FINAL CACHE/TMP CLEANUP'
-   print_info 1 "CACHE_DIR: ${CACHE_DIR}"
-   CLEAR_CACHE_DIR='yes'
-   setup_cache_dir
-   echo
-   print_info 1 "TMPDIR: ${TMPDIR}"
-   clear_tmpdir
-   fi
+   if [ "${CMD_DEBUGCLEANUP}" == "no" ]; then
+   print_info 1 "Not running any cleanup per DEBUGCLEANUP"
+   print_info 1 "TEMP: ${TEMP}"
+   print_info 1 "CACHE_DIR: ${CACHE_DIR}"
+   print_info 1 "TMPDIR: ${TMPDIR}"
+   else
+   if [ -n "$TEMP" -a -d "$TEMP" ]; then
+   rm -rf "$TEMP"
+   fi
+
+   if isTrue ${POSTCLEAR}
+   then
+   echo
+   print_info 1 'RUNNING FINAL CACHE/TMP CLEANUP'
+   print_info 1 "CACHE_DIR: ${CACHE_DIR}"
+   CLEAR_CACHE_DIR='yes'
+   setup_cache_dir
+   echo
+   print_info 1 "TMPDIR: ${TMPDIR}"
+   clear_tmpdir
+   fi
+   fi
 }
 
 trap trap_cleanup SIGHUP SIGQUIT SIGINT SIGTERM SIGKILL

[gentoo-commits] proj/genkernel:debug-build commit in: defaults/

[Robin H. Johnson]

commit: a02ef6d249ea90eeda05c8857d093a33cef8f5b8
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Apr 13 23:52:37 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Apr 13 23:52:37 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=a02ef6d2

More device nodes.

Signed-off-by: Robin H. Johnson  gentoo.org>

---
 defaults/linuxrc | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index ed808e4..6401614 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -434,8 +434,10 @@ then
chmod 755 "${NEW_ROOT}/${i}"
done
[ ! -d "${CDROOT_PATH}" ] && mkdir -p "${CDROOT_PATH}"
-   [ ! -e "${NEW_ROOT}/dev/null" ] && mknod "${NEW_ROOT}"/dev/null c 1 3
-   [ ! -e "${NEW_ROOT}/dev/console" ] && mknod "${NEW_ROOT}"/dev/console c 
5 1
+   [ ! -e "${NEW_ROOT}/dev/null" ] && mknod -m 660 "${NEW_ROOT}"/dev/null 
c 1 3
+   [ ! -e "${NEW_ROOT}/dev/zero" ] && mknod -m 660 "${NEW_ROOT}"/dev/zero 
c 1 5
+   [ ! -e "${NEW_ROOT}/dev/console" ] && mknod -m 660 
"${NEW_ROOT}"/dev/console c 5 1
+   [ ! -e "${NEW_ROOT}/dev/ttyS0" ] && mknod -m 600 
"${NEW_ROOT}"/dev/ttyS0 c 4 64
 
# For SGI LiveCDs ...
if [ "${LOOPTYPE}" = "sgimips" ]
@@ -446,10 +448,9 @@ then
 
# Required for splash to work.  Not an issue with the initrd as this
# device isn't created there and is not needed.
-   if [ -e /dev/tty1 ]
-   then
-   [ ! -e "${NEW_ROOT}/dev/tty1" ] && mknod "${NEW_ROOT}/dev/tty1" 
c 4 1
-   fi
+   for minor in 0 1 ; do
+   [ ! -e "${NEW_ROOT}/dev/$minor" ] && mknod -m 600 
"${NEW_ROOT}/dev/tty$minor" c 4 $minor
+   done
 
if [ "${REAL_ROOT}" != "/dev/nfs" ] && [ "${LOOPTYPE}" != "sgimips" ]
then

[gentoo-commits] proj/genkernel:debug-build commit in: /

[Robin H. Johnson]

commit: cf40f8d5d5bc9bf46e2b87e9545e3e24523f4ead
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Apr 14 00:47:38 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Apr 14 00:47:38 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=cf40f8d5

Detect mknod failure.

Signed-off-by: Robin H. Johnson  gentoo.org>

---
 gen_initramfs.sh | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 070dffc..d5ee5f6 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -89,12 +89,13 @@ append_base_layout() {
echo "proc  /proc   procdefaults0 0" >> 
${TEMP}/initramfs-base-temp/etc/fstab
 
cd ${TEMP}/initramfs-base-temp/dev
-   mknod -m 660 console c 5 1
-   mknod -m 660 null c 1 3
-   mknod -m 660 zero c 1 5
-   mknod -m 600 tty0 c 4 0
-   mknod -m 600 tty1 c 4 1
-   mknod -m 600 ttyS0 c 4 64
+   # TODO: this will fail as non-root
+   mknod -m 660 console c 5 1 || gen_die "failed to mknod"
+   mknod -m 660 null c 1 3 || gen_die "failed to mknod"
+   mknod -m 660 zero c 1 5 || gen_die "failed to mknod"
+   mknod -m 600 tty0 c 4 0 || gen_die "failed to mknod"
+   mknod -m 600 tty1 c 4 1 || gen_die "failed to mknod"
+   mknod -m 600 ttyS0 c 4 64 || gen_die "failed to mknod"
 
date -u '+%Y%m%d-%H%M%S' > ${TEMP}/initramfs-base-temp/etc/build_date
echo "Genkernel $GK_V" > ${TEMP}/initramfs-base-temp/etc/build_id

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit: dfbf55f690e21637786023777a216c6a6040dcac
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Apr 14 00:54:36 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Apr 14 00:54:36 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=dfbf55f6

Fix System.map location for src!=output dir.

Signed-off-by: Robin H. Johnson  gentoo.org>

---
 gen_compile.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index f10aa04..a90977f 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -345,6 +345,7 @@ compile_kernel() {
# if source != outputdir, we need this:
tmp_kernel_binary="${KERNEL_OUTPUTDIR}"/"${tmp_kernel_binary}"
tmp_kernel_binary2="${KERNEL_OUTPUTDIR}"/"${tmp_kernel_binary2}"
+   systemmap="${KERNEL_OUTPUTDIR}"/System.map
 
if isTrue "${CMD_INSTALL}"
then
@@ -353,7 +354,7 @@ compile_kernel() {
"kernel-${KNAME}-${ARCH}-${KV}"
 
copy_image_with_preserve "System.map" \
-   "System.map" \
+   "${systemmap}" \
"System.map-${KNAME}-${ARCH}-${KV}"
 
if isTrue "${GENZIMAGE}"
@@ -365,7 +366,7 @@ compile_kernel() {
else
cp "${tmp_kernel_binary}" 
"${TMPDIR}/kernel-${KNAME}-${ARCH}-${KV}" ||
gen_die "Could not copy the kernel binary to ${TMPDIR}!"
-   cp "System.map" "${TMPDIR}/System.map-${KNAME}-${ARCH}-${KV}" ||
+   cp "${systemmap}" "${TMPDIR}/System.map-${KNAME}-${ARCH}-${KV}" 
||
gen_die "Could not copy System.map to ${TMPDIR}!"
if isTrue "${GENZIMAGE}"
then

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit: 209ceb7d07d9cb039ea2b3d52309a9bd6743e80a
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Apr 13 21:43:41 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Apr 14 00:59:30 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=209ceb7d

Fix MDADM_CONFIG missing message.

Signed-off-by: Robin H. Johnson  gentoo.org>

---
 gen_initramfs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 5ac9ac1..61f0c41 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -396,7 +396,7 @@ append_mdadm(){
cp -a "${MDADM_CONFIG}" 
"${TEMP}/initramfs-mdadm-temp/etc/mdadm.conf" \
|| gen_die "Could not copy mdadm.conf!"
else
-   gen_die 'sl${MDADM_CONFIG} does not exist!'
+   gen_die "${MDADM_CONFIG} does not exist!"
fi
else
print_info 1 '  MDADM: Skipping inclusion of 
mdadm.conf'

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit: 6d610cf9afd929e4c973780e1d37746ebf3d15ff
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Apr 14 00:55:25 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Apr 14 00:59:30 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=6d610cf9

LVM install fixes.

Clean up LVM install to work with non-root and handle errors.

Signed-off-by: Robin H. Johnson  gentoo.org>

---
 gen_compile.sh   | 7 +--
 gen_initramfs.sh | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index a90977f..9b5df01 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -468,8 +468,11 @@ compile_lvm() {
>> ${LOGFILE} 2>&1 || \
gen_die 'Configure of lvm failed!'
print_info 1 'lvm: >> Compiling...'
-   compile_generic '' utils
-   compile_generic "install DESTDIR=${TEMP}/lvm/" utils
+   compile_generic '' utils || gen_die "failed to build LVM"
+   mkdir -p "${TEMP}/lvm/sbin"
+   compile_generic "install DESTDIR=${TEMP}/lvm/" utils || gen_die 
"failed to install LVM"
+   # Upstream does u-w on files, and this breaks stuff.
+   chmod -R u+w "${TEMP}/lvm/"
 
cd "${TEMP}/lvm"
print_info 1 '  >> Copying to bincache...'

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 26bcdf6..5ac9ac1 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -349,7 +349,7 @@ append_lvm(){
fi
else
print_info 1 '  LVM: Adding support (compiling 
binaries)...'
-   compile_lvm
+   compile_lvm || gen_die "Could not compile LVM"
/bin/tar -jxpf "${LVM_BINCACHE}" -C 
"${TEMP}/initramfs-lvm-temp" ||
gen_die "Could not extract lvm binary cache!";
mv ${TEMP}/initramfs-lvm-temp/sbin/lvm.static 
${TEMP}/initramfs-lvm-temp/bin/lvm ||

[gentoo-commits] proj/genkernel:master commit in: defaults/

[Robin H. Johnson]

commit: a8ade8646371e78b95b067af49fdf3934f0efe31
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Apr 13 23:52:37 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Apr 14 00:59:31 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=a8ade864

More device nodes.

Signed-off-by: Robin H. Johnson  gentoo.org>

---
 defaults/linuxrc | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index ed808e4..6401614 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -434,8 +434,10 @@ then
chmod 755 "${NEW_ROOT}/${i}"
done
[ ! -d "${CDROOT_PATH}" ] && mkdir -p "${CDROOT_PATH}"
-   [ ! -e "${NEW_ROOT}/dev/null" ] && mknod "${NEW_ROOT}"/dev/null c 1 3
-   [ ! -e "${NEW_ROOT}/dev/console" ] && mknod "${NEW_ROOT}"/dev/console c 
5 1
+   [ ! -e "${NEW_ROOT}/dev/null" ] && mknod -m 660 "${NEW_ROOT}"/dev/null 
c 1 3
+   [ ! -e "${NEW_ROOT}/dev/zero" ] && mknod -m 660 "${NEW_ROOT}"/dev/zero 
c 1 5
+   [ ! -e "${NEW_ROOT}/dev/console" ] && mknod -m 660 
"${NEW_ROOT}"/dev/console c 5 1
+   [ ! -e "${NEW_ROOT}/dev/ttyS0" ] && mknod -m 600 
"${NEW_ROOT}"/dev/ttyS0 c 4 64
 
# For SGI LiveCDs ...
if [ "${LOOPTYPE}" = "sgimips" ]
@@ -446,10 +448,9 @@ then
 
# Required for splash to work.  Not an issue with the initrd as this
# device isn't created there and is not needed.
-   if [ -e /dev/tty1 ]
-   then
-   [ ! -e "${NEW_ROOT}/dev/tty1" ] && mknod "${NEW_ROOT}/dev/tty1" 
c 4 1
-   fi
+   for minor in 0 1 ; do
+   [ ! -e "${NEW_ROOT}/dev/$minor" ] && mknod -m 600 
"${NEW_ROOT}/dev/tty$minor" c 4 $minor
+   done
 
if [ "${REAL_ROOT}" != "/dev/nfs" ] && [ "${LOOPTYPE}" != "sgimips" ]
then

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit: deef895b91b8632033a1d1cd151c947f8b73a78a
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Apr 13 23:01:25 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Apr 14 00:59:30 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=deef895b

Make it possible to turn off all of the on-exit cleanup.

Signed-off-by: Robin H. Johnson  gentoo.org>

---
 gen_cmdline.sh   |  6 ++
 gen_determineargs.sh |  1 +
 genkernel| 37 ++---
 3 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 715ad49..7bee618 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -22,6 +22,8 @@ longusage() {
   echo "   --logfile= Output file for debug info"
   echo "   --color Output debug in color"
   echo "   --no-color  Do not output debug in color"
+  echo "   --debug-cleanup Clean up temporary build directories on exit"
+  echo "   --no-debug-cleanup  Do not remove any temporary directories 
on exit"
   echo "  Kernel Configuration settings"
   echo "   --menuconfigRun menuconfig after oldconfig"
   echo "   --no-menuconfig Do not run menuconfig after oldconfig"
@@ -471,6 +473,10 @@ parse_cmdline() {
print_info 2 "USECOLOR: ${USECOLOR}"
setColorVars
;;
+   --debug-cleanup|--no-debug-cleanup)
+   CMD_DEBUGCLEANUP=`parse_optbool "$*"`
+   print_info 2 "DEBUGCLEANUP: ${DEBUGCLEANUP}"
+   ;;
--logfile=*)
CMD_LOGFILE=`parse_opt "$*"`
LOGFILE=`parse_opt "$*"`

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index e0c9984..615f274 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -136,6 +136,7 @@ determine_real_args() {
set_config_with_override BOOL   DOKEYMAPAUTO CMD_DOKEYMAPAUTO
set_config_with_override STRING BUSYBOX_CONFIG   CMD_BUSYBOX_CONFIG
set_config_with_override BOOL   INSTALL  CMD_INSTALL
  "yes"
+   set_config_with_override BOOL   DEBUGCLEANUP CMD_DEBUGCLEANUP   
  "yes"
 
BOOTDIR=`arch_replace "${BOOTDIR}"`
BOOTDIR=${BOOTDIR%/}# Remove any trailing slash

diff --git a/genkernel b/genkernel
index b62c3f7..f10cd49 100755
--- a/genkernel
+++ b/genkernel
@@ -61,21 +61,28 @@ trap_cleanup(){
 }
 
 cleanup(){
-if [ -n "$TEMP" -a -d "$TEMP" ]; then
-   rm -rf "$TEMP"
-fi
-
-if isTrue ${POSTCLEAR}
-then
-   echo
-   print_info 1 'RUNNING FINAL CACHE/TMP CLEANUP'
-   print_info 1 "CACHE_DIR: ${CACHE_DIR}"
-   CLEAR_CACHE_DIR='yes'
-   setup_cache_dir
-   echo
-   print_info 1 "TMPDIR: ${TMPDIR}"
-   clear_tmpdir
-   fi
+   if [ "${CMD_DEBUGCLEANUP}" == "no" ]; then
+   print_info 1 "Not running any cleanup per DEBUGCLEANUP"
+   print_info 1 "TEMP: ${TEMP}"
+   print_info 1 "CACHE_DIR: ${CACHE_DIR}"
+   print_info 1 "TMPDIR: ${TMPDIR}"
+   else
+   if [ -n "$TEMP" -a -d "$TEMP" ]; then
+   rm -rf "$TEMP"
+   fi
+
+   if isTrue ${POSTCLEAR}
+   then
+   echo
+   print_info 1 'RUNNING FINAL CACHE/TMP CLEANUP'
+   print_info 1 "CACHE_DIR: ${CACHE_DIR}"
+   CLEAR_CACHE_DIR='yes'
+   setup_cache_dir
+   echo
+   print_info 1 "TMPDIR: ${TMPDIR}"
+   clear_tmpdir
+   fi
+   fi
 }
 
 trap trap_cleanup SIGHUP SIGQUIT SIGINT SIGTERM SIGKILL

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit: c93c617ee0f4ed3b7559208339eecfac4a49c8ec
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Apr 14 00:47:38 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Apr 14 00:59:31 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=c93c617e

Detect mknod failure.

Signed-off-by: Robin H. Johnson  gentoo.org>

---
 gen_initramfs.sh | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 070dffc..d5ee5f6 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -89,12 +89,13 @@ append_base_layout() {
echo "proc  /proc   procdefaults0 0" >> 
${TEMP}/initramfs-base-temp/etc/fstab
 
cd ${TEMP}/initramfs-base-temp/dev
-   mknod -m 660 console c 5 1
-   mknod -m 660 null c 1 3
-   mknod -m 660 zero c 1 5
-   mknod -m 600 tty0 c 4 0
-   mknod -m 600 tty1 c 4 1
-   mknod -m 600 ttyS0 c 4 64
+   # TODO: this will fail as non-root
+   mknod -m 660 console c 5 1 || gen_die "failed to mknod"
+   mknod -m 660 null c 1 3 || gen_die "failed to mknod"
+   mknod -m 660 zero c 1 5 || gen_die "failed to mknod"
+   mknod -m 600 tty0 c 4 0 || gen_die "failed to mknod"
+   mknod -m 600 tty1 c 4 1 || gen_die "failed to mknod"
+   mknod -m 600 ttyS0 c 4 64 || gen_die "failed to mknod"
 
date -u '+%Y%m%d-%H%M%S' > ${TEMP}/initramfs-base-temp/etc/build_date
echo "Genkernel $GK_V" > ${TEMP}/initramfs-base-temp/etc/build_id

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit: 6a758d4933d36f0b6b3257b3985bf3670c1a2a56
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Apr 13 23:52:13 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Apr 14 00:59:31 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=6a758d49

Force ownership of files in building initramfs.

---
 gen_initramfs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 61f0c41..070dffc 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -2,7 +2,7 @@
 # $Id$
 
 COPY_BINARIES=false
-CPIO_ARGS="--quiet -o -H newc"
+CPIO_ARGS="--quiet -o -H newc --owner root:root --force-local"
 
 # The copy_binaries function is explicitly released under the CC0 license to
 # encourage wide adoption and re-use.  That means:

[gentoo-commits] proj/genkernel:master commit in: doc/

[Robin H. Johnson]

commit: 37897db6fa5908497eadcb515cc5312a6c0e
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Apr 14 01:29:07 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Apr 14 01:29:07 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=37897db6

Document --no-debug-cleanup.

Signed-off-by: Robin H. Johnson  gentoo.org>

---
 doc/genkernel.8.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
index 8d890eb..b36b78d 100644
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -85,6 +85,9 @@ DEBUGGING OPTIONS
 *--*[*no-*]*color*::
 Turns on, or off, output in color using escape sequences.
 
+*--*[*no-*]*debug-cleanup*::
+Turns on or off the full post-run cleanup for debug purposes.
+
 
 KERNEL CONFIGURATION
 

[gentoo-commits] dev/jmbsvicetto:master commit in: sys-kernel/infra-kernel-source/

[Robin H. Johnson]

commit: 22371984d77b67548218ba890440d9eabea35775
Author: Robin H. Johnson  orbis-terrarum  net>
AuthorDate: Mon Apr 14 01:36:52 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Apr 14 01:36:52 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=22371984

Update genkernel version.

Signed-off-by: Robin H. Johnson  orbis-terrarum.net>

---
 sys-kernel/infra-kernel-source/infra-kernel-source-1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-kernel/infra-kernel-source/infra-kernel-source-1.0.ebuild 
b/sys-kernel/infra-kernel-source/infra-kernel-source-1.0.ebuild
index 80dd854..124622e 100644
--- a/sys-kernel/infra-kernel-source/infra-kernel-source-1.0.ebuild
+++ b/sys-kernel/infra-kernel-source/infra-kernel-source-1.0.ebuild
@@ -32,7 +32,7 @@ KEYWORDS="~amd64 ~x86"
 DEPEND="
sys-apps/fakeroot
sys-fs/lvm2
-   =sys-kernel/genkernel-
+   >=sys-kernel/genkernel-3.4.49.1
=sys-kernel/${KERNEL_PF}"
 RDEPEND=""
 

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit: 61b063151902ac9cea4362d21a797282b68c428e
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Apr 14 01:30:46 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Apr 14 01:33:09 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=61b06315

Bump version to 3.4.49.1

Signed-off-by: Robin H. Johnson  gentoo.org>

---
 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index f10cd49..ed7f3ad 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='3.4.49'
+GK_V='3.4.49.1'
 
 # Set the default for TMPDIR.  May be modified by genkernel.conf or the
 # --tempdir command line option.

[gentoo-commits] proj/genkernel: New tag: v3.4.49.1

[Robin H. Johnson]

commit: 
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Mon Apr 14 03:04:28 2014 +

New tag: v3.4.49.1

[gentoo-commits] proj/netifrc:master commit in: net/

[Robin H. Johnson]

commit: fc69aa3192ad56b4527248820e3a628da3a91809
Author: Rick Farina (Zero_Chaos)  gentoo  org>
AuthorDate: Tue Apr 15 18:11:05 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Tue Apr 15 18:18:34 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=fc69aa31

net/macchanger: fix for bug 503358

This adds support for macchanger 1.6 as well as keeping support
for macchanger <1.6.

Reported-By: teknocratdefunct  riseup.net
X-Gentoo-Bug: 504458
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=504458
Signed-off-by: Robin H. Johnson  gentoo.org>

---
 net/macchanger.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/macchanger.sh b/net/macchanger.sh
index 4e535ec..ff13770 100644
--- a/net/macchanger.sh
+++ b/net/macchanger.sh
@@ -69,13 +69,13 @@ macchanger_pre_start()
fi
 
mac=$(/sbin/macchanger ${opts} "${IFACE}" \
-   | sed -n -e 's/^Faked MAC:.*\<\(..:..:..:..:..:..\)\>.*/\U\1/p' 
)
+   | sed -n -e 's/^\(Faked\|New\) 
MAC:.*\<\(..:..:..:..:..:..\)\>.*/\U\2/p' )
_up
 
# Sometimes the interface needs to be up 
if [ -z "${mac}" ]; then
mac=$(/sbin/macchanger ${opts} "${IFACE}" \
-   | sed -n -e 's/^Faked MAC:.*\<\(..:..:..:..:..:..\)\>.*/\U\1/p' 
)
+   | sed -n -e 's/^\(Faked\|New\) 
MAC:.*\<\(..:..:..:..:..:..\)\>.*/\U\2/p' )
fi
 
if [ -z "${mac}" ]; then

[gentoo-commits] proj/netifrc: New tag: 0.2.3

[Robin H. Johnson]

commit: 
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Tue Apr 15 18:20:29 2014 +

New tag: 0.2.3

[gentoo-commits] proj/netifrc:master commit in: /

[Robin H. Johnson]

commit: 6d0c65ec78a48da891129f4b6ec1caf7d2778201
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Tue Apr 15 18:19:20 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Tue Apr 15 18:19:20 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=6d0c65ec

Bump.

Signed-off-by: Robin H. Johnson  gentoo.org>

---
 Makefile.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.inc b/Makefile.inc
index 03db2f9..54cf491 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,3 +1,3 @@
 NAME=  netifrc
-VERSION=   0.2.2
+VERSION=   0.2.3
 PKG=   ${NAME}-${VERSION}

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit: be1d4c66a79701f400a7bbbea588582164b0f5ca
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Wed Apr 16 08:32:11 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Wed Apr 16 08:32:20 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=be1d4c66

Improve debugcleanup code

- Improve the debug-cleanup code to use isTrue and match other code
  style.
- add explicit return 0 after debug-cleanup to avoid passing a false
  negative failure code up to a higher level function.

Signed-off-by: Robin H. Johnson  gentoo.org>

---
 gen_compile.sh | 30 +++---
 genkernel  | 12 ++--
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index 9b5df01..0fb33d5 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -430,7 +430,7 @@ compile_busybox() {
yes '' 2>/dev/null | compile_generic oldconfig utils
 
print_info 1 'busybox: >> Compiling...'
-   compile_generic all utils
+   compile_generic all utils V=1
print_info 1 'busybox: >> Copying to cache...'
[ -f "${TEMP}/${BUSYBOX_DIR}/busybox" ] ||
gen_die 'Busybox executable does not exist!'
@@ -440,7 +440,8 @@ compile_busybox() {
gen_die 'Could not create the busybox bincache!'
 
cd "${TEMP}"
-   rm -rf "${BUSYBOX_DIR}" > /dev/null
+   isTrue "${CMD_DEBUGCLEANUP}" && rm -rf "${BUSYBOX_DIR}" > 
/dev/null
+   return 0
fi
 }
 
@@ -485,8 +486,9 @@ compile_lvm() {
gen_die 'Could not create binary cache'
 
cd "${TEMP}"
-   rm -rf "${TEMP}/lvm" > /dev/null
-   rm -rf "${LVM_DIR}" lvm
+   isTrue "${CMD_DEBUGCLEANUP}" && rm -rf "${TEMP}/lvm" > /dev/null
+   isTrue "${CMD_DEBUGCLEANUP}" && rm -rf "${LVM_DIR}" lvm
+   return 0
fi
 }
 
@@ -525,7 +527,8 @@ compile_mdadm() {
gen_die 'Could not create binary cache'
 
cd "${TEMP}"
-   rm -rf "${MDADM_DIR}" mdadm
+   isTrue "${CMD_DEBUGCLEANUP}" && rm -rf "${MDADM_DIR}" mdadm
+   return 0
fi
 }
 
@@ -574,8 +577,9 @@ compile_dmraid() {
gen_die 'Could not create binary cache'
 
cd "${TEMP}"
-   rm -rf "${TEMP}/lvm" > /dev/null
-   rm -rf "${DMRAID_DIR}" dmraid
+   isTrue "${CMD_DEBUGCLEANUP}" && rm -rf "${TEMP}/lvm" > /dev/null
+   isTrue "${CMD_DEBUGCLEANUP}" && rm -rf "${DMRAID_DIR}" dmraid
+   return 0
fi
 }
 
@@ -612,7 +616,8 @@ compile_fuse() {
 #  gen_die 'Could not create fuse bincache!'
 
cd "${TEMP}"
-#  rm -rf "${FUSE_DIR}" > /dev/null
+#  isTrue "${CMD_DEBUGCLEANUP}" && rm -rf "${FUSE_DIR}" > /dev/null
+   return 0
fi
 }
 
@@ -647,7 +652,8 @@ compile_unionfs_fuse() {
gen_die 'Could not copy the unionfs binary to the 
package directory, does the directory exist?'
 
cd "${TEMP}"
-   rm -rf "${UNIONFS_FUSE_DIR}" > /dev/null
+   isTrue "${CMD_DEBUGCLEANUP}" && rm -rf "${UNIONFS_FUSE_DIR}" > 
/dev/null
+   return 0
fi
 }
 
@@ -697,7 +703,8 @@ compile_iscsi() {
gen_die 'Could not copy the iscsistart binary to the 
package directory, does the directory exist?'
 
cd "${TEMP}"
-   rm -rf "${ISCSI_DIR}" > /dev/null
+   isTrue "${CMD_DEBUGCLEANUP}" && rm -rf "${ISCSI_DIR}" > 
/dev/null
+   return 0
fi
 }
 
@@ -742,6 +749,7 @@ compile_gpg() {
gen_die 'Could not copy the gpg binary to the package 
directory, does the directory exist?'
 
cd "${TEMP}"
-   rm -rf "${GPG_DIR}" > /dev/null
+   isTrue "${CMD_DEBUGCLEANUP}" && rm -rf "${GPG_DIR}" > /dev/null
+   return 0
fi
 }

diff --git a/genkernel b/genkernel
index ed7f3ad..1d2a372 100755
--- a/genkernel
+++ b/genkernel
@@ -61,12 +61,7 @@ trap_cleanup(){
 }
 
 cleanup(){
-   if [ 

[gentoo-commits] proj/gentoo-mirrorstats:master commit in: html/

[Robin H. Johnson]

commit: 257405af5bed5716c4e1e89ae0d163b5baf0a663
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Sep 14 21:48:53 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Sep 14 21:48:53 2024 +
URL:
https://gitweb.gentoo.org/proj/gentoo-mirrorstats.git/commit/?id=257405af

fix: handle mirror_url fetch errors

Signed-off-by: Robin H. Johnson  gentoo.org>

 html/generate.py | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/html/generate.py b/html/generate.py
index a4b75e8..2d6ed2b 100755
--- a/html/generate.py
+++ b/html/generate.py
@@ -120,7 +120,13 @@ def getHostList(mirrorstatsList):
 # process all mirrors
 for mirror_url in mirrorstatsList:
 
-mirrorData = getJson(mirror_url)
+mirrorData = None
+try:
+mirrorData = getJson(mirror_url)
+except Exception as err:
+print("Exception fetching "+mirror_url+": ", err)
+continue
+
 lastUpdate = 
datetime.datetime.fromtimestamp(int(mirrorData['LastUpdate'])).strftime('%Y-%m-%d
 %H:%M:%S')
 
 for mirror in mirrorData['Mirrors']:

[gentoo-commits] proj/gentoo-mirrorstats:master commit in: html/

[Robin H. Johnson]

commit: 7153c73288fc8302039877b95958408a968295c6
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Sep 14 21:51:31 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Sep 14 21:51:31 2024 +
URL:
https://gitweb.gentoo.org/proj/gentoo-mirrorstats.git/commit/?id=7153c732

fix: improve exception output

Signed-off-by: Robin H. Johnson  gentoo.org>

 html/generate.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/generate.py b/html/generate.py
index 2d6ed2b..0ec4e4b 100755
--- a/html/generate.py
+++ b/html/generate.py
@@ -124,7 +124,7 @@ def getHostList(mirrorstatsList):
 try:
 mirrorData = getJson(mirror_url)
 except Exception as err:
-print("Exception fetching "+mirror_url+": ", err)
+print("Exception fetching "+mirror_url+": ", type(err).__name__, 
err)
 continue
 
 lastUpdate = 
datetime.datetime.fromtimestamp(int(mirrorData['LastUpdate'])).strftime('%Y-%m-%d
 %H:%M:%S')

[gentoo-commits] repo/gentoo:master commit in: dev-ruby/facter/, dev-ruby/facter/files/

[Robin H. Johnson]

commit: 03e8deb55ed4376b4f5e29f019797c82c03539cd
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Jul 20 17:27:52 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Jul 20 17:29:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03e8deb5

dev-ruby/facter: fix vague Gem::MissingSpecError

Signed-off-by: Robin H. Johnson  gentoo.org>

 dev-ruby/facter/facter-4.7.0-r1.ebuild | 56 ++
 .../files/facter-4.7.0-gentoo-thor-gemspec.patch   | 36 ++
 2 files changed, 92 insertions(+)

diff --git a/dev-ruby/facter/facter-4.7.0-r1.ebuild 
b/dev-ruby/facter/facter-4.7.0-r1.ebuild
new file mode 100644
index ..6c7cda531d76
--- /dev/null
+++ b/dev-ruby/facter/facter-4.7.0-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+RUBY_FAKEGEM_GEMSPEC="facter.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A cross-platform ruby library for retrieving facts from operating 
systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/";
+
+LICENSE="Apache-2.0"
+SLOT="0"
+#IUSE="test"
+if [[ ${PV} ==  ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/puppetlabs/facter.git";
+   EGIT_BRANCH="master"
+else
+   [[ "${PV}" = *_rc* ]] || \
+   KEYWORDS="~amd64 ~riscv ~x86"
+   #KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+   SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+fi
+
+#RESTRICT="!test? ( test )"
+
+ruby_add_rdepend "dev-ruby/hocon https://github.com/puppetlabs/facter/issues/2687
+Reference: https://github.com/puppetlabs/facter/pull/2674
+Reference: https://github.com/puppetlabs/facter/pull/2686
+Signed-off-by: Robin H. Johnson 
+
+diff '--color=auto' -Nuar facter-4.7.0.orig/ext/project_data.yaml 
facter-4.7.0/ext/project_data.yaml
+--- facter-4.7.0.orig/ext/project_data.yaml2024-04-05 10:45:18.0 
-0700
 facter-4.7.0/ext/project_data.yaml 2024-07-20 10:20:06.637005127 -0700
+@@ -15,4 +15,4 @@
+ gem_required_ruby_version: ['>= 2.5', '< 4.0']
+ gem_runtime_dependencies:
+   hocon: ~> 1.3
+-  thor: ['>= 1.0.1', '< 1.3']
++  thor: ['>= 1.0.1', '< 2.0']
+diff '--color=auto' -Nuar facter-4.7.0.orig/facter.gemspec 
facter-4.7.0/facter.gemspec
+--- facter-4.7.0.orig/facter.gemspec   2024-07-20 10:18:09.763758108 -0700
 facter-4.7.0/facter.gemspec2024-07-20 10:19:55.470346750 -0700
+@@ -46,5 +46,5 @@
+   spec.add_development_dependency 'yard', '~> 0.9'
+ 
+   spec.add_runtime_dependency 'hocon', '~> 1.3'
+-  spec.add_runtime_dependency 'thor', ['>= 1.0.1', '< 1.3'] # Thor 1.3.0 
drops support for Ruby 2.5
++  spec.add_runtime_dependency 'thor', ['>= 1.0.1', '< 2.0'] # Thor 1.3.0 
drops support for Ruby 2.5 - which doesn't matter for Gentoo
+ end

[gentoo-commits] repo/gentoo:master commit in: app-admin/puppet-lint/

[Robin H. Johnson]

commit: 74a613d51782ffe523d0a6cdd772dfc4a1659284
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Jul 20 17:29:03 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Jul 20 17:29:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74a613d5

app-admin/puppet-lint: bump to 4.2.4

Signed-off-by: Robin H. Johnson  gentoo.org>

 app-admin/puppet-lint/Manifest |  1 +
 app-admin/puppet-lint/puppet-lint-4.2.4.ebuild | 39 ++
 2 files changed, 40 insertions(+)

diff --git a/app-admin/puppet-lint/Manifest b/app-admin/puppet-lint/Manifest
index 32345ea1c4f3..4c98387cef43 100644
--- a/app-admin/puppet-lint/Manifest
+++ b/app-admin/puppet-lint/Manifest
@@ -2,3 +2,4 @@ DIST puppet-lint-4.2.1.gem 81920 BLAKE2B 
5e291e4c1743092be9935231280f04ce3affdc1
 DIST puppet-lint-4.2.2.gem 81920 BLAKE2B 
cad796866f323113a8c2aa5cf86b6187423f27186032ea76ebd1f158937c34f315d93de3d92b01acc0b160947b720bd987550c52aaa53a51f165396de776ec88
 SHA512 
e8a591e615db87dc2edc22fc4d53c03004e0227748896005d2252fab8b77193ecd30f9167702c6c4fd6551daaa0894789f3d9d50fb705eecaed4a22573a94afc
 DIST puppet-lint-4.2.3-pr181-fix-warnings.patch 5601 BLAKE2B 
a04fdf9d8627cc888924b4282a09e076d7e029eda008fc8da138a121a21e227cff45a54ddbe770a286a2a15e43d4402526a6201c805f6e574755a11a1d13d7d7
 SHA512 
15638f2d4a81c969aa77b51f2f147a1fba5544dd7e52f3127dc9949afaabbd161f815a22dc5091f19d3d16bc2be97bb50f455a3a67c503aff58e737288f80e49
 DIST puppet-lint-4.2.3.gem 81920 BLAKE2B 
ee98aaed336a4302c4d67d94c83f30f6fdfc92b483f39a2c096f00daff2f7caf54bfa11c4b8217648a0ca68c6c8da5a4a6f2d0cab8efb6e2d7e814155780
 SHA512 
2f2192a48ed460371092ce99755b8cde55526ed96ee72d2a5b7989f7df7afb6abce5d3e8e7a0dca577b199bb380935e8734a92a53248697bb7195091da4cb9f6
+DIST puppet-lint-4.2.4.gem 82432 BLAKE2B 
54bd65b917c184163adca920767b88d064cdd8c931d7911a64698d68a7b335055bd95bff91c462ecaf4111a231186ee5d2f2de42a04abffb519a67a4825bec59
 SHA512 
19b28de4e5d183dd46727cc4f7f7a6b81eb5ec7d0c7ca23514a015e43a7528bfc110853b82e65ac5da4d002abc3c21ce5d10abb6a97717b540d13570fd42eb6b

diff --git a/app-admin/puppet-lint/puppet-lint-4.2.4.ebuild 
b/app-admin/puppet-lint/puppet-lint-4.2.4.ebuild
new file mode 100644
index ..59d8d9af62c5
--- /dev/null
+++ b/app-admin/puppet-lint/puppet-lint-4.2.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP="puppet-lint"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A linter for puppet DSL"
+HOMEPAGE="https://github.com/puppetlabs/puppet-lint";
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCH_NAME="${PN}-4.2.3-pr181-fix-warnings.patch"
+#SRC_URI+=" https://github.com/puppetlabs/puppet-lint/pull/181.patch -> 
${PATCH_NAME} "
+
+#PATCHES=(
+#  "${DISTDIR}/${PATCH_NAME}"
+#)
+
+ruby_add_bdepend "test? (
+   dev-ruby/rspec-its:1
+   dev-ruby/rspec-collection_matchers:1
+   dev-ruby/rspec-json_expectations )"
+
+all_ruby_prepare() {
+   # Skip acceptance tests due to unpackages puppet_litmus which in turn
+   # has a number of unpackaged dependencies.
+   rm -rf spec/acceptance || die
+   rm -f spec/spec_helper_acceptance.rb || die
+}

[gentoo-commits] proj/netifrc:master commit in: net/

[Robin H. Johnson]

commit: 42aa70384a89346dd1733dfff4131f56178dc26a
Author: Nuno Silva (njsg)  iki  fi>
AuthorDate: Sat Sep 20 06:53:59 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Wed Sep 24 06:19:32 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=42aa7038

Use dhcpcd -k to force the release, instead of SIGHUP

Newer dhcpcd versions use a different signal internally (SIGALRM), but
dhcpcd -k interface_name will work with both newer and older versions
of dhcpcd.

Signed-off-by: Robin H. Johnson  gentoo.org>

---
 net/dhcpcd.sh | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/net/dhcpcd.sh b/net/dhcpcd.sh
index 2c0f919..bdb60c6 100644
--- a/net/dhcpcd.sh
+++ b/net/dhcpcd.sh
@@ -81,8 +81,11 @@ dhcpcd_stop()
eval opts=\$dhcp_${IFVAR}
[ -z "${opts}" ] && opts=${dhcp}
case " ${opts} " in
-   *" release "*) sig=SIGHUP;;
+   *" release "*) dhcpcd -k "${IFACE}" ;;
+   *)
+   start-stop-daemon --stop --quiet \
+--signal ${sig} --pidfile "${pidfile}"
+   ;;
esac
-   start-stop-daemon --stop --quiet --signal ${sig} --pidfile "${pidfile}"
eend $?
 }

[gentoo-commits] proj/netifrc:master commit in: init.d/

[Robin H. Johnson]

commit: 3a97f7c0dd702d55e1280c1153d44ee8747fe1f4
Author: mirabilos  debian  org>
AuthorDate: Fri Oct 10 21:58:11 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Oct 11 19:47:17 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=3a97f7c0

Fix https://bugs.gentoo.org/show_bug.cgi?id=500942

“unset x” also removes the “local x” property, so the next assignment and/or 
read to/from $x will access the global variable “x”.

Signed-off-by: Robin H. Johnson  gentoo.org>

---
 init.d/net.lo.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index 01c1b20..6a0aefb 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -203,7 +203,7 @@ _program_available()
/*) [ -x "${x}" ] && break;;
*) type "${x}" >/dev/null 2>&1 && break;;
esac
-   unset x
+   x=
done
[ -n "${x}" ] && echo $x && return 0
return 1

[gentoo-commits] proj/gentoo-ads-config:master commit in: /

[Robin H. Johnson]

commit: 67862f126d19546e39bf98a80dffda53fca581d8
Author: Robin H. Johnson  orbis-terrarum  net>
AuthorDate: Tue Oct 14 15:18:55 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Tue Oct 14 15:18:55 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-ads-config.git;a=commit;h=67862f12

Add webhosting.uk.com (eukhost) to sidebar.

---
 gentoo_sponsors.py | 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/gentoo_sponsors.py b/gentoo_sponsors.py
index 6e921a2..0719674 100644
--- a/gentoo_sponsors.py
+++ b/gentoo_sponsors.py
@@ -86,7 +86,7 @@ ads = [
},
{
'name': 'DedicatedNOW',
-'type': 'img',
+'type': 'img',
'img': 'sponsors/dedicatednow_ad.png',
'title': 'Award Winning Managed Dedicated Hosting, 100% SLA',
'tier': 1,
@@ -109,6 +109,19 @@ ads = [
'height': 120,
'width': 125,
},
+
+   {
+   'name': 'WebHostingUK',
+'type': 'img',
+   'img': 'sponsors/web-hosting-uk-125x125.gif',
+   'title': 'WebHosting.UK.com',
+   'tier': 1,
+   'weight': 5,
+'url': 
'https://www.webhosting.uk.com/?utm_source=gentoo&utm_medium=banner&utm_campaign=gentoo.org',
+   'height': 125,
+   'width': 125,
+   },
+
{
'name': 'LeaseWeb',
'type': 'img',

[gentoo-commits] proj/gentoo-ads-config:master commit in: /

[Robin H. Johnson]

commit: c237114ba3b38a4236c8b139a056481ff75d36ed
Author: Robin H. Johnson  orbis-terrarum  net>
AuthorDate: Tue Oct 14 15:19:44 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Tue Oct 14 15:19:44 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-ads-config.git;a=commit;h=c237114b

Adjust weights.

---
 gentoo_sponsors.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gentoo_sponsors.py b/gentoo_sponsors.py
index 3cbddf5..e66d535 100644
--- a/gentoo_sponsors.py
+++ b/gentoo_sponsors.py
@@ -20,7 +20,7 @@ ads = [
'type': 'img',
'img': 'sponsors/vr-ad.png',
'title': 'VR: Gentoo VPS & IPv6 Hosting',
-   'weight': 20,
+   'weight': 15,
'tier': 1,
'url': 'http://www.vr.org/',
'width': 125,
@@ -32,7 +32,7 @@ ads = [
'img': 'tek-gentoo.gif',
'title': 'Tek Alchemy',
'tier': 1,
-   'weight': 10,
+   'weight': 5,
'url': 'http://www.tek.net/',
'height': 125,
'width': 125,
@@ -43,7 +43,7 @@ ads = [
'img': 'sponsors/sevenl_ad.png',
'title': 'SevenL',
'tier': 1,
-   'weight': 15,
+   'weight': 10,
'url': 
'https://www.sevenl.net/?utm_source=gentoo-org&utm_medium=sponsored-banner&utm_campaign=gentoo-dedicated-servers',
'height': 125,
'width': 125,

[gentoo-commits] proj/gentoo-ads-config:master commit in: /

[Robin H. Johnson]

commit: af10f16df5660fc12fc9aecf695cab8d2d33d922
Author: Robin H. Johnson  orbis-terrarum  net>
AuthorDate: Tue Oct 14 15:19:12 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Tue Oct 14 15:19:12 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-ads-config.git;a=commit;h=af10f16d

SD-France is no longer a sponsor.

---
 gentoo_sponsors.py | 11 ---
 1 file changed, 11 deletions(-)

diff --git a/gentoo_sponsors.py b/gentoo_sponsors.py
index 0719674..3cbddf5 100644
--- a/gentoo_sponsors.py
+++ b/gentoo_sponsors.py
@@ -60,17 +60,6 @@ ads = [
'width': 125,
},
{
-   'name': 'SD-France',
-'type': 'img',
-   'img': 'sponsors/sdfrance-logo-small.png',
-   'title': 'gentoo dedicated servers provided by euro-web.com',
-   'tier': 1,
-   'weight': 20,
-   'url': 'http://euro-web.com',
-   'height': 30,
-   'width': 125,
-   },
-   {
'name': 'TOP-IX',
 'type': 'img',
'img': 'sponsors/topix-fastbull-125x125.png',

[gentoo-commits] proj/netifrc:master commit in: sh/

[Robin H. Johnson]

commit: 55f4303617ecd81f8729e8f45a64d14a4a0df41b
Author: Rabi Shanker Guha  gmail  com>
AuthorDate: Fri Jan  9 15:06:25 2015 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Fri Jan  9 15:06:25 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=55f43036

Systemd Wrapper: to be called from unit file

---
 sh/systemd-wrapper.sh.in | 91 
 1 file changed, 91 insertions(+)

diff --git a/sh/systemd-wrapper.sh.in b/sh/systemd-wrapper.sh.in
new file mode 100644
index 000..d931200
--- /dev/null
+++ b/sh/systemd-wrapper.sh.in
@@ -0,0 +1,91 @@
+#!/bin/sh
+
+CONFDIR="@CONFDIR@"
+LIBEXECDIR="@LIBEXECDIR@/sh"
+INITDIR="@INITDIR@"
+INIT=systemd
+
+usage() {
+  echo "netifrc systemd wrapper"
+  echo "Usage:"
+  echo "  systemd-wrapper.sh -i  "
+  echo "  where command is start|stop"
+}
+
+die() {
+  echo "$@"
+  exit -1
+}
+
+while getopts "i:" opt; do
+  case $opt in
+   i)
+   RC_IFACE=$OPTARG;;
+  esac
+done
+shift $((OPTIND -1))
+
+[ -z "$RC_IFACE" ] && die "Missing Parameter Interface"
+
+RC_SVCPREFIX="net"
+RC_SVCNAME="$RC_SVCPREFIX"."$RC_IFACE"
+RC_UNAME=$(uname)
+# XXX Find out the systemd way of doing this
+RC_GOINGDOWN=no
+
+# In Openrc systems this has value /run/openrc
+SVCDIR="/run/netifrc"
+# OpenRC saves values in $SVCDIR/options/$SVCNAME/$OPTION
+# In non OpenRC setting this is saved in /run/netifrc/options/$SVCNAME/$OPTION
+OPTIONSDIR="${SVCDIR}/options/${RC_SVCNAME}"
+STATEDIR="${SVCDIR}/${RC_SVCNAME}"
+
+# Source the config file
+if [ -f "$CONFDIR/$RC_SVCPREFIX" ]; then
+   . "$CONFDIR/$RC_SVCPREFIX"
+fi
+
+# Source the actual runscript
+if [ -f "$INITDIR/${RC_SVCPREFIX}.lo" ]; then
+   . "$INITDIR/${RC_SVCPREFIX}.lo"
+else
+   echo "$INITDIR/${RC_SVCPREFIX}.lo : Init file missing or invalid path"
+   exit -1
+fi
+
+netifrc_init() {
+   # Ensure OPTIONSDIR is present and writeable
+   mkdir -p "$OPTIONSDIR"
+   if [ ! -w "$OPTIONSDIR" ]; then
+   eerror "${OPTIONSDIR} does not exist or is not writeable"
+   exit -1;
+   fi
+   # Ensure STATEDIR is present and writeable
+   mkdir -p "$STATEDIR"
+   if [ ! -w "$STATEDIR" ]; then
+   eerror "${STATEDIR} does not exist or is not writeable"
+   exit -1;
+   fi
+}
+
+netifrc_cleanup() {
+   # Delete all the saved values
+   rm -f ${OPTIONSDIR}/*
+}
+
+rc=0
+case $1 in
+   start)
+   netifrc_init
+   start
+   rc=$?;;
+   stop)
+   stop
+   netifrc_cleanup
+   rc=$?;;
+   *)
+   die "Unrecognised command $1";;
+esac
+exit $rc
+
+# vi: ts=4 sw=4 noexpandtab

[gentoo-commits] proj/netifrc:master commit in: init.d/

[Robin H. Johnson]

commit: ecba7604cf633342162deb802cb18008c55b0382
Author: Rabi Shanker Guha  gmail  com>
AuthorDate: Fri Jan  9 15:08:13 2015 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Fri Jan  9 15:08:13 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=ecba7604

Update runscript to use functions.sh compatibility layer

---
 init.d/net.lo.in | 18 +++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index 6a0aefb..c79e7ff 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -2,6 +2,7 @@
 # Copyright (c) 2007-2009 Roy Marples 
 # Released under the 2-clause BSD license.
 
+SHDIR="@LIBEXECDIR@/sh"
 MODULESDIR="@LIBEXECDIR@/net"
 MODULESLIST="${RC_SVCDIR}/nettree"
 _config_vars="config routes"
@@ -13,9 +14,20 @@ description="Configures network interfaces."
 # Handy var so we don't have to embed new lines everywhere for array splitting
 __IFS="
 "
+
+#  Set the INIT to be openrc if this file is called directly
+: ${INIT:=openrc}
+
+if [ -f "$SHDIR/functions.sh" ]; then
+   . "$SHDIR/functions.sh"
+else
+   echo "$SHDIR/functions.sh missing. Exiting"
+   exit -1
+fi
+
 depend()
 {
-   local IFACE=${RC_SVCNAME#*.}
+   local IFACE=$(get_interface)
local IFVAR=$(shell_var "${IFACE}")
 
need localmount
@@ -526,7 +538,7 @@ interface_down()
 
 start()
 {
-   local IFACE=${RC_SVCNAME#*.} oneworked=false fallback=false module=
+   local IFACE=$(get_interface) oneworked=false fallback=false module=
local IFVAR=$(shell_var "${IFACE}") cmd= our_metric=
local metric=0 _up_before_preup
eval _up_before_preup="\$up_before_preup_${IFVAR}"
@@ -721,7 +733,7 @@ stop()
# correctly if we go back to multiuser.
yesno ${keep_network:-YES} && yesno $RC_GOINGDOWN && return 0
 
-   local IFACE=${RC_SVCNAME#*.} module=
+   local IFACE=$(get_interface) module=
local IFVAR=$(shell_var "${IFACE}") opts=
 
einfo "Bringing down interface ${IFACE}"

[gentoo-commits] proj/netifrc:master commit in: sh/

[Robin H. Johnson]

commit: a3444e9abf16ecb6145e95a891433b3a79800170
Author: Rabi Shanker Guha  gmail  com>
AuthorDate: Fri Jan  9 15:02:28 2015 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Fri Jan  9 15:02:28 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=a3444e9a

Compatibility layer for multiple init systems

---
 sh/functions.sh | 126 
 1 file changed, 126 insertions(+)

diff --git a/sh/functions.sh b/sh/functions.sh
new file mode 100644
index 000..368bb73
--- /dev/null
+++ b/sh/functions.sh
@@ -0,0 +1,126 @@
+# Compatibility layer for netifrc to work with multiple init
+# systems.
+
+# First check whether e* commands are present in the environment
+# XXX [[-n RC_GOT_FUNCTIONS]] ??
+if [ -n "$(command -v ebegin >/dev/null 2>&1)" ]; then
+   :
+
+# Then check for the presence of functions.sh
+elif [ -f /lib/gentoo/functions.sh ]; then
+   . /lib/gentoo/functions.sh
+
+else
+   echo "/lib/gentoo/functions.sh not found. Exiting"
+   exit -1
+fi
+
+# runscript functions
+if [ -z "$(command -v service_set_value >/dev/null 2>&1)" ]; then
+
+   # OpenRC functions used in depend
+   after() {
+   :
+   }
+   before() {
+   :
+   }
+   program() {
+   :
+   }
+   need() {
+   :
+   }
+
+   shell_var() {
+   local output=$1 sanitized_arg=
+   shift 1
+   for arg; do
+   sanitized_arg="${arg//[^a-zA-Z0-9_]/_}"
+   output="$output $arg"
+   done
+   echo "$output"
+   }
+
+   net_fs_list="afs ceph cifs coda davfs fuse fuse.sshfs gfs glusterfs 
lustre ncpfs nfs nfs4 ocfs2 shfs smbfs"
+   is_net_fs()
+   {
+   [ -z "$1" ] && return 1
+
+   local fs=$(mount | grep " on $1 " | cut -f 5 -d ' ')
+   for x in $fs; do
+   for y in $net_fs_list; do
+   [ "$x" = "$y" ] && return 0
+   done
+   done
+   return 1
+   }
+
+   service_set_value() {
+   local OPTION="$1" VALUE="$2"
+   if [ -z "$OPTION" ]; then
+   eerror "service_set_value requires parameter KEY"
+   return
+   fi
+   local file="$OPTIONSDIR/${OPTION}"
+   echo "$VALUE" > $file
+   }
+   service_get_value() {
+   local OPTION="$1"
+   if [ -z "$OPTION" ]; then
+   eerror "service_get_value requires parameter KEY"
+   return
+   fi
+   local file="$OPTIONSDIR/${OPTION}"
+   cat $file 2>/dev/null
+   }
+   STATEFILE="${STATEDIR}/state"
+   # Internal Function
+   # Stores the state of netifrc in ${SVCDIR}/${SVCNAME}/state file
+   _mark_service() {
+   local state=$1
+   echo $state > $STATEFILE
+   }
+   #Internal Function
+   # Checks whether the state of netifrc is same as $1
+   _service_state() {
+   state=$(cat $STATEFILE 2>/dev/null)
+   if [ state = $1 ]; then
+   return 1
+   fi
+   return 0
+   }
+
+   mark_service_started() {
+   _mark_service started
+   }
+   mark_service_inactive() {
+   _mark_service inactive
+   }
+   mark_service_stopped() {
+   _mark_service stopped
+   }
+   service_started() {
+   _service_state started
+   return $?
+   }
+   service_inactive() {
+   _service_state inactive
+   return $?
+   }
+fi
+
+# Extracts the interface for the current invocation
+get_interface() {
+   case $INIT in
+   openrc)
+   printf ${RC_SVCNAME#*.};;
+   systemd)
+   printf ${RC_IFACE};;
+   *)
+   eerror "Init system not supported. Aborting"
+   exit -1;;
+   esac
+}
+
+# vim: ts=4 sw=4 noexpandtab

[gentoo-commits] proj/netifrc:master commit in: mk/, sh/

[Robin H. Johnson]

commit: 0b3be67adb845c26d3d3b7cfba91c9b0053fa750
Author: Rabi Shanker Guha  gmail  com>
AuthorDate: Fri Jan  9 15:09:17 2015 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Fri Jan  9 15:09:17 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=0b3be67a

Update Makefiles to reflect changes

---
 mk/scripts.mk | 2 +-
 sh/Makefile   | 8 
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mk/scripts.mk b/mk/scripts.mk
index 2201199..736132a 100644
--- a/mk/scripts.mk
+++ b/mk/scripts.mk
@@ -12,7 +12,7 @@ _PKG_SED:=$(shell ${_PKG_SED_SH})
 _LCL_SED_SH=   if test "${PREFIX}" = "${LOCAL_PREFIX}"; then echo "-e 
's:@LOCAL_PREFIX@::g'"; else echo "-e 's:@LOCAL_PREFIX@:${LOCAL_PREFIX}:g'"; fi
 _LCL_SED:= $(shell ${_LCL_SED_SH})
 
-SED_REPLACE=   -e 's:@SHELL@:${SH}:g' -e 's:@LIB@:${LIBNAME}:g' -e 
's:@SYSCONFDIR@:${SYSCONFDIR}:g' -e 's:@LIBEXECDIR@:${LIBEXECDIR}:g' -e 
's:@PREFIX@:${PREFIX}:g' -e 's:@BINDIR@:${BINDIR}:g' -e 
's:@SBINDIR@:${SBINDIR}:g' ${_PKG_SED} ${_LCL_SED}
+SED_REPLACE=   -e 's:@SHELL@:${SH}:g' -e 's:@LIB@:${LIBNAME}:g' -e 
's:@SYSCONFDIR@:${SYSCONFDIR}:g' -e 's:@CONFDIR@:${CONFDIR}:g' -e 
's:@LIBEXECDIR@:${LIBEXECDIR}:g' -e 's:@PREFIX@:${PREFIX}:g' -e 
's:@BINDIR@:${BINDIR}:g' -e 's:@SBINDIR@:${SBINDIR}:g' -e 
's:@INITDIR@:${INITDIR}:g' ${_PKG_SED} ${_LCL_SED}
 
 # Tweak our shell scripts
 %.sh: %.sh.in

diff --git a/sh/Makefile b/sh/Makefile
index 6efb98b..4f13ae6 100644
--- a/sh/Makefile
+++ b/sh/Makefile
@@ -7,13 +7,13 @@ MK=   ../mk
 include ${MK}/os.mk
 
 SRCS-FreeBSD=
-BIN-FreeBSD=
+BIN-FreeBSD= functions.sh
 
-SRCS-Linux=udhcpc-hook.sh.in
-BIN-Linux= udhcpc-hook.sh
+SRCS-Linux=udhcpc-hook.sh.in systemd-wrapper.sh.in
+BIN-Linux= udhcpc-hook.sh functions.sh systemd-wrapper.sh
 
 SRCS-NetBSD=   ifwatchd-carrier.sh.in ifwatchd-nocarrier.sh.in
-BIN-NetBSD=ifwatchd-carrier.sh ifwatchd-nocarrier.sh
+BIN-NetBSD=ifwatchd-carrier.sh ifwatchd-nocarrier.sh functions.sh
 
 include ${MK}/scripts.mk
 

[gentoo-commits] proj/netifrc:master commit in: systemd/

[Robin H. Johnson]

commit: 539beb672b2a131a51cfe2e6300f4b9010579375
Author: Rabi Shanker Guha  gmail  com>
AuthorDate: Fri Jan  9 15:06:55 2015 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Fri Jan  9 15:06:55 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=539beb67

Unit file

---
 systemd/net_at.service.in | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/systemd/net_at.service.in b/systemd/net_at.service.in
new file mode 100644
index 000..a729ec4
--- /dev/null
+++ b/systemd/net_at.service.in
@@ -0,0 +1,10 @@
+[Unit]
+Description="Gentoo Network Interface Management Scripts"
+
+[Service]
+ExecStart=@LIBEXECDIR@/sh/systemd-wrapper.sh -i %I start
+ExecStop=@LIBEXECDIR@/sh/systemd-wrapper.sh -i %I stop
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target

[gentoo-commits] proj/netifrc:master commit in: test/specs/, test/conf.d/, /, test/, test/src/

[Robin H. Johnson]

commit: 2a6d218d97858342eae3266798085d95c3d31c83
Author: Rabi Shanker Guha  gmail  com>
AuthorDate: Fri Jan  9 15:09:51 2015 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Fri Jan  9 15:09:51 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=2a6d218d

Test Suite

Run it using
sudo python3 test/src/netifrc.py test/specs/config.yaml
to generate the test output
and
sudo MODE=slave python3 test/src/netifrc.py test/specs/config.yaml
to match the output on a system-system against the output generated
on the previous openrc system

---
 .gitignore |   2 +
 test/conf.d/bond   |   9 ++
 test/conf.d/bridge |   9 ++
 test/conf.d/eth_dhcp   |   1 +
 test/conf.d/eth_static |   2 +
 test/conf.d/vlan   |   3 +
 test/config.ini|  28 ++
 test/requirements.txt  |   2 +
 test/specs/bond.yaml   |  23 +
 test/specs/bridge.yaml |  11 +++
 test/specs/eth_dhcp.yaml   |  14 +++
 test/specs/eth_static.yaml |  14 +++
 test/specs/vlan.yaml   |  11 +++
 test/src/file.py   |  21 +
 test/src/netifrc.py| 227 +
 15 files changed, 377 insertions(+)

diff --git a/.gitignore b/.gitignore
index 56631ab..ad5b2de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 ChangeLog
+**/__pycache__
+*.swp

diff --git a/test/conf.d/bond b/test/conf.d/bond
new file mode 100644
index 000..49bbb24
--- /dev/null
+++ b/test/conf.d/bond
@@ -0,0 +1,9 @@
+# Bonded Interface Configuration
+#config_$$BOND_IFACE_1$$="null"
+#config_$$BOND_IFACE_2$$="null"
+
+slaves_$$BOND$$="$$BOND_IFACE_1$$ $$BOND_IFACE_2$$"
+config_$$BOND$$="null"
+# config_$$BOND$$="192.168.1.100"
+# routes_$$BOND$$="default via 192.168.1.1"
+rc_net_$$BOND$$_need="net.$$BOND_IFACE_1$$ net.$$BOND_IFACE_2$$"

diff --git a/test/conf.d/bridge b/test/conf.d/bridge
new file mode 100644
index 000..d49455b
--- /dev/null
+++ b/test/conf.d/bridge
@@ -0,0 +1,9 @@
+config_$$BRIDGE_IFACE_1$$="null"
+config_$$BRIDGE_IFACE_2$$="null"
+
+# bridge
+config_$$BRIDGE$$="dhcp"
+brctl_$$BRIDGE$$="setfd 0
+sethello 10
+stp off"
+bridge_$$BRIDGE$$="$$BRIDGE_IFACE_1$$ $$BRIDGE_IFACE_2$$"
\ No newline at end of file

diff --git a/test/conf.d/eth_dhcp b/test/conf.d/eth_dhcp
new file mode 100644
index 000..4d97c5f
--- /dev/null
+++ b/test/conf.d/eth_dhcp
@@ -0,0 +1 @@
+config_$$WIRED$$="dhcp"

diff --git a/test/conf.d/eth_static b/test/conf.d/eth_static
new file mode 100644
index 000..cc0fb23
--- /dev/null
+++ b/test/conf.d/eth_static
@@ -0,0 +1,2 @@
+config_$$WIRED$$="172.27.3.82/21"
+routes_$$WIRED$$="default via 172.27.7.254"

diff --git a/test/conf.d/vlan b/test/conf.d/vlan
new file mode 100644
index 000..8d6a936
--- /dev/null
+++ b/test/conf.d/vlan
@@ -0,0 +1,3 @@
+vlans_$$VLAN_IFACE_1$$="1"
+config_$$VLAN_IFACE_1$$="null"
+config_$$VLAN_IFACE_1$$_1="192.168.2.1/24"
\ No newline at end of file

diff --git a/test/config.ini b/test/config.ini
new file mode 100644
index 000..286adb3
--- /dev/null
+++ b/test/config.ini
@@ -0,0 +1,28 @@
+[GLOBALS]
+MODE_MASTER = master
+MODE_SLAVE = slave
+CONFIG_FILE = /etc/conf.d/net
+CONFIG_FILE_BACKUP = /etc/conf.d/net.backup
+DELAY = 5
+TIMEOUT = 5
+
+[FILE]
+KEYSTORE = /tmp/netifrc_test.py
+
+[SPECS]
+DUMMY = dummy0
+WIRED = eth0
+WIRELESS = wlp3s0
+
+# [BONDING]
+BOND = bond0
+BOND_IFACE_1 = %(WIRED)s
+BOND_IFACE_2 = %(DUMMY)s
+
+# [VLan]
+VLAN_IFACE_1 = %(WIRED)s
+
+# [Bridge]
+BRIDGE = br0
+BRIDGE_IFACE_1 = %(WIRED)s
+BRIDGE_IFACE_2 = %(DUMMY)s

diff --git a/test/requirements.txt b/test/requirements.txt
new file mode 100644
index 000..f5a24b9
--- /dev/null
+++ b/test/requirements.txt
@@ -0,0 +1,2 @@
+pyyaml
+termcolor

diff --git a/test/specs/bond.yaml b/test/specs/bond.yaml
new file mode 100644
index 000..46bc312
--- /dev/null
+++ b/test/specs/bond.yaml
@@ -0,0 +1,23 @@
+name: Bond Test Suite
+description: Test to check the functioning of net.bond0
+net_config: conf.d/bond
+interface: $$BOND$$
+tests:
+  - name: Check Bond Interface
+command: ifconfig $$BOND$$
+keys:
+- name: status
+  type: boolean
+  value: grep -q UP
+- name: IP
+  value: "grep 'inet ' |  sed -e 's/^[ \t]*//' | cut -d ' ' -f2"
+  match: "r'\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\b'"
+  - name: "Check /proc/net file"
+command: "cat /proc/net/bonding/$$BOND$$"
+keys:
+- name: Slave $$BOND_IFACE_1$$ status
+  type: boolean
+  value: "grep -A 1 'Slave Interface: $$BOND_IFACE_1$$' | grep Status | 
grep -q -i up"
+- name: Slave $$BOND_IFACE_2$$ status
+  type: boolean
+  value: "grep -A 1 'Slave Interface: $$BO

[gentoo-commits] proj/netifrc:master commit in: /

[Robin H. Johnson]

commit: 28aaac827658967ead28fa6e99e261b68c5e4d88
Author: Robin H. Johnson  orbis-terrarum  net>
AuthorDate: Fri Jan  9 17:15:43 2015 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Fri Jan  9 17:15:43 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=28aaac82

Merge pull request #3 from rabisg/cleanup

netifrc systemd support

This marks the culmination of the GSoC 2014 netifrc project: systemd support.

I'd like to extend a huge thank you to my GSoC student on this project: Rabi 
Shanker (rabisg)

For the idea, proposal, and his work notes, please see:
https://wiki.gentoo.org/wiki/Google_Summer_of_Code/2014/Ideas/netifrc_on_systemd
https://wiki.gentoo.org/wiki/User:Rabisg/GSOC_2014_Proposal
https://wiki.gentoo.org/wiki/User:Rabisg/GSOC_14

There is a little bit of documentation to come, and along with ebuild updates.

This series does also introduce a test suite to netifrc, on which there is much 
work to come.

Signed-off-by: Robin H. Johnson  gentoo.org>
Reviewed-by: Michal Gorny  gentoo.org> (systemd-specific pieces)


 .gitignore |   2 +
 init.d/net.lo.in   |  18 +++-
 mk/scripts.mk  |   2 +-
 sh/Makefile|   8 +-
 sh/functions.sh| 126 +
 sh/systemd-wrapper.sh.in   |  91 ++
 systemd/net_at.service.in  |  10 ++
 test/conf.d/bond   |   9 ++
 test/conf.d/bridge |   9 ++
 test/conf.d/eth_dhcp   |   1 +
 test/conf.d/eth_static |   2 +
 test/conf.d/vlan   |   3 +
 test/config.ini|  28 ++
 test/requirements.txt  |   2 +
 test/specs/bond.yaml   |  23 +
 test/specs/bridge.yaml |  11 +++
 test/specs/eth_dhcp.yaml   |  14 +++
 test/specs/eth_static.yaml |  14 +++
 test/specs/vlan.yaml   |  11 +++
 test/src/file.py   |  21 +
 test/src/netifrc.py| 227 +
 21 files changed, 624 insertions(+), 8 deletions(-)

[gentoo-commits] proj/netifrc:master commit in: /

[Robin H. Johnson]

commit: 986029121ae49984c98a76efa83d4e48d5c9f650
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Fri Jan  9 17:18:14 2015 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Fri Jan  9 17:18:14 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=98602912

Bump version for the first systemd-supporting release.

Signed-off-by: Robin H. Johnson  gentoo.org>

---
 Makefile.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.inc b/Makefile.inc
index 424958f..84a2ec4 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,3 +1,3 @@
 NAME=  netifrc
-VERSION=   0.2.4
+VERSION=   0.3.0
 PKG=   ${NAME}-${VERSION}

[gentoo-commits] proj/netifrc: New tag: 0.3.0

[Robin H. Johnson]

commit: 
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Fri Jan  9 17:19:03 2015 +

New tag: 0.3.0

[gentoo-commits] proj/netifrc:master commit in: /

[Robin H. Johnson]

commit: e4bc55960f9eb64fdf4998370d516fbf4f856635
Author: Robin H. Johnson  orbis-terrarum  net>
AuthorDate: Fri Jan 16 18:11:18 2015 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Fri Jan 16 18:11:18 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=e4bc5596

Merge pull request #7 from dwfreed/fix-functions-sh

functions.sh: fix check for OpenRC


 sh/functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[gentoo-commits] proj/netifrc:master commit in: sh/

[Robin H. Johnson]

commit: 8ac4bdbd7b752c6a0805559d4644824d1f5c9603
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Fri Jan 16 18:15:59 2015 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Fri Jan 16 18:15:59 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=8ac4bdbd

Speed up testing for e* commands.

Signed-off-by: Robin H. Johnson  gentoo.org>

---
 sh/functions.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sh/functions.sh b/sh/functions.sh
index e209701..d907585 100644
--- a/sh/functions.sh
+++ b/sh/functions.sh
@@ -2,8 +2,7 @@
 # systems.
 
 # First check whether e* commands are present in the environment
-# XXX [[-n RC_GOT_FUNCTIONS]] ??
-if [ -n "$(command -v ebegin >/dev/null 2>&1)" ]; then
+if [ x$RC_GOT_FUNCTIONS = xyes -o -n "$(command -v ebegin 2>/dev/null)" ]; then
:
 
 # Then check for the presence of functions.sh
@@ -16,6 +15,8 @@ else
 fi
 
 # runscript functions
+# TODO: if another non-openrc system provides these in future, we have to
+# change this structure.
 if [ "$INIT" != "openrc" ]; then
 
# OpenRC functions used in depend

[gentoo-commits] proj/netifrc:master commit in: sh/

[Robin H. Johnson]

commit: 0dd6367068b46c1cc0b5f83d2716d9cfd2a076ec
Author: Doug Freed  mtu  edu>
AuthorDate: Fri Jan 16 04:44:53 2015 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Fri Jan 16 04:44:53 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=0dd63670

functions.sh: fix check for OpenRC

Fix the check for OpenRC so that it actually matches whether it's
running under OpenRC.

Reported-By: Patrick McLean  gentoo.org>

---
 sh/functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sh/functions.sh b/sh/functions.sh
index 368bb73..e209701 100644
--- a/sh/functions.sh
+++ b/sh/functions.sh
@@ -16,7 +16,7 @@ else
 fi
 
 # runscript functions
-if [ -z "$(command -v service_set_value >/dev/null 2>&1)" ]; then
+if [ "$INIT" != "openrc" ]; then
 
# OpenRC functions used in depend
after() {

[gentoo-commits] proj/netifrc:master commit in: sh/, init.d/

[Robin H. Johnson]

commit: adf811644540e0d5702337eeceb95d0b8a7bc4ff
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Jan 11 17:39:08 2015 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Thu Jan 15 15:28:58 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=adf81164

Do not call exit with a negative value

This is undefined in POSIX.

---
 init.d/net.lo.in | 2 +-
 sh/functions.sh  | 4 ++--
 sh/systemd-wrapper.sh.in | 9 -
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index c79e7ff..e9e7f7c 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -22,7 +22,7 @@ if [ -f "$SHDIR/functions.sh" ]; then
. "$SHDIR/functions.sh"
 else
echo "$SHDIR/functions.sh missing. Exiting"
-   exit -1
+   exit 1
 fi
 
 depend()

diff --git a/sh/functions.sh b/sh/functions.sh
index 368bb73..0048a5f 100644
--- a/sh/functions.sh
+++ b/sh/functions.sh
@@ -12,7 +12,7 @@ elif [ -f /lib/gentoo/functions.sh ]; then
 
 else
echo "/lib/gentoo/functions.sh not found. Exiting"
-   exit -1
+   exit 1
 fi
 
 # runscript functions
@@ -119,7 +119,7 @@ get_interface() {
printf ${RC_IFACE};;
*)
eerror "Init system not supported. Aborting"
-   exit -1;;
+   exit 1;;
esac
 }
 

diff --git a/sh/systemd-wrapper.sh.in b/sh/systemd-wrapper.sh.in
index d931200..b26f976 100644
--- a/sh/systemd-wrapper.sh.in
+++ b/sh/systemd-wrapper.sh.in
@@ -14,7 +14,7 @@ usage() {
 
 die() {
   echo "$@"
-  exit -1
+  exit 1
 }
 
 while getopts "i:" opt; do
@@ -49,8 +49,7 @@ fi
 if [ -f "$INITDIR/${RC_SVCPREFIX}.lo" ]; then
. "$INITDIR/${RC_SVCPREFIX}.lo"
 else
-   echo "$INITDIR/${RC_SVCPREFIX}.lo : Init file missing or invalid path"
-   exit -1
+   die "$INITDIR/${RC_SVCPREFIX}.lo : Init file missing or invalid path"
 fi
 
 netifrc_init() {
@@ -58,13 +57,13 @@ netifrc_init() {
mkdir -p "$OPTIONSDIR"
if [ ! -w "$OPTIONSDIR" ]; then
eerror "${OPTIONSDIR} does not exist or is not writeable"
-   exit -1;
+   exit 1
fi
# Ensure STATEDIR is present and writeable
mkdir -p "$STATEDIR"
if [ ! -w "$STATEDIR" ]; then
eerror "${STATEDIR} does not exist or is not writeable"
-   exit -1;
+   exit 1
fi
 }
 

[gentoo-commits] proj/netifrc:master commit in: net/

[Robin H. Johnson]

commit: f86f4c03e6b403614e4613dff5805429740b076e
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Jan 11 05:56:51 2015 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Thu Jan 15 15:28:58 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=f86f4c03

dhcpcd: Avoid calling start-stop-daemon

X-Gentoo-Bug: 536282
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=536282

---
 net/dhcpcd.sh | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/net/dhcpcd.sh b/net/dhcpcd.sh
index bdb60c6..c598083 100644
--- a/net/dhcpcd.sh
+++ b/net/dhcpcd.sh
@@ -82,10 +82,7 @@ dhcpcd_stop()
[ -z "${opts}" ] && opts=${dhcp}
case " ${opts} " in
*" release "*) dhcpcd -k "${IFACE}" ;;
-   *)
-   start-stop-daemon --stop --quiet \
---signal ${sig} --pidfile "${pidfile}"
-   ;;
+   *) dhcpcd -x "${IFACE}" ;;
esac
eend $?
 }

[gentoo-commits] proj/netifrc:master commit in: systemd/

[Robin H. Johnson]

commit: 5d36a7df2d7840a72ca8610649a29b7eeb592fe4
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Jan 11 05:15:03 2015 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Thu Jan 15 15:28:53 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=5d36a7df

systemd: Unit file improvements

- Remove quotes from description.
- Set Type=oneshot.

---
 systemd/net_at.service.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/systemd/net_at.service.in b/systemd/net_at.service.in
index a729ec4..ac89899 100644
--- a/systemd/net_at.service.in
+++ b/systemd/net_at.service.in
@@ -1,7 +1,8 @@
 [Unit]
-Description="Gentoo Network Interface Management Scripts"
+Description=Gentoo Network Interface Management Scripts
 
 [Service]
+Type=oneshot
 ExecStart=@LIBEXECDIR@/sh/systemd-wrapper.sh -i %I start
 ExecStop=@LIBEXECDIR@/sh/systemd-wrapper.sh -i %I stop
 RemainAfterExit=yes

[gentoo-commits] proj/netifrc:master commit in: /

[Robin H. Johnson]

commit: ea4b01b115ba3501073c326099e9c6f89de4c3af
Author: Robin H. Johnson  orbis-terrarum  net>
AuthorDate: Mon Jan 19 08:54:39 2015 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Jan 19 08:54:39 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=ea4b01b1

Merge pull request #6 from floppym/fixes1

Miscellaneous fixes


 init.d/net.lo.in  | 2 +-
 net/dhcpcd.sh | 5 +
 sh/functions.sh   | 4 ++--
 sh/systemd-wrapper.sh.in  | 9 -
 systemd/net_at.service.in | 3 ++-
 5 files changed, 10 insertions(+), 13 deletions(-)

[gentoo-commits] proj/netifrc:master commit in: /

[Robin H. Johnson]

commit: 3a5b26fbc472d74073f867e79e7e8f88e2f8c5b0
Author: Robin H. Johnson  orbis-terrarum  net>
AuthorDate: Mon Jan 19 08:56:05 2015 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Jan 19 08:56:05 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=3a5b26fb

Merge pull request #8 from casta/master

fix https://bugs.gentoo.org/show_bug.cgi?id=536758


 sh/functions.sh | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

[gentoo-commits] proj/netifrc:master commit in: sh/

[Robin H. Johnson]

commit: 4f303b048743f494a79916a0a30ecb3b027164b7
Author: Guillaume Castagnino  denyall  com>
AuthorDate: Fri Jan 16 11:57:15 2015 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Fri Jan 16 11:58:02 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=4f303b04

fix https://bugs.gentoo.org/show_bug.cgi?id=536758

The shill version of shell_var is not correctly escaping vars

---
 sh/functions.sh | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/sh/functions.sh b/sh/functions.sh
index 368bb73..d82d72a 100644
--- a/sh/functions.sh
+++ b/sh/functions.sh
@@ -33,11 +33,14 @@ if [ -z "$(command -v service_set_value >/dev/null 2>&1)" 
]; then
}
 
shell_var() {
-   local output=$1 sanitized_arg=
-   shift 1
+   local output= sanitized_arg=
for arg; do
sanitized_arg="${arg//[^a-zA-Z0-9_]/_}"
-   output="$output $arg"
+   if [ x"$output" = x"" ] ; then
+   output=$sanitized_arg
+   else
+   output="$output $sanitized_arg"
+   fi
done
echo "$output"
}

[gentoo-commits] proj/netifrc:master commit in: /

[Robin H. Johnson]

commit: 95801f1cc41adc2b95ac3743446d21cf83b75d0b
Author: Robin H. Johnson  orbis-terrarum  net>
AuthorDate: Mon Jan 19 08:54:05 2015 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Jan 19 08:54:05 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=95801f1c

Merge pull request #5 from dwfreed/master

firewalld: remove use of OpenRC need function


 net/firewalld.sh | 1 -
 1 file changed, 1 deletion(-)

[gentoo-commits] proj/netifrc:master commit in: net/

[Robin H. Johnson]

commit: cc1d16c46c4ff0261f8be499769f49a3527a03c6
Author: Doug Freed  mtu  edu>
AuthorDate: Tue Jan 13 23:20:05 2015 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Fri Jan 16 20:37:06 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=cc1d16c4

firewalld: remove use of OpenRC need function

You can't use OpenRC's dependency functions in module depend functions,
because they aren't called in the OpenRC init script's depend function.
System administrators are responsible for ensuring that the dependencies
for their configuration are set correctly via (for OpenRC)
/etc/conf.d/net.

---
 net/firewalld.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net/firewalld.sh b/net/firewalld.sh
index ae83c57..b20f571 100644
--- a/net/firewalld.sh
+++ b/net/firewalld.sh
@@ -6,7 +6,6 @@ firewalld_depend()
after interface
before dhcp
program firewall-cmd
-   [ "$IFACE" != "lo" ] && need firewalld
 }
 
 _config_vars="$_config_vars firewalld_zone"

[gentoo-commits] proj/netifrc:master commit in: /

[Robin H. Johnson]

commit: 0c96bf1eb6f13f7d0ca6d362e6e5593b23ee3341
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Thu Jan 22 23:07:48 2015 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Thu Jan 22 23:07:48 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=0c96bf1e

Bump for 0.3.1 release.

Signed-off-by: Robin H. Johnson  gentoo.org>

---
 Makefile.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.inc b/Makefile.inc
index 84a2ec4..63bce04 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,3 +1,3 @@
 NAME=  netifrc
-VERSION=   0.3.0
+VERSION=   0.3.1
 PKG=   ${NAME}-${VERSION}

[gentoo-commits] proj/netifrc: New tag: 0.3.1

[Robin H. Johnson]

commit: 
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Thu Jan 22 23:10:01 2015 +

New tag: 0.3.1

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit: 76e801c8db8487c2ada3af906327c6466c8108d2
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Jun 22 02:08:34 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Jun 22 02:08:34 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=76e801c8

Make gen_minkernpackage use the same kernel naming as the normal path 
(kerncache).

Signed-off-by: Robin H. Johnson  gentoo.org>

---
 gen_package.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gen_package.sh b/gen_package.sh
index 520d771..fa155b9 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -21,11 +21,11 @@ gen_minkernpackage() {
gen_die "Cannot locate kernel binary"
fi
cd "${KERNEL_OUTPUTDIR}"
-   cp "${tmp_kernel_binary}" "${TEMP}/minkernpackage/kernel-${KV}" 
|| gen_die 'Could not the copy kernel for the min kernel package!'
+   cp "${tmp_kernel_binary}" 
"${TEMP}/minkernpackage/kernel-${ARCH}-${KV}" || gen_die 'Could not the copy 
kernel for the min kernel package!'
cp ".config" "${TEMP}/minkernpackage/config-${ARCH}-${KV}" || 
gen_die 'Could not the copy kernel config for the min kernel package!'
if isTrue "${GENZIMAGE}"
then
-   cp "${tmp_kernel_binary2}" 
"${TEMP}/minkernpackage/kernelz-${KV}" || gen_die "Could not copy the kernelz 
for the min kernel package"
+   cp "${tmp_kernel_binary2}" 
"${TEMP}/minkernpackage/kernelz-${ARCH}-${KV}" || gen_die "Could not copy the 
kernelz for the min kernel package"
fi
fi
 

[gentoo-commits] proj/genkernel: New tag: v3.4.50

[Robin H. Johnson]

commit: 
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Mon Jun 23 22:04:54 2014 +

New tag: v3.4.50

[gentoo-commits] proj/genkernel: Tag deleted: v3.4.50

[Robin H. Johnson]

commit: 
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Mon Jun 23 22:06:28 2014 +

Tag deleted: v3.4.50

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit: ba88b2e852c94222437dc9567d15942210ef5b6f
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Jun 23 21:58:31 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Jun 23 22:05:18 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=ba88b2e8

gen_package: packaged kernel/initramfs name fixes

Previous commit 76e801c8 did not actually go far enough.

The existing install from kerncache code that is normally used with
passing --install used a form of kernel-${KNAME}-${ARCH}-${KV}.

Instead of just the kernel-${ARCH}-${KV} we were using in commit
76e801c8, or kernel-${KV} that we used before that, let's use the same
naming per the regular path.

Also add safety checks that the kernels exist, as you could get an empty
tarball otherwise!

Signed-off-by: Robin H. Johnson  gentoo.org>

---
 gen_package.sh | 23 ++-
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/gen_package.sh b/gen_package.sh
index 1a9068a..9dd166b 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -8,10 +8,18 @@ gen_minkernpackage() {
if [ "${KERNCACHE}" != "" ]
then
/bin/tar -xj -C ${TEMP}/minkernpackage -f ${KERNCACHE} 
kernel-${ARCH}-${KV}
+   mv 
minkernpackage/{kernel-${ARCH}-${KV},kernel-${KNAME}-${ARCH}-${KV}}
/bin/tar -xj -C ${TEMP}/minkernpackage -f ${KERNCACHE} 
config-${ARCH}-${KV}
+   mv 
minkernpackage/{config-${ARCH}-${KV},config-${KNAME}-${ARCH}-${KV}}
if isTrue "${GENZIMAGE}"
then
/bin/tar -xj -C ${TEMP}/minkernpackage -f ${KERNCACHE} 
kernelz-${ARCH}-${KV}
+   mv 
minkernpackage/{kernelz-${ARCH}-${KV},kernelz-${KNAME}-${ARCH}-${KV}}
+   fi
+   if [ ! -f minkernpackage/kernel-${KNAME}-${ARCH}-${KV} \
+ -o ! -f minkernpackage/config-${KNAME}-${ARCH}-${KV} ];
+   then
+   gen_die "Cannot locate kernel binary"
fi
else
local tmp_kernel_binary=$(find_kernel_binary ${KERNEL_BINARY})
@@ -21,24 +29,29 @@ gen_minkernpackage() {
gen_die "Cannot locate kernel binary"
fi
cd "${KERNEL_OUTPUTDIR}"
-   cp "${tmp_kernel_binary}" 
"${TEMP}/minkernpackage/kernel-${ARCH}-${KV}" || gen_die 'Could not the copy 
kernel for the min kernel package!'
-   cp ".config" "${TEMP}/minkernpackage/config-${ARCH}-${KV}" || 
gen_die 'Could not the copy kernel config for the min kernel package!'
+   cp "${tmp_kernel_binary}" 
"${TEMP}/minkernpackage/kernel-${KNAME}-${ARCH}-${KV}" || gen_die 'Could not 
the copy kernel for the min kernel package!'
+   cp ".config" 
"${TEMP}/minkernpackage/config-${KNAME}-${ARCH}-${KV}" || gen_die 'Could not 
the copy kernel config for the min kernel package!'
if isTrue "${GENZIMAGE}"
then
-   cp "${tmp_kernel_binary2}" 
"${TEMP}/minkernpackage/kernelz-${ARCH}-${KV}" || gen_die "Could not copy the 
kernelz for the min kernel package"
+   cp "${tmp_kernel_binary2}" 
"${TEMP}/minkernpackage/kernelz-${KNAME}-${ARCH}-${KV}" || gen_die "Could not 
copy the kernelz for the min kernel package"
fi
fi
 
if ! isTrue "${INTEGRATED_INITRAMFS}"
then
-   [ "${BUILD_RAMDISK}" != '0' ] && { cp 
"${TMPDIR}/initramfs-${KV}" "${TEMP}/minkernpackage/initramfs-${ARCH}-${KV}" || 
gen_die 'Could not copy the initramfs for the kernel package!'; }
+   [ "${BUILD_RAMDISK}" != '0' ] && { cp 
"${TMPDIR}/initramfs-${KV}" 
"${TEMP}/minkernpackage/initramfs-${KNAME}-${ARCH}-${KV}" || gen_die 'Could not 
copy the initramfs for the kernel package!'; }
fi
 
if [ "${KERNCACHE}" != "" ]
then
/bin/tar -xj -C ${TEMP}/minkernpackage -f ${KERNCACHE} 
System.map-${ARCH}-${KV}
+   mv 
minkernpackage/{System.map-${ARCH}-${KV},System.map-${KNAME}-${ARCH}-${KV}}
+   if [ ! -f System.map-${KNAME}-${ARCH}-${KV} ]
+   then
+   gen_die 'Could not copy System.map from kerncache for 
the kernel package!'
+   fi
else
-   cp "${KERNEL_OUTPUTDIR}/System.map" 
"${TEMP}/minkernpackage/System.map-${ARCH}-${KV}" || gen_die 'Could not copy 
System.map for the kernel package!';
+   cp "${KERNEL_OUTPUTDIR}/System.map" 
"${TEMP}/minkernpackage/System.map-${KNAME}-${ARCH}-${KV}" || gen_die 'Could 
not copy System.map for the kernel package!';
fi
 
cd "${TEMP}/minkernpackage"

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit: 2acd1657b490b14a9c1af0215da0ad07dbdf23c0
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Jun 23 21:18:25 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Jun 23 22:05:18 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=2acd1657

genkernel: Bump version.

Signed-off-by: Robin H. Johnson  gentoo.org>

---
 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index d1f6d4f..8b01662 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='3.4.49.2'
+GK_V='3.4.50'
 
 # Set the default for TMPDIR.  May be modified by genkernel.conf or the
 # --tempdir command line option.

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit: 96dc776787d23238a4e8dfedc4514911a3d84c37
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Jun 23 21:56:17 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Jun 23 22:05:18 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=96dc7767

gen_cmdline: fix pkg path getting stuff deleted

If you pass --minkernpackage=X, --modulespackage=X or --kerncache=X with
a relative path, then it's creates the output file in a temporary
working dir that is later removed during cleanup.

Resolve the paths during argument parsing to prevent this.

Signed-off-by: Robin H. Johnson  gentoo.org>

---
 gen_cmdline.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index ca6cbcf..6ef6ae0 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -501,14 +501,17 @@ parse_cmdline() {
;;
--minkernpackage=*)
CMD_MINKERNPACKAGE=`parse_opt "$*"`
+   [ ${CMD_MINKERNPACKAGE:0:1} != / ] && 
CMD_MINKERNPACKAGE=$PWD/$CMD_MINKERNPACKAGE
print_info 2 "MINKERNPACKAGE: ${CMD_MINKERNPACKAGE}"
;;
--modulespackage=*)
CMD_MODULESPACKAGE=`parse_opt "$*"`
+   [ ${CMD_MODULESPACKAGE:0:1} != / ] && 
CMD_MODULESPACKAGE=$PWD/$CMD_MODULESPACKAGE
print_info 2 "MODULESPACKAGE: ${CMD_MODULESPACKAGE}"
;;
--kerncache=*)
CMD_KERNCACHE=`parse_opt "$*"`
+   [ ${CMD_KERNCACHE:0:1} != / ] && 
CMD_KERNCACHE=$PWD/$CMD_KERNCACHE
print_info 2 "KERNCACHE: ${CMD_KERNCACHE}"
;;
--kernname=*)

[gentoo-commits] proj/genkernel: New tag: v3.4.50

[Robin H. Johnson]

commit: 
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Mon Jun 23 22:06:40 2014 +

New tag: v3.4.50

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit: 7a1a9d509e38219824676660f41cb4f097c470c4
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Jun 23 16:36:02 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Jun 23 22:05:18 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=7a1a9d50

genkernel.conf: DISTDIR in /var/cache bad

Move DISTDIR to /usr/share/genkernel/distfiles: /var/cache might be on
tmpfs and wiped each boot.

Signed-off-by: Robin H. Johnson  gentoo.org>

---
 genkernel.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel.conf b/genkernel.conf
index 09a7fcc..ad5750e 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -191,7 +191,7 @@ GK_SHARE="${GK_SHARE:-/usr/share/genkernel}"
 # Location of the default cache
 CACHE_DIR="/var/cache/genkernel"
 # Location of DISTDIR, where our source tarballs are stored
-DISTDIR="${CACHE_DIR}/src"
+DISTDIR="${GK_SHARE}/distfiles"
 # Log output file
 LOGFILE="/var/log/genkernel.log"
 # Debug Level

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit: d4ad031a3a7ecaa0248f2bce19bfdd2ae0247eee
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Jun 23 21:20:04 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Jun 23 22:05:18 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=d4ad031a

gen_package: print full paths to pkgs/cache output

The files are not created in the PWD when genkernel run without
specifying absolute paths for those arguments and I need to debug where
they are actually going.

Signed-off-by: Robin H. Johnson  gentoo.org>

---
 gen_package.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gen_package.sh b/gen_package.sh
index 4780b6c..1a9068a 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -43,7 +43,7 @@ gen_minkernpackage() {
 
cd "${TEMP}/minkernpackage"
/bin/tar -jcpf ${MINKERNPACKAGE} * || gen_die 'Could not compress the 
kernel package!'
-   print_info 3 "Created minimal kernel package: ${MINKERNPACKAGE}"
+   print_info 3 "Created minimal kernel package: $(readlink -f 
${MINKERNPACKAGE})"
cd "${TEMP}" && rm -rf "${TEMP}/minkernpackage" > /dev/null 2>&1
 }
 
@@ -61,7 +61,7 @@ gen_modulespackage() {
else
print_info 1 "Could not create a modules package 
${INSTALL_MOD_PATH}/lib/modules/${KV} was not found"
fi
-   print_info 3 "Created modules package: ${MODULESPACKAGE}"
+   print_info 3 "Created modules package: $(readlink -f ${MODULESPACKAGE})"
cd "${TEMP}" && rm -rf "${TEMP}/modulespackage" > /dev/null 2>&1
 }
 gen_kerncache()
@@ -107,7 +107,7 @@ gen_kerncache()
 
cd "${TEMP}/kerncache"
/bin/tar -jcpf ${KERNCACHE} * || gen_die 'Could not compress the kernel 
package!'
-   print_info 3 "Created kernel cache: ${KERNCACHE}"
+   print_info 3 "Created kernel cache: $(readlink -f ${KERNCACHE})"
cd "${TEMP}" && rm -rf "${TEMP}/kerncache" > /dev/null 2>&1
 }
 

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit: 11fe5382cf4628be7a8b52123c4aeea09b463080
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Jun 23 19:02:44 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Jun 23 22:05:18 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=11fe5382

gen_package: Log where the kern/mod/cache files go

Signed-off-by: Robin H. Johnson  gentoo.org>

---
 gen_package.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gen_package.sh b/gen_package.sh
index 95cc469..4780b6c 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -43,6 +43,7 @@ gen_minkernpackage() {
 
cd "${TEMP}/minkernpackage"
/bin/tar -jcpf ${MINKERNPACKAGE} * || gen_die 'Could not compress the 
kernel package!'
+   print_info 3 "Created minimal kernel package: ${MINKERNPACKAGE}"
cd "${TEMP}" && rm -rf "${TEMP}/minkernpackage" > /dev/null 2>&1
 }
 
@@ -60,6 +61,7 @@ gen_modulespackage() {
else
print_info 1 "Could not create a modules package 
${INSTALL_MOD_PATH}/lib/modules/${KV} was not found"
fi
+   print_info 3 "Created modules package: ${MODULESPACKAGE}"
cd "${TEMP}" && rm -rf "${TEMP}/modulespackage" > /dev/null 2>&1
 }
 gen_kerncache()
@@ -105,6 +107,7 @@ gen_kerncache()
 
cd "${TEMP}/kerncache"
/bin/tar -jcpf ${KERNCACHE} * || gen_die 'Could not compress the kernel 
package!'
+   print_info 3 "Created kernel cache: ${KERNCACHE}"
cd "${TEMP}" && rm -rf "${TEMP}/kerncache" > /dev/null 2>&1
 }
 

[gentoo-commits] proj/genkernel:aufs commit in: /

[Robin H. Johnson]

commit: 80eb6e77440abece3306d5e06a979d72a4dcc14e
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Jun 23 23:08:59 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Jun 23 23:08:59 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=80eb6e77

Merge branch 'master' into aufs


 arch/alpha/kernel-config  |  2 +-
 arch/x86/kernel-config|  2 +-
 arch/x86_64/kernel-config |  2 +-
 defaults/kernel-config|  2 +-
 gen_cmdline.sh|  5 -
 gen_configkernel.sh   | 20 ++--
 gen_determineargs.sh  |  2 +-
 gen_initramfs.sh  |  4 ++--
 gen_package.sh| 28 ++--
 genkernel | 14 +++---
 genkernel.conf|  2 +-
 11 files changed, 51 insertions(+), 32 deletions(-)

[gentoo-commits] proj/netifrc:master commit in: net/

[Robin H. Johnson]

commit: a93c80793276a026eef5be351cf33377945d8518
Author: Patrick McLean  gaikai  com>
AuthorDate: Wed Dec 10 21:58:26 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Wed Dec 10 22:20:41 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=a93c8079

bonding: use iproute2 rather than ifconfig if it is installed

Currently the bonding contains 2 calls to ifconfig for a couple of operations,
this makes it use iproute2 instead if it is installed.

---
 net/bonding.sh | 15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/net/bonding.sh b/net/bonding.sh
index fb00825..ba75239 100644
--- a/net/bonding.sh
+++ b/net/bonding.sh
@@ -4,7 +4,7 @@
 bonding_depend()
 {
before interface macchanger
-   program /sbin/ifconfig /bin/ifconfig
+   program ip /sbin/ifconfig /bin/ifconfig
# If you do not have sysfs, you MUST have this binary instead for ioctl
# Also you will loose some functionality that cannot be done via sysfs:
if [ ! -d /sys/class/net ]; then
@@ -124,7 +124,12 @@ bonding_pre_start()
unset oiface
eoutdent
# subsume (presumably kernel auto-)configured IP
-   ifconfig ${IFACE} ${addr} up
+   if [ -x "$(command -v ip)" ]; then
+   ip link set ${IFACE} up
+   ip address add ${addr} dev ${IFACE}
+   else
+   ifconfig ${IFACE} ${addr} up
+   fi
else
# warn if root on nfs and no subsume interface supplied
local root_fs_type=$(mountinfo -s /)
@@ -179,7 +184,11 @@ bonding_stop()
 
# Wipe subsumed interface
if [ -n "${subsume}" ]; then
-   ifconfig ${subsume} 0.0.0.0
+   if [ -x "$(command -v ip)" ]; then
+   ip address flush dev ${subsume}
+   else
+   ifconfig ${subsume} 0.0.0.0
+   fi
fi
 
local slaves= s=

[gentoo-commits] proj/netifrc:master commit in: /

[Robin H. Johnson]

commit: cd1f1725c91d71a96ef785c9260d419d04e14fd8
Author: Robin H. Johnson  orbis-terrarum  net>
AuthorDate: Thu Dec 11 18:12:35 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Thu Dec 11 18:12:35 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=cd1f1725

Merge pull request #2 from chutz/bonding_ifconfig

bonding: use iproute2 rather than ifconfig if it is installed


 net/bonding.sh | 15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

[gentoo-commits] proj/gentoo-keys:master commit in: /

[Robin H. Johnson]

commit: 6ade9463f5293d16db2f9e566a7a3cf7b50cbe67
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Wed Dec 31 21:38:11 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Wed Dec 31 21:38:11 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=6ade9463

Bump.

Signed-off-by: Robin H. Johnson  gentoo.org>

[gentoo-commits] proj/gentoo-keys:master commit in: /

[Robin H. Johnson]

commit: fa7d3f6afeb667ecbc59fe4bcb37618dee253538
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Wed Dec 31 21:42:56 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Wed Dec 31 21:42:56 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=fa7d3f6a

Bump.

Signed-off-by: Robin H. Johnson  gentoo.org>

[gentoo-commits] proj/gentoo-keys:master commit in: /

[Robin H. Johnson]

commit: c2f0eb313a65b6c766482b6e5dfcac46a12eff88
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Wed Dec 31 21:49:21 2014 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Wed Dec 31 21:49:21 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=c2f0eb31

Bump.

Signed-off-by: Robin H. Johnson  gentoo.org>

[gentoo-commits] proj/gentoo-keys:master commit in: /

[Robin H. Johnson]

commit: fbaccabb2cd56440d04aeccc14785a618f78ac3c
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Thu Jan  1 04:42:55 2015 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Thu Jan  1 04:42:55 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=fbaccabb

Bump.

Signed-off-by: Robin H. Johnson  gentoo.org>

[gentoo-commits] proj/gentoo-keys:master commit in: /

[Robin H. Johnson]

commit: bd657b51db206db094669e60bf81290f0b7794c3
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Thu Jan  1 04:50:03 2015 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Thu Jan  1 04:50:03 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=bd657b51

Bump.

Signed-off-by: Robin H. Johnson  gentoo.org>

[gentoo-commits] proj/gentoo-keys:master commit in: /

[Robin H. Johnson]

commit: 724cdaca1b74c4df9af15d6528dd86f81d1e718b
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Thu Jan  1 04:51:43 2015 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Thu Jan  1 04:51:43 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=724cdaca

Bump.

Signed-off-by: Robin H. Johnson  gentoo.org>

[gentoo-commits] proj/gentoo-keys:master commit in: /

[Robin H. Johnson]

commit: de27f5b10a599816f43d2d739d9fe087a447848e
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Thu Jan  1 04:52:24 2015 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Thu Jan  1 04:52:24 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=de27f5b1

Bump.

Signed-off-by: Robin H. Johnson  gentoo.org>

[gentoo-commits] proj/gentoo-keys:master commit in: /

[Robin H. Johnson]

commit: 90355479c957f3a0c18a77bcca0f944026c36fdb
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Thu Jan  1 04:57:15 2015 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Thu Jan  1 04:57:15 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=90355479

Bump.

Signed-off-by: Robin H. Johnson  gentoo.org>

[gentoo-commits] repo/gentoo:master commit in: app-misc/ddcutil/files/

[Robin H. Johnson]

commit: b7e21df46f74f27f04c332e2ae01864b3390d1d0
Author: Matthew White  inventati  org>
AuthorDate: Sun Mar 31 08:29:53 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Mar 31 16:27:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7e21df4

app-misc/ddcutil: fix command not found error

Fixes:

 * QA Notice: command not found:
 *
 *  ./configure: line 2975: 0: command not found

Closes: https://bugs.gentoo.org/922205
Package-Manager: portage-3.0.63
Signed-off-by: Matthew White  inventati.org>
X-cherry-picked: 0eb622b9779318b160ed865c095d3bdd4508d96c)
Signed-off-by: Robin H. Johnson  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/36012

 app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch 
b/app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch
index 07897eb74e80..deabd2bfedbc 100644
--- a/app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch
+++ b/app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch
@@ -19,7 +19,7 @@ index c12f15c..27d2124 100644
  dnl AC_MSG_NOTICE([DBG = |$DBG|])
 
 -AM_CONDITIONAL(WARNINGS_ARE_ERRORS_COND, [test "x$ddcutil_version_suffix" != 
"x"] )
-+AM_CONDITIONAL(WARNINGS_ARE_ERRORS_COND, 0)
++AM_CONDITIONAL(WARNINGS_ARE_ERRORS_COND, [test 0])
 
  AS_IF( [test 0$DBG -ne 0],
 AC_MSG_NOTICE([debug messages enabled]),

[gentoo-commits] repo/gentoo:master commit in: app-metrics/bind_exporter/

[Robin H. Johnson]

commit: a31db516d1fef6769c875871c751886a7b5a7a87
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Mar 25 05:18:32 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Mar 25 05:20:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a31db516

app-metrics/bind_exporter: QA: fix RedundantVersion

Signed-off-by: Robin H. Johnson  gentoo.org>

 app-metrics/bind_exporter/Manifest |  1 -
 .../bind_exporter/bind_exporter-0.3.0.ebuild   | 55 
 .../bind_exporter/bind_exporter-0.6.1.ebuild   | 58 --
 3 files changed, 114 deletions(-)

diff --git a/app-metrics/bind_exporter/Manifest 
b/app-metrics/bind_exporter/Manifest
index 9c17ec11501a..262a8c84766b 100644
--- a/app-metrics/bind_exporter/Manifest
+++ b/app-metrics/bind_exporter/Manifest
@@ -1,3 +1,2 @@
-DIST bind_exporter-0.3.0.tar.gz 1796507 BLAKE2B 
a79b9e0d159d3deb83f1a040325ad34bc0d4ae50b6af205dce4ebf8d7152ccbd4b7d46fda40bf76db953996ddf4237ca13058250478b08cca51b8bea08ccc31b
 SHA512 
762901a63a9493f852e5514429f55b10400931f0a77d2e11c7565e93e1ff759eb30d3bbc9278451bb9df358a983aa099bd55cf57241cf36187d2789c89a3852d
 DIST bind_exporter-0.6.1-vendor.tar.xz 1300068 BLAKE2B 
058f4f61ff9c403a5672390dd3944dec9a6b4b1dcf8ac7bcb6943494d43c116236e23f4b0437d5b2e91cb0d936377ba896740594d90b50ce99a61963713ab70c
 SHA512 
9fd880655ac9657d49c0d250b22e46c53a63c0a2d4097763ca8856da36f75527d515a4e4cde7dd68c2c5cbf4ea784c07d9bd5e38a01eeb2d308a585c31d5c19b
 DIST bind_exporter-0.6.1.tar.gz 48904 BLAKE2B 
ad2def162e0fac5e857328bb142bc20655d0d1ea4a9d90a3bd8d305a3d86f9247671ca92f90d5ccdcb1a8bd147ed56858a9782feeac019b87666b4b18b7219c1
 SHA512 
d710b7228587e12a101a1d626ec5e0290b0740074f3976eee02463165030b361d3b6df556ab949d632488582ef6d4a3197270afc197d6d756a99c16e55c5448c

diff --git a/app-metrics/bind_exporter/bind_exporter-0.3.0.ebuild 
b/app-metrics/bind_exporter/bind_exporter-0.3.0.ebuild
deleted file mode 100644
index 1f984c920f02..
--- a/app-metrics/bind_exporter/bind_exporter-0.3.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-GIT_COMMIT=c34ff3d6b4817f42e74b2b05b3797cf99683b4a9
-
-DESCRIPTION="Prometheus exporter for BIND"
-HOMEPAGE="https://github.com/digitalocean/bind_exporter";
-SRC_URI="https://github.com/digitalocean/bind_exporter/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-COMMON_DEPEND="acct-group/bind_exporter
-   acct-user/bind_exporter"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="dev-util/promu"
-
-src_prepare() {
-   default
-   sed -i -e "/-s$/d" -e "s/{{.Revision}}/${GIT_COMMIT}/" .promu.yml || die
-}
-
-src_compile() {
-   mkdir -p bin || die
-   promu build -v --prefix bin || die
-}
-
-src_test() {
-   emake test-flags= test
-}
-
-src_install() {
-   dobin bin/${PN}
-   dodoc {README,CHANGELOG}.md
-   newinitd "${FILESDIR}"/${PN}.initd ${PN}
-   newconfd "${FILESDIR}"/${PN}.confd ${PN}
-   keepdir /var/log/${PN}
-   fowners ${PN}:${PN} /var/log/${PN}
-}
-
-pkg_postinst() {
-   elog "Make sure BIND was built with libxml2 support. You can check with 
the"
-   elog "following command: named -V | grep libxml2."
-   elog "Configure BIND to open a statistics channel. It's recommended to 
run"
-   elog "the bind_exporter next to BIND, so it's only necessary to open a 
port"
-   elog "locally."
-   elog ""
-   elog "statistics-channels {"
-   elog "inet 127.0.0.1 port 8053 allow { 127.0.0.1; };"
-   elog "};"
-}

diff --git a/app-metrics/bind_exporter/bind_exporter-0.6.1.ebuild 
b/app-metrics/bind_exporter/bind_exporter-0.6.1.ebuild
deleted file mode 100644
index 85c7fb1fd672..
--- a/app-metrics/bind_exporter/bind_exporter-0.6.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-GIT_COMMIT=c34ff3d6b4817f42e74b2b05b3797cf99683b4a9
-
-DESCRIPTION="Prometheus exporter for BIND"
-HOMEPAGE="https://github.com/prometheus-community/bind_exporter";
-SRC_URI="
-   
https://github.com/prometheus-community/bind_exporter/archive/refs/tags/v${PV}.tar.gz
 -> ${P}.tar.gz
-   
https://dev.gentoo.org/~robbat2/distfiles/bind_exporter-${PV}-vendor.tar.xz
-   "
-
-LICENSE="Apache-2.0 BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-COMMON_DEPEND="acct-group/bind_exporter
-   acct-user/bind_exporter"
-DEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-metrics/bind_exporter/files/, app-metrics/bind_exporter/

[Robin H. Johnson]

commit: 1351ede7b9e4a9e6d004d2f3d019e8d9ba907b78
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Mar 25 05:16:53 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Mar 25 05:20:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1351ede7

app-metrics/bind_exporter: systemd, match other distros for config

Signed-off-by: Robin H. Johnson  gentoo.org>

 .../bind_exporter/bind_exporter-0.6.1-r1.ebuild| 60 ++
 .../bind_exporter/files/bind_exporter.service  | 11 
 2 files changed, 71 insertions(+)

diff --git a/app-metrics/bind_exporter/bind_exporter-0.6.1-r1.ebuild 
b/app-metrics/bind_exporter/bind_exporter-0.6.1-r1.ebuild
new file mode 100644
index ..333599e97b8f
--- /dev/null
+++ b/app-metrics/bind_exporter/bind_exporter-0.6.1-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+GIT_COMMIT=c34ff3d6b4817f42e74b2b05b3797cf99683b4a9
+
+DESCRIPTION="Prometheus exporter for BIND"
+HOMEPAGE="https://github.com/prometheus-community/bind_exporter";
+SRC_URI="
+   
https://github.com/prometheus-community/bind_exporter/archive/refs/tags/v${PV}.tar.gz
 -> ${P}.tar.gz
+   
https://dev.gentoo.org/~robbat2/distfiles/bind_exporter-${PV}-vendor.tar.xz
+   "
+
+LICENSE="Apache-2.0 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND="acct-group/bind_exporter
+   acct-user/bind_exporter"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="dev-util/promu"
+
+src_prepare() {
+   default
+   sed -i -e "/-s$/d" -e "s/{{.Revision}}/${GIT_COMMIT}/" .promu.yml || die
+}
+
+src_compile() {
+   mkdir -p bin || die
+   promu build -v --prefix bin || die
+}
+
+src_test() {
+   emake test-flags= test
+}
+
+src_install() {
+   dobin bin/${PN}
+   dodoc {README,CHANGELOG}.md
+   newinitd "${FILESDIR}"/${PN}.initd ${PN}
+   newconfd "${FILESDIR}"/${PN}.confd ${PN}
+   systemd_dounit "${FILESDIR}"/${PN}.service
+   keepdir /var/log/${PN}
+   fowners ${PN}:${PN} /var/log/${PN}
+}
+
+pkg_postinst() {
+   elog "Make sure BIND was built with libxml2 support. You can check with 
the"
+   elog "following command: named -V | grep libxml2."
+   elog "Configure BIND to open a statistics channel. It's recommended to 
run"
+   elog "the bind_exporter next to BIND, so it's only necessary to open a 
port"
+   elog "locally."
+   elog ""
+   elog "statistics-channels {"
+   elog "inet 127.0.0.1 port 8053 allow { 127.0.0.1; };"
+   elog "};"
+}

diff --git a/app-metrics/bind_exporter/files/bind_exporter.service 
b/app-metrics/bind_exporter/files/bind_exporter.service
new file mode 100644
index ..ad2a237a061a
--- /dev/null
+++ b/app-metrics/bind_exporter/files/bind_exporter.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Bind Exporter
+Documentation="https://github.com/prometheus-community/bind_exporter";
+
+[Service]
+User=bind_exporter
+EnvironmentFile=/etc/sysconfig/bind_exporter
+ExecStart=/usr/sbin/bind_exporter $OPTIONS
+
+[Install]
+WantedBy=multi-user.target

[gentoo-commits] repo/gentoo:master commit in: app-metrics/bind_exporter/

[Robin H. Johnson]

commit: 3569befa2b4ea88a83cdfb0a5dc4114934ff867e
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Mar 25 05:18:05 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Mar 25 05:20:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3569befa

app-metrics/bind_exporter: QA: fix EmptyGlobalAssignment

Signed-off-by: Robin H. Johnson  gentoo.org>

 app-metrics/bind_exporter/bind_exporter-0.3.0.ebuild| 1 -
 app-metrics/bind_exporter/bind_exporter-0.6.1-r1.ebuild | 1 -
 app-metrics/bind_exporter/bind_exporter-0.6.1.ebuild| 1 -
 3 files changed, 3 deletions(-)

diff --git a/app-metrics/bind_exporter/bind_exporter-0.3.0.ebuild 
b/app-metrics/bind_exporter/bind_exporter-0.3.0.ebuild
index 683d0803b1fa..1f984c920f02 100644
--- a/app-metrics/bind_exporter/bind_exporter-0.3.0.ebuild
+++ b/app-metrics/bind_exporter/bind_exporter-0.3.0.ebuild
@@ -12,7 +12,6 @@ 
SRC_URI="https://github.com/digitalocean/bind_exporter/archive/v${PV}.tar.gz ->
 LICENSE="Apache-2.0 BSD MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
 COMMON_DEPEND="acct-group/bind_exporter
acct-user/bind_exporter"

diff --git a/app-metrics/bind_exporter/bind_exporter-0.6.1-r1.ebuild 
b/app-metrics/bind_exporter/bind_exporter-0.6.1-r1.ebuild
index 333599e97b8f..5d586670b4e6 100644
--- a/app-metrics/bind_exporter/bind_exporter-0.6.1-r1.ebuild
+++ b/app-metrics/bind_exporter/bind_exporter-0.6.1-r1.ebuild
@@ -15,7 +15,6 @@ SRC_URI="
 LICENSE="Apache-2.0 BSD MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
 COMMON_DEPEND="acct-group/bind_exporter
acct-user/bind_exporter"

diff --git a/app-metrics/bind_exporter/bind_exporter-0.6.1.ebuild 
b/app-metrics/bind_exporter/bind_exporter-0.6.1.ebuild
index 6f9020afafd7..85c7fb1fd672 100644
--- a/app-metrics/bind_exporter/bind_exporter-0.6.1.ebuild
+++ b/app-metrics/bind_exporter/bind_exporter-0.6.1.ebuild
@@ -15,7 +15,6 @@ SRC_URI="
 LICENSE="Apache-2.0 BSD MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
 COMMON_DEPEND="acct-group/bind_exporter
acct-user/bind_exporter"

[gentoo-commits] repo/gentoo:master commit in: app-admin/fifo-cronolog/

[Robin H. Johnson]

commit: 244c1a8fbec377a129414d299666e087b01e50f3
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Mar 25 05:32:14 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Mar 25 05:32:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=244c1a8f

app-admin/fifo-cronolog: fix systemd unit

Signed-off-by: Robin H. Johnson  gentoo.org>

 app-admin/fifo-cronolog/Manifest   |  1 -
 .../fifo-cronolog/fifo-cronolog-1.1.1-r2.ebuild| 29 --
 ...-1.2.3.ebuild => fifo-cronolog-1.2.3-r1.ebuild} |  2 +-
 3 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/app-admin/fifo-cronolog/Manifest b/app-admin/fifo-cronolog/Manifest
index a35f7f1febc4..959d598d56fb 100644
--- a/app-admin/fifo-cronolog/Manifest
+++ b/app-admin/fifo-cronolog/Manifest
@@ -1,2 +1 @@
-DIST fifo-cronolog-1.1.1.tar.bz2 3124 BLAKE2B 
6e9cb35e0ed1b54c3baed4451742840dc1144294fc675822c1260d4d7d885a52f8835e60dcbed57c714e40e94e6d51b3ba78af9b9892883f5f520a7c57d30df8
 SHA512 
3ac809d5cfc951764aaf31d50ee394b0dde9ced16f53daa91c81bdb218af2bab410ff945ebfdeb8307a55bda3292c0a55eb500c3cb73595e17228ef739455d90
 DIST fifo-cronolog-1.2.3.tar.gz 4518 BLAKE2B 
c227304d98b2467a1ed7352399b1e53aba4dc005fa30a1be73b8cc96d61ee49d5f6a3703ccddd1ffef652c4090e9b5dfed9cce3f1254b959a1ccc07aac78b3f6
 SHA512 
557be1a663c5754a293092078b8a3710474bb1939c1ee65e4c560056238ca646e941e4ad82c0a90c02834fc90ddb2aae9047a4e73d42cf8c2c013f2a5d2c839c

diff --git a/app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r2.ebuild 
b/app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r2.ebuild
deleted file mode 100644
index 06b9ddeebf9e..
--- a/app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="cronolog wrapper for use with dumb daemons like squid, varnish 
and so on"
-HOMEPAGE="https://cgit.gentoo.org/proj/fifo-cronolog.git";
-SRC_URI="http://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2";
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="app-admin/cronolog"
-
-src_install() {
-   dosbin fifo-cronolog
-
-   newinitd fifo-cronolog.initd fifo-cronolog
-   newconfd fifo-cronolog.confd fifo-cronolog
-
-   dosym fifo-cronolog /usr/sbin/squid-cronolog
-}
-
-pkg_postinst() {
-   elog "Warning: app-admin/squid-cronolog has been renamed to 
app-admin/fifo-cronolog."
-   elog "This also applies to the binary 'squid-cronolog' but there is a 
symlink for now"
-   elog "Please fix your scripts/configs."
-}

diff --git a/app-admin/fifo-cronolog/fifo-cronolog-1.2.3.ebuild 
b/app-admin/fifo-cronolog/fifo-cronolog-1.2.3-r1.ebuild
similarity index 95%
rename from app-admin/fifo-cronolog/fifo-cronolog-1.2.3.ebuild
rename to app-admin/fifo-cronolog/fifo-cronolog-1.2.3-r1.ebuild
index 06e5d7dd386b..27cfe32f20a1 100644
--- a/app-admin/fifo-cronolog/fifo-cronolog-1.2.3.ebuild
+++ b/app-admin/fifo-cronolog/fifo-cronolog-1.2.3-r1.ebuild
@@ -27,7 +27,7 @@ src_install() {
newinitd openrc/fifo-cronolog.initd fifo-cronolog
newconfd openrc/fifo-cronolog.confd fifo-cronolog
 
-   systemd_douserunit systemd/fifo-cronolog@.service
+   systemd_dounit systemd/fifo-cronolog@.service
dodoc README.md systemd/fifo-crono...@example.service.env
 }
 

[gentoo-commits] repo/gentoo:master commit in: net-misc/sks/files/, net-misc/sks/

[Robin H. Johnson]

commit: 10e3fa8b58a6d0224cba3d2b2e2df958891879f0
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Mar 25 05:52:58 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Mar 25 05:55:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10e3fa8b

net-misc/sks: match init.d behavior

- support args to systemd service
- ensure paths are correctly owned (/var/lib/sks/{PTree,KDB} must exist)
- sks-recon must start after sks-db

Signed-off-by: Robin H. Johnson  gentoo.org>

 net-misc/sks/files/sks-db.service  | 7 ++-
 net-misc/sks/files/sks-recon.service   | 7 +--
 ...sks-1.1.6_p20200624-r1.ebuild => sks-1.1.6_p20200624-r2.ebuild} | 0
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/net-misc/sks/files/sks-db.service 
b/net-misc/sks/files/sks-db.service
index bbc3ba7e2b2d..b48db1add6ff 100644
--- a/net-misc/sks/files/sks-db.service
+++ b/net-misc/sks/files/sks-db.service
@@ -3,8 +3,13 @@ Description=SKS database thread
 After=network.target
 
 [Service]
-ExecStart=/usr/bin/sks db
+Environment=SKS_DIR=/var/lib/sks
+EnvironmentFile=-/etc/sysconfig/sks
+ExecStartPre=/usr/lib/rc/bin/checkpath --owner sks:sks --directory ${SKS_DIR} 
${SKS_DIR}/SKS ${SKS_DIR}/PTree
+ExecStartPre=/usr/lib/rc/bin/checkpath --owner sks:sks --file ${SKS_DIR}/*.log 
${SKS_DIR}/KDB/* ${SKS_DIR}/PTree/*
+ExecStart=/usr/bin/sks db ${SKS_OPTIONS} ${SKS_DB_OPTIONS}
 User=sks
+# WorkingDirectory cannot use a variable
 WorkingDirectory=/var/lib/sks
 
 [Install]

diff --git a/net-misc/sks/files/sks-recon.service 
b/net-misc/sks/files/sks-recon.service
index 97ee52ffc0ed..d56731d1c961 100644
--- a/net-misc/sks/files/sks-recon.service
+++ b/net-misc/sks/files/sks-recon.service
@@ -1,10 +1,13 @@
 [Unit]
 Description=SKS key reconnaissance thread
-After=network.target
+After=network.target sks-db.service
 
 [Service]
-ExecStart=/usr/bin/sks recon
+Environment=SKS_DIR=/var/lib/sks
+EnvironmentFile=-/etc/sysconfig/sks
+ExecStart=/usr/bin/sks recon ${SKS_OPTIONS} ${SKS_RECON_OPTIONS}
 User=sks
+# WorkingDirectory cannot use a variable
 WorkingDirectory=/var/lib/sks
 
 [Install]

diff --git a/net-misc/sks/sks-1.1.6_p20200624-r1.ebuild 
b/net-misc/sks/sks-1.1.6_p20200624-r2.ebuild
similarity index 100%
rename from net-misc/sks/sks-1.1.6_p20200624-r1.ebuild
rename to net-misc/sks/sks-1.1.6_p20200624-r2.ebuild

[gentoo-commits] repo/gentoo:master commit in: app-crypt/gnupg/

[Robin H. Johnson]

commit: 3169869c36db352a79b60deebe0dc67c68b408ae
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Jan 28 23:26:51 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Jan 28 23:28:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3169869c

app-crypt/gnupg: bump

Signed-off-by: Robin H. Johnson  gentoo.org>

 app-crypt/gnupg/Manifest   |   2 +
 app-crypt/gnupg/gnupg-2.4.4.ebuild | 198 +
 2 files changed, 200 insertions(+)

diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 2a6a68880c4d..9af56207f15c 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -6,3 +6,5 @@ DIST gnupg-2.4.2.tar.bz2 7346587 BLAKE2B 
7a5aecca25d87f5f531576c8db1629908d97381
 DIST gnupg-2.4.2.tar.bz2.sig 119 BLAKE2B 
da10bc6d93e5bd96572d6e03b99595eb3f3a5e2e53767a235f9e28878a294e6f444c5cee3a44579f6593582e5c4d85e99e963f2eb7ad2d64aa3a54136c39ffef
 SHA512 
d08cb718a8656efb922f2591ec295e678687fe5f3a26459498952d28f4eea4f8368ea896c2908f58e3d3d8ea49faf865a1c146dda1b24f15bf8d37dce3eac868
 DIST gnupg-2.4.3.tar.bz2 7351327 BLAKE2B 
b7f4f5e548ec6dfc89cf8792f507ee8642e8500692998cf8d2edc9f5d8002904d24a714b9caffabee6094707c4595e0f54197535135622a7a32aa772f5818f28
 SHA512 
193a9398445272ec3eb5b79e802efb7414f74bcfffc3db0bf72c0056e04228120c419ed91db168e5733a16a33e548bab5368dd9cf11ecd483825bce189341a1e
 DIST gnupg-2.4.3.tar.bz2.sig 119 BLAKE2B 
763c0569e5378e132de39e1583c19bae8912455bf7cd5a65bcfc88fa43be99fb6bbf8397192b3086db2f6f0f63fc25789f5e6ce98b2fe63cda3bf673b1c60a20
 SHA512 
7a694d194c3befdfc865a7872c0883304ea704e3691eac328d802f12f4f82c2a93eaa1257d3e09b38494b38185f5b8cf35c964f0c3846bbb29b93727ffee
+DIST gnupg-2.4.4.tar.bz2 7886036 BLAKE2B 
02661e89f0358be09fa3e71e7235b764a7dbda62a48a0c8c7a4e6c9919c3b37d54ead50b930af58f8f2fdb87861b849d3f3751e95cbedf46bdfd76caa90c4db4
 SHA512 
3d1a3b08d1ce2319d238d8be96591e418ede1dc0b4ede33a4cc2fe40e9c56d5bbc27b1984736d8a786e7f292ddbc836846a8bdb4bf89f064e953c37cb54b94ef
+DIST gnupg-2.4.4.tar.bz2.sig 237 BLAKE2B 
6ee5878c36fbec747a6d84a268903749d862aab50dd7f9a389aabbf7b94dec1c424615f520b5f4a6d44e02093e8d9ad0b08d0c6cf6fd8886d8c174ce9faac99c
 SHA512 
3ae7b6833576df851901a7619459b514bb82faeed350c864a57a782719d21f694d9ced5a3445c81dfa584a0302f87fedc660b08ea97bb8b861e76d7c5b46d07f

diff --git a/app-crypt/gnupg/gnupg-2.4.4.ebuild 
b/app-crypt/gnupg/gnupg-2.4.4.ebuild
new file mode 100644
index ..f01cb0b88152
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.4.4.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainers should:
+# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/
+# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159
+# (find the one for the current release then subscribe to it +
+# any subsequent ones linked within so you're covered for a while.)
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc
+# in-source builds are not supported: https://dev.gnupg.org/T6313#166339
+inherit flag-o-matic out-of-source multiprocessing systemd toolchain-funcs 
verify-sig
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="https://gnupg.org/";
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools 
usb user-socket wks-server"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( tofu )"
+
+# Existence of executables is checked during configuration.
+# Note: On each bump, update dep bounds on each version from configure.ac!
+DEPEND="
+   >=dev-libs/libassuan-2.5.0
+   >=dev-libs/libgcrypt-1.9.1:=
+   >=dev-libs/libgpg-error-1.46
+   >=dev-libs/libksba-1.6.3
+   >=dev-libs/npth-1.2
+   >=net-misc/curl-7.10
+   sys-libs/zlib
+   bzip2? ( app-arch/bzip2 )
+   ldap? ( net-nds/openldap:= )
+   readline? ( sys-libs/readline:0= )
+   smartcard? ( usb? ( virtual/libusb:1 ) )
+   tofu? ( >=dev-db/sqlite-3.27 )
+   tpm? ( >=app-crypt/tpm2-tss-2.4.0:= )
+   ssl? ( >=net-libs/gnutls-3.2:0= )
+"
+RDEPEND="
+   ${DEPEND}
+   nls? ( virtual/libintl )
+   selinux? ( sec-policy/selinux-gpg )
+   wks-server? ( virtual/mta )
+"
+PDEPEND="
+   app-crypt/pinentry
+"
+BDEPEND="
+   virtual/pkgconfig
+   doc? ( sys-apps/texinfo )
+   nls? ( sys-deve

[gentoo-commits] repo/gentoo:master commit in: net-nds/nsscache/

[Robin H. Johnson]

commit: 2a1b5b12cae92e28d456ede0ff394e98b3ac3b48
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Tue Jan 30 08:22:51 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Tue Jan 30 08:23:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a1b5b12

net-nds/nsscache: QA fixes

Signed-off-by: Robin H. Johnson  gentoo.org>
Reference: https://bugs.gentoo.org/923061

 net-nds/nsscache/nsscache-0.49.ebuild | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/net-nds/nsscache/nsscache-0.49.ebuild 
b/net-nds/nsscache/nsscache-0.49.ebuild
index 90f77100fc73..2674e1db5d26 100644
--- a/net-nds/nsscache/nsscache-0.49.ebuild
+++ b/net-nds/nsscache/nsscache-0.49.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,21 +12,22 @@ DESCRIPTION="commandline tool to sync directory services to 
local cache"
 HOMEPAGE="https://github.com/google/nsscache";
 SRC_URI="https://github.com/google/nsscache/archive/version/${PV}.tar.gz -> 
${P}.tar.gz"
 
-LICENSE="GPL-2"
+# upstream *sources* say "or later", but upstream metadata does not include the
+# 'or later' clause.
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nsscache s3 test"
 
-# testing requires local network (e.g. spin up slapd, httpd)
-#PROPERTIES="test_network"
-#RESTRICT="test"
-
 # Optional extras:
 # TODO: gcs? ( https://pypi.org/project/google-cloud-storage/ )
 #
 # Testing:
 # *unit* tests do not require networking.
 # *integration* tests require openldap's slapd and networking
+#
+# The ebuild runs the unit testing explicitly, as upstream uses Docker to run
+# the integration tests.
 RDEPEND="
nsscache? ( >=sys-auth/libnss-cache-0.10 )
>=dev-python/python-ldap-3.4[${PYTHON_USEDEP}]
@@ -35,11 +36,13 @@ RDEPEND="
 DEPEND="${RDEPEND}
dev-python/packaging[${PYTHON_USEDEP}]
test? (
-   dev-python/pytest-cov[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
)"
 
 S="${WORKDIR}/${PN}-version-${PV}"
 
+distutils_enable_tests pytest
+
 python_prepare_all() {
# nsscache.conf is example only, and should be installed in docs.
# Default config tries $PREFIX/config/nsscache.conf
@@ -55,6 +58,7 @@ python_prepare_all() {
 }
 
 python_compile() {
+   # Yes, tell setup.py to be verbose
distutils-r1_python_compile --verbose
 }
 
@@ -70,10 +74,8 @@ python_install() {
-iname '*_test.py*' \
-o -iname '*_test.*.py*' \
\) \
-   -delete
-
-   # Ignore any exit code from find.
-   return 0
+   -delete \
+   || die "find failed"
 }
 
 python_install_all() {
@@ -84,5 +86,3 @@ python_install_all() {
 
keepdir /var/lib/nsscache
 }
-
-distutils_enable_tests pytest

[gentoo-commits] repo/gentoo:master commit in: net-nds/nsscache/

[Robin H. Johnson]

commit: 61869d38dc6718e9ab3a79c8ff5f08600551f2f9
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Thu Feb  1 06:38:33 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Thu Feb  1 07:54:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61869d38

net-nds/nsscache: QA fixes

Bug: https://bugs.gentoo.org/923061
Signed-off-by: Robin H. Johnson  gentoo.org>

 net-nds/nsscache/nsscache-0.49.ebuild | 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/net-nds/nsscache/nsscache-0.49.ebuild 
b/net-nds/nsscache/nsscache-0.49.ebuild
index 2674e1db5d26..7c9dfe0b027a 100644
--- a/net-nds/nsscache/nsscache-0.49.ebuild
+++ b/net-nds/nsscache/nsscache-0.49.ebuild
@@ -58,8 +58,7 @@ python_prepare_all() {
 }
 
 python_compile() {
-   # Yes, tell setup.py to be verbose
-   distutils-r1_python_compile --verbose
+   distutils-r1_python_compile
 }
 
 python_install() {
@@ -69,13 +68,15 @@ python_install() {
python_doexe examples/authorized-keys-command.py
 
# Do not install the tests as functional source.
-   find "${D}" \
-   -path '*/site-packages/nss_cache/*' \( \
-   -iname '*_test.py*' \
-   -o -iname '*_test.*.py*' \
-   \) \
-   -delete \
-   || die "find failed"
+   # Subject to some debate, see bug 923061
+   # To be raised on gentoo-dev 2024/02/01
+   #find "${D}" \
+   #   -path '*/site-packages/nss_cache/*' \( \
+   #   -iname '*_test.py*' \
+   #   -o -iname '*_test.*.py*' \
+   #   \) \
+   #   -delete \
+   #|| die "find failed"
 }
 
 python_install_all() {

[gentoo-commits] proj/elections:master commit in: council-202306/, completed/trustees-202306/, completed/council-202306/, ...

[Robin H. Johnson]

commit: 04b69f95e1ec217ce1a98451e61c9850d88a82ea
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Aug 27 22:16:09 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Aug 27 22:16:09 2023 +
URL:https://gitweb.gentoo.org/proj/elections.git/commit/?id=04b69f95

archive council-202306 & trustees-202306

Signed-off-by: Robin H. Johnson  gentoo.org>

 {council-202306 => completed/council-202306}/Votify.pm   | 0
 {council-202306 => completed/council-202306}/ballot-council-202306   | 0
 {council-202306 => completed/council-202306}/election-details| 0
 {council-202306 => completed/council-202306}/officials-council-202306| 0
 {council-202306 => completed/council-202306}/start-council-202306| 0
 {council-202306 => completed/council-202306}/stop-council-202306 | 0
 {council-202306 => completed/council-202306}/voters-council-202306   | 0
 {trustees-202306 => completed/trustees-202306}/Votify.pm | 0
 {trustees-202306 => completed/trustees-202306}/ballot-trustees-202306| 0
 {trustees-202306 => completed/trustees-202306}/election-details  | 0
 {trustees-202306 => completed/trustees-202306}/officials-trustees-202306 | 0
 {trustees-202306 => completed/trustees-202306}/start-trustees-202306 | 0
 {trustees-202306 => completed/trustees-202306}/stop-trustees-202306  | 0
 {trustees-202306 => completed/trustees-202306}/voters-trustees-202306| 0
 14 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/council-202306/Votify.pm b/completed/council-202306/Votify.pm
similarity index 100%
rename from council-202306/Votify.pm
rename to completed/council-202306/Votify.pm

diff --git a/council-202306/ballot-council-202306 
b/completed/council-202306/ballot-council-202306
similarity index 100%
rename from council-202306/ballot-council-202306
rename to completed/council-202306/ballot-council-202306

diff --git a/council-202306/election-details 
b/completed/council-202306/election-details
similarity index 100%
rename from council-202306/election-details
rename to completed/council-202306/election-details

diff --git a/council-202306/officials-council-202306 
b/completed/council-202306/officials-council-202306
similarity index 100%
rename from council-202306/officials-council-202306
rename to completed/council-202306/officials-council-202306

diff --git a/council-202306/start-council-202306 
b/completed/council-202306/start-council-202306
similarity index 100%
rename from council-202306/start-council-202306
rename to completed/council-202306/start-council-202306

diff --git a/council-202306/stop-council-202306 
b/completed/council-202306/stop-council-202306
similarity index 100%
rename from council-202306/stop-council-202306
rename to completed/council-202306/stop-council-202306

diff --git a/council-202306/voters-council-202306 
b/completed/council-202306/voters-council-202306
similarity index 100%
rename from council-202306/voters-council-202306
rename to completed/council-202306/voters-council-202306

diff --git a/trustees-202306/Votify.pm b/completed/trustees-202306/Votify.pm
similarity index 100%
rename from trustees-202306/Votify.pm
rename to completed/trustees-202306/Votify.pm

diff --git a/trustees-202306/ballot-trustees-202306 
b/completed/trustees-202306/ballot-trustees-202306
similarity index 100%
rename from trustees-202306/ballot-trustees-202306
rename to completed/trustees-202306/ballot-trustees-202306

diff --git a/trustees-202306/election-details 
b/completed/trustees-202306/election-details
similarity index 100%
rename from trustees-202306/election-details
rename to completed/trustees-202306/election-details

diff --git a/trustees-202306/officials-trustees-202306 
b/completed/trustees-202306/officials-trustees-202306
similarity index 100%
rename from trustees-202306/officials-trustees-202306
rename to completed/trustees-202306/officials-trustees-202306

diff --git a/trustees-202306/start-trustees-202306 
b/completed/trustees-202306/start-trustees-202306
similarity index 100%
rename from trustees-202306/start-trustees-202306
rename to completed/trustees-202306/start-trustees-202306

diff --git a/trustees-202306/stop-trustees-202306 
b/completed/trustees-202306/stop-trustees-202306
similarity index 100%
rename from trustees-202306/stop-trustees-202306
rename to completed/trustees-202306/stop-trustees-202306

diff --git a/trustees-202306/voters-trustees-202306 
b/completed/trustees-202306/voters-trustees-202306
similarity index 100%
rename from trustees-202306/voters-trustees-202306
rename to completed/trustees-202306/voters-trustees-202306

[gentoo-commits] proj/elections:master commit in: completed/trustees-202306/

[Robin H. Johnson]

commit: cf701655e2f563af48f896a7eaf3f6f2c82fb756
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun May  5 18:27:29 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun May  5 18:27:29 2024 +
URL:https://gitweb.gentoo.org/proj/elections.git/commit/?id=cf701655

trustees-202306: capture casting-voters-trustees-202306

Signed-off-by: Robin H. Johnson  gentoo.org>

 .../trustees-202306/casting-voters-trustees-202306 | 32 ++
 1 file changed, 32 insertions(+)

diff --git a/completed/trustees-202306/casting-voters-trustees-202306 
b/completed/trustees-202306/casting-voters-trustees-202306
new file mode 100644
index 000..ca23b13
--- /dev/null
+++ b/completed/trustees-202306/casting-voters-trustees-202306
@@ -0,0 +1,32 @@
+ajak
+amynka
+andrewammerlaan
+arthurzam
+bircoph
+dabbott
+dilfridge
+eras
+graaff
+grobian
+hattya
+jmbsvicetto
+klondike
+kumba
+lu_zero
+marecki
+mattst88
+mgorny
+mpagano
+neddyseagoon
+perfinion
+pinkbyte
+rich0
+robbat2
+sam
+soap
+swift
+tamiko
+tomjbe
+tupone
+ulm
+voyageur