From nobody Sun May 23 13:17:32 2021 X-Original-To: git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 601599ECAD4 for ; Sun, 23 May 2021 13:17:36 +0000 (UTC) (envelope-from pi@freebsd.org) Received: from fc.opsec.eu (fc.opsec.eu [IPv6:2001:14f8:200:4::4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fp19C6GzKz4X5Z for ; Sun, 23 May 2021 13:17:35 +0000 (UTC) (envelope-from pi@freebsd.org) Received: from pi by fc.opsec.eu with local (Exim 4.94.2 (FreeBSD)) (envelope-from ) id 1lknz2-000JMP-Sm for git@freebsd.org; Sun, 23 May 2021 15:17:32 +0200 Date: Sun, 23 May 2021 15:17:32 +0200 From: Kurt Jaeger To: git@freebsd.org Subject: commit to gitrepo-dev ends up in gitrepo.FreeBSD.org ? Message-ID: References: <202105231312.14NDCcOm011888@gitrepo.freebsd.org> List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202105231312.14NDCcOm011888@gitrepo.freebsd.org> X-Rspamd-Queue-Id: 4Fp19C6GzKz4X5Z X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[freebsd.org]; ASN(0.00)[asn:12502, ipnet:2001:14f8::/32, country:DE] Hi! This is *really* strange. I've tried to test-commit to the test repo using git push git@gitrepo-dev.FreeBSD.org:ports.git and it ended up in the production repo somehow ? fc$ git push git@gitrepo-dev.FreeBSD.org:ports.git Enumerating objects: 13, done. Counting objects: 100% (13/13), done. Delta compression using up to 32 threads Compressing objects: 100% (7/7), done. Writing objects: 100% (7/7), 775 bytes | 775.00 KiB/s, done. Any ideas how that happened ? > The branch main has been updated by pi: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=037d21f4ad085c17f2f1511461cd80c125564fc2 > > commit 037d21f4ad085c17f2f1511461cd80c125564fc2 > Author: Kurt Jaeger > AuthorDate: 2021-05-23 13:10:48 +0000 > Commit: Kurt Jaeger > CommitDate: 2021-05-23 13:12:25 +0000 > > net/openbgpd6: update 6.8 -> 6.9 > > Changes: https://marc.info/?l=openbgpd-users&m=161977120713468&w=2 > --- > net/openbgpd6/Makefile | 2 +- > net/openbgpd6/distinfo | 6 +++--- > net/openbgpd6/files/patch-src_bgpd_bgpd.h | 23 ----------------------- > net/openbgpd6/files/patch-src_bgpd_rde.c | 15 --------------- > net/openbgpd6/files/patch-src_bgpd_session.c | 18 ------------------ > net/openbgpd6/files/patch-src_bgpd_session.h | 20 -------------------- > 6 files changed, 4 insertions(+), 80 deletions(-) > > diff --git a/net/openbgpd6/Makefile b/net/openbgpd6/Makefile > index caf404ad03a1..19c49e5ac094 100644 > --- a/net/openbgpd6/Makefile > +++ b/net/openbgpd6/Makefile > @@ -1,5 +1,5 @@ > PORTNAME= openbgpd > -PORTVERSION= 6.8p0 > +PORTVERSION= 6.9p0 > CATEGORIES= net > MASTER_SITES= OPENBSD/OpenBGPD > PKGNAMESUFFIX= 6 > diff --git a/net/openbgpd6/distinfo b/net/openbgpd6/distinfo > index 55f85e71f623..33a80f613768 100644 > --- a/net/openbgpd6/distinfo > +++ b/net/openbgpd6/distinfo > @@ -1,3 +1,3 @@ > -TIMESTAMP = 1603267757 > -SHA256 (openbgpd-6.8p0.tar.gz) = 61487aed98071d9e975e9c38d1bfa0731dd7e55623f655372c318e665d928ff8 > -SIZE (openbgpd-6.8p0.tar.gz) = 701164 > +TIMESTAMP = 1620376440 > +SHA256 (openbgpd-6.9p0.tar.gz) = b4a4a5cc240abeb7004594238523471bd1942a0786d1634a2d79c15da85c60bb > +SIZE (openbgpd-6.9p0.tar.gz) = 719173 > diff --git a/net/openbgpd6/files/patch-src_bgpd_bgpd.h b/net/openbgpd6/files/patch-src_bgpd_bgpd.h > deleted file mode 100644 > index 14df54585928..000000000000 > --- a/net/openbgpd6/files/patch-src_bgpd_bgpd.h > +++ /dev/null > @@ -1,23 +0,0 @@ > ---- src/bgpd/bgpd.h.orig 2020-05-19 09:24:33 UTC > -+++ src/bgpd/bgpd.h > -@@ -130,7 +130,8 @@ enum bgpd_process { > - PROC_MAIN, > - PROC_SE, > - PROC_RDE > --} bgpd_process; > -+}; > -+extern enum bgpd_process bgpd_process; > - > - enum reconf_action { > - RECONF_NONE, > -@@ -532,6 +533,10 @@ enum imsg_type { > - IMSG_XON, > - IMSG_XOFF > - }; > -+ > -+extern struct imsgbuf *ibuf_se; > -+extern struct imsgbuf *ibuf_rde; > -+extern struct imsgbuf *ibuf_main; > - > - struct demote_msg { > - char demote_group[IFNAMSIZ]; > diff --git a/net/openbgpd6/files/patch-src_bgpd_rde.c b/net/openbgpd6/files/patch-src_bgpd_rde.c > deleted file mode 100644 > index e8204a8b1661..000000000000 > --- a/net/openbgpd6/files/patch-src_bgpd_rde.c > +++ /dev/null > @@ -1,15 +0,0 @@ > ---- src/bgpd/rde.c.orig 2020-05-04 14:45:09 UTC > -+++ src/bgpd/rde.c > -@@ -99,11 +99,9 @@ void rde_shutdown(void); > - int ovs_match(struct prefix *, u_int32_t); > - > - volatile sig_atomic_t rde_quit = 0; > --struct bgpd_config *conf, *nconf; > -+static struct bgpd_config *conf, *nconf; > - struct filter_head *out_rules, *out_rules_tmp; > --struct imsgbuf *ibuf_se; > - struct imsgbuf *ibuf_se_ctl; > --struct imsgbuf *ibuf_main; > - struct rde_memstats rdemem; > - int softreconfig; > - > diff --git a/net/openbgpd6/files/patch-src_bgpd_session.c b/net/openbgpd6/files/patch-src_bgpd_session.c > deleted file mode 100644 > index fbb2ecf5b0c4..000000000000 > --- a/net/openbgpd6/files/patch-src_bgpd_session.c > +++ /dev/null > @@ -1,18 +0,0 @@ > ---- src/bgpd/session.c.orig 2020-05-19 09:24:33 UTC > -+++ src/bgpd/session.c > -@@ -100,13 +100,13 @@ void session_template_clone(struct peer *, struct so > - u_int32_t, u_int32_t); > - int session_match_mask(struct peer *, struct bgpd_addr *); > - > --struct bgpd_config *conf, *nconf; > -+static struct bgpd_config *conf, *nconf; > -+struct ctl_conns ctl_conns; > - struct bgpd_sysdep sysdep; > - volatile sig_atomic_t session_quit; > - int pending_reconf; > - int csock = -1, rcsock = -1; > - u_int peer_cnt; > --struct imsgbuf *ibuf_rde; > - struct imsgbuf *ibuf_rde_ctl; > - struct imsgbuf *ibuf_main; > - > diff --git a/net/openbgpd6/files/patch-src_bgpd_session.h b/net/openbgpd6/files/patch-src_bgpd_session.h > deleted file mode 100644 > index 9fbb480caf01..000000000000 > --- a/net/openbgpd6/files/patch-src_bgpd_session.h > +++ /dev/null > @@ -1,20 +0,0 @@ > ---- src/bgpd/session.h.orig 2020-05-18 19:17:41 UTC > -+++ src/bgpd/session.h > -@@ -18,6 +18,7 @@ > - > - #include > - #include > -+#include > - #include > - > - #define MAX_BACKLOG 5 > -@@ -146,7 +147,8 @@ struct ctl_conn { > - int terminate; > - }; > - > --TAILQ_HEAD(ctl_conns, ctl_conn) ctl_conns; > -+TAILQ_HEAD(ctl_conns, ctl_conn); > -+extern struct ctl_conns ctl_conns; > - > - struct peer_stats { > - unsigned long long msg_rcvd_open; -- pi@FreeBSD.org +49 171 3101372 Now what ?