commit to gitrepo-dev ends up in gitrepo.FreeBSD.org ?

From: Kurt Jaeger <pi_at_freebsd.org>
Date: Sun, 23 May 2021 15:17:32 +0200
Hi!

This is *really* strange.

I've tried to test-commit to the test repo using

  git push git_at_gitrepo-dev.FreeBSD.org:ports.git

and it ended up in the production repo somehow ?

fc$   git push git_at_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 <pi_at_FreeBSD.org>
> AuthorDate: 2021-05-23 13:10:48 +0000
> Commit:     Kurt Jaeger <pi_at_FreeBSD.org>
> 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
> _at__at_ -1,5 +1,5 _at__at_
>  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
> _at__at_ -1,3 +1,3 _at__at_
> -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
> _at__at_ -1,23 +0,0 _at__at_
> ---- src/bgpd/bgpd.h.orig	2020-05-19 09:24:33 UTC
> -+++ src/bgpd/bgpd.h
> -_at__at_ -130,7 +130,8 _at__at_ enum bgpd_process {
> - 	PROC_MAIN,
> - 	PROC_SE,
> - 	PROC_RDE
> --} bgpd_process;
> -+};
> -+extern enum bgpd_process bgpd_process;
> - 
> - enum reconf_action {
> - 	RECONF_NONE,
> -_at__at_ -532,6 +533,10 _at__at_ 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
> _at__at_ -1,15 +0,0 _at__at_
> ---- src/bgpd/rde.c.orig	2020-05-04 14:45:09 UTC
> -+++ src/bgpd/rde.c
> -_at__at_ -99,11 +99,9 _at__at_ 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
> _at__at_ -1,18 +0,0 _at__at_
> ---- src/bgpd/session.c.orig	2020-05-19 09:24:33 UTC
> -+++ src/bgpd/session.c
> -_at__at_ -100,13 +100,13 _at__at_ 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
> _at__at_ -1,20 +0,0 _at__at_
> ---- src/bgpd/session.h.orig	2020-05-18 19:17:41 UTC
> -+++ src/bgpd/session.h
> -_at__at_ -18,6 +18,7 _at__at_
> - 
> - #include <sys/types.h>
> - #include <sys/socket.h>
> -+#include <sys/queue.h>
> - #include <time.h>
> - 
> - #define	MAX_BACKLOG			5
> -_at__at_ -146,7 +147,8 _at__at_ 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_at_FreeBSD.org         +49 171 3101372                  Now what ?
Received on Sun May 23 2021 - 13:17:32 UTC

Original text of this message