Greg Steuck <gnezdo@openbsd.org> writes:
>> git-annex has at least 50 dependencies I couldn't find in ports, so I
>> want to make sure I understand this before I start porting them one at
>> a time (or just give up)...
>
> This is exactly the problem I want to solve with cabal.port.mk. You
> can try to look at
> https://marc.info/?l=openbsd-ports&m=160858285410366&w=2
> A quick search in the archives will show the justification and the
> history of the effort.
>
> The current state of the work is I'm waiting on cabal 3.4 official
> release gated by ghc-9.0. I'm also looking for people needing this work
> and your attempt to add git-annex gives me more motivation to finish.
FWIW, a version of git-annex port that can display its help message:
https://github.com/openbsd/ports/commit/0d970c085441b82f0080afee13e2034e47f475c0
I didn't bother to pare down the dependency list to exclude the test
stuff, so MODCABAL_MANIFEST is twice the length it should be.
Thanks
Greg
Sunday, January 31, 2021
Failing to get installboot to work, cross-device install -> ERR M amd64 6.6-stable
Hi,
I'm stuck at 6.6-stable, trying many times in the past to use newer
-currents is partially to blame for how I'm in a bad situation.
I'll try to be clear as I can.
After the error below, booting gives ERR M.
What I'm using.
One USB2 flash drive. Booting / off of it. It works fine, but old.
One USB2/3 spinning hard drive. 2TB. Never setup to boot from. Using for
storage. The a partition has the files to get a boot started.
One Laptop spinning HD. The a partition used to boot, has the files but
won't boot.
I also have a powered USB hub to get enough power for the spinning HD.
I have tried using fdisk on laptop and USB2/3 HD. Not helpful.
I have tried using installboot on both of those two, but I get cross
device install error, which I see is only in i386 installboot in src.
I am following installboot manual page. I also read all of the
recommended see also man pages.
I also burned an install CD and took it just far enough into install to
get access to laptop HD, mount /mnt/usr and try installboot from there.
Same cross device install error.
I'm unsure if I should try a fresh install (backing everything up is a
little weird the way I'm running off of three disks. I can do that.)
I would like to understand what is causing me to end up at ERR M.
I read what causes that error, but I don't know how to fix that.
Any advice appreciated.
Chris Bennett
I'm stuck at 6.6-stable, trying many times in the past to use newer
-currents is partially to blame for how I'm in a bad situation.
I'll try to be clear as I can.
After the error below, booting gives ERR M.
What I'm using.
One USB2 flash drive. Booting / off of it. It works fine, but old.
One USB2/3 spinning hard drive. 2TB. Never setup to boot from. Using for
storage. The a partition has the files to get a boot started.
One Laptop spinning HD. The a partition used to boot, has the files but
won't boot.
I also have a powered USB hub to get enough power for the spinning HD.
I have tried using fdisk on laptop and USB2/3 HD. Not helpful.
I have tried using installboot on both of those two, but I get cross
device install error, which I see is only in i386 installboot in src.
I am following installboot manual page. I also read all of the
recommended see also man pages.
I also burned an install CD and took it just far enough into install to
get access to laptop HD, mount /mnt/usr and try installboot from there.
Same cross device install error.
I'm unsure if I should try a fresh install (backing everything up is a
little weird the way I'm running off of three disks. I can do that.)
I would like to understand what is causing me to end up at ERR M.
I read what causes that error, but I don't know how to fix that.
Any advice appreciated.
Chris Bennett
Re: replace security/stegcracker with security/stegseek
Hi,
Am Freitag, Januar 29, 2021 20:25 CET, schrieb Stuart Henderson <stu@spacehopper.org>:
> On 2021/01/28 23:28, Sebastian Reitenbach wrote:
> > Hi,
> > not long ago, stegcracker was imported. I saw an update is available, looking at it,
> > it says, that's the last version, use stegseek, as that's "lightning fast". Which indeed, it
> > is. So attached a port of stegseek.
> >
> > so, I'd like to get rid of security/stegcracker, and add security/stegseek.
> > Works for me on amd64. The patch helps to make it build, don't know if that
> > would break on non 64bit archs?
> >
> > for the quirks, just use reason 3: "no longer maintained upstream"
> > or add a new one: "no longer maintained upstream, suggest stegseek" ?
> >
> > cheers,
> > Sebastian
>
> Here are some fixes/tidying on top of your Makefile.
Thank you, I'll fix accordingly.
cheers,
Sebastian
>
> --- stegseek.orig/Makefile Thu Jan 28 22:25:54 2021
> +++ stegseek/Makefile Fri Jan 29 19:22:35 2021
> @@ -2,27 +2,25 @@
>
> COMMENT = lightning fast steghide cracker
>
> -VERSION = 0.5
> GH_ACCOUNT = RickdeJager
> GH_PROJECT = stegseek
> -GH_TAGNAME = v${VERSION}
> -PKGNAME = ${GH_PROJECT}-${VERSION}
> +GH_TAGNAME = v0.5
>
> CATEGORIES = security
>
> MAINTAINER = Sebastian Reitenbach <sebastia@openbsd.org>
>
> -# GPLv2 or later
> +# GPLv2+
> PERMIT_PACKAGE = Yes
>
> +WANTLIB += ${COMPILER_LIBCXX} c m z jpeg mcrypt mhash
> +
> MODULES = devel/cmake
> -WANTLIB += ${COMPILER_LIBCXX} c m z jpeg mcrypt mhash
>
> LIB_DEPENDS += graphics/jpeg \
> - security/mcrypt
> + security/libmcrypt
>
> CONFIGURE_ARGS = -DCMAKE_CXX_FLAGS="-I${LOCALBASE}/include ${CFLAGS}" \
> -DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
> -
>
> .include <bsd.port.mk>
Am Freitag, Januar 29, 2021 20:25 CET, schrieb Stuart Henderson <stu@spacehopper.org>:
> On 2021/01/28 23:28, Sebastian Reitenbach wrote:
> > Hi,
> > not long ago, stegcracker was imported. I saw an update is available, looking at it,
> > it says, that's the last version, use stegseek, as that's "lightning fast". Which indeed, it
> > is. So attached a port of stegseek.
> >
> > so, I'd like to get rid of security/stegcracker, and add security/stegseek.
> > Works for me on amd64. The patch helps to make it build, don't know if that
> > would break on non 64bit archs?
> >
> > for the quirks, just use reason 3: "no longer maintained upstream"
> > or add a new one: "no longer maintained upstream, suggest stegseek" ?
> >
> > cheers,
> > Sebastian
>
> Here are some fixes/tidying on top of your Makefile.
Thank you, I'll fix accordingly.
cheers,
Sebastian
>
> --- stegseek.orig/Makefile Thu Jan 28 22:25:54 2021
> +++ stegseek/Makefile Fri Jan 29 19:22:35 2021
> @@ -2,27 +2,25 @@
>
> COMMENT = lightning fast steghide cracker
>
> -VERSION = 0.5
> GH_ACCOUNT = RickdeJager
> GH_PROJECT = stegseek
> -GH_TAGNAME = v${VERSION}
> -PKGNAME = ${GH_PROJECT}-${VERSION}
> +GH_TAGNAME = v0.5
>
> CATEGORIES = security
>
> MAINTAINER = Sebastian Reitenbach <sebastia@openbsd.org>
>
> -# GPLv2 or later
> +# GPLv2+
> PERMIT_PACKAGE = Yes
>
> +WANTLIB += ${COMPILER_LIBCXX} c m z jpeg mcrypt mhash
> +
> MODULES = devel/cmake
> -WANTLIB += ${COMPILER_LIBCXX} c m z jpeg mcrypt mhash
>
> LIB_DEPENDS += graphics/jpeg \
> - security/mcrypt
> + security/libmcrypt
>
> CONFIGURE_ARGS = -DCMAKE_CXX_FLAGS="-I${LOCALBASE}/include ${CFLAGS}" \
> -DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
> -
>
> .include <bsd.port.mk>
Re: replace security/stegcracker with security/stegseek
Hi,
Am Freitag, Januar 29, 2021 19:22 CET, schrieb Klemens Nanni <kn@openbsd.org>:
> On Thu, Jan 28, 2021 at 11:28:10PM +0100, Sebastian Reitenbach wrote:
> > for the quirks, just use reason 3: "no longer maintained upstream"
> > or add a new one: "no longer maintained upstream, suggest stegseek" ?
> Just add new ones if need be, no need to be less specific.
>
Will do thanks,
> But if one replaces the other, why not merge the old into the new one
> and keep users on track?
you mean to place the stegseek port into the stegcracker directory?
Or is there an easy way with @conflict etc. markers in PLIST ?
cheers,
Sebastian
Am Freitag, Januar 29, 2021 19:22 CET, schrieb Klemens Nanni <kn@openbsd.org>:
> On Thu, Jan 28, 2021 at 11:28:10PM +0100, Sebastian Reitenbach wrote:
> > for the quirks, just use reason 3: "no longer maintained upstream"
> > or add a new one: "no longer maintained upstream, suggest stegseek" ?
> Just add new ones if need be, no need to be less specific.
>
Will do thanks,
> But if one replaces the other, why not merge the old into the new one
> and keep users on track?
you mean to place the stegseek port into the stegcracker directory?
Or is there an easy way with @conflict etc. markers in PLIST ?
cheers,
Sebastian
graphics/tumble -fno-common
no newer release or upstream fix
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/tumble/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 25 Apr 2020 14:02:14 -0000 1.1.1.1
+++ Makefile 1 Feb 2021 06:03:42 -0000
@@ -8,6 +8,7 @@ COMMENT = convert pictures into pdf book
GH_PROJECT = tumble
GH_ACCOUNT = brouhaha
GH_TAGNAME = v0.36
+REVISION = 0
CATEGORIES = graphics textproc
Index: patches/patch-semantics_c
===================================================================
RCS file: patches/patch-semantics_c
diff -N patches/patch-semantics_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-semantics_c 1 Feb 2021 06:03:42 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+fix -fno-common build
+
+Index: semantics.c
+--- semantics.c.orig
++++ semantics.c
+@@ -119,7 +119,7 @@ typedef struct output_page_t
+
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/tumble/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 25 Apr 2020 14:02:14 -0000 1.1.1.1
+++ Makefile 1 Feb 2021 06:03:42 -0000
@@ -8,6 +8,7 @@ COMMENT = convert pictures into pdf book
GH_PROJECT = tumble
GH_ACCOUNT = brouhaha
GH_TAGNAME = v0.36
+REVISION = 0
CATEGORIES = graphics textproc
Index: patches/patch-semantics_c
===================================================================
RCS file: patches/patch-semantics_c
diff -N patches/patch-semantics_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-semantics_c 1 Feb 2021 06:03:42 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+fix -fno-common build
+
+Index: semantics.c
+--- semantics.c.orig
++++ semantics.c
+@@ -119,7 +119,7 @@ typedef struct output_page_t
+
Re: Packaging rust code
On Sun, Jan 31, 2021 at 08:36:59PM +0000, Sven Assmann wrote:
> Hi Dear OpenBSD ports folks,
>
> My name is Sven and I'm very new to openBSD (have some FreeBSD experience from >10years ago).
>
> I'm an author and maintainer of some rust cli tools and I'm totally new to preparing ports packages, have done deb, rpm and homebrew so far.
>
> My question is about the build system to be used to prepare binary packages. Since those tools are build with cargo, the rust default build tool and rustc and cargo are both available on openBSD is there anything special to keep in mind?
>
> Maybe somebody has already packaged some rust tools, then I would appreciate to Point me to an example.
There are several rust tools which are already packaged.
A near to complete list is:
audio/ncspot
benchmarks/hyperfine
devel/cbindgen
devel/snare
devel/spidermonkey78
mail/mozilla-thunderbird
net/dog
net/routinator
security/sn0int
security/suricata
sysutils/exa
textproc/mdbook
textproc/ripgrep
www/castor
www/firefox-esr
www/geckodriver
www/mozilla-firefox
www/newsboat
www/seamonkey
www/seamonkey,-lightning
www/tor-browser/browser
www/zola
x11/gnome/librsvg
x11/gnome/tour
x11/xcolor
Some of them have installation based on cargo (nccspot, ripgrep, exa,
...) and some others have complex installation and a part of it is
using cargo (mozilla-firefox, suricata, ...)
If you want to package simple rust tools, the simpler is too look at
these ports for having a template. But preparing a port isn't a
trivial operation for a new comer.
You should also take a look at devel/cargo module, which handle the
cargo/rust part of the port infrastructure. Documentation is at
port-modules(5) man page (see https://man.openbsd.org/port-modules),
and search for "devel/cargo".
Thanks.
--
Sebastien Marie
> Hi Dear OpenBSD ports folks,
>
> My name is Sven and I'm very new to openBSD (have some FreeBSD experience from >10years ago).
>
> I'm an author and maintainer of some rust cli tools and I'm totally new to preparing ports packages, have done deb, rpm and homebrew so far.
>
> My question is about the build system to be used to prepare binary packages. Since those tools are build with cargo, the rust default build tool and rustc and cargo are both available on openBSD is there anything special to keep in mind?
>
> Maybe somebody has already packaged some rust tools, then I would appreciate to Point me to an example.
There are several rust tools which are already packaged.
A near to complete list is:
audio/ncspot
benchmarks/hyperfine
devel/cbindgen
devel/snare
devel/spidermonkey78
mail/mozilla-thunderbird
net/dog
net/routinator
security/sn0int
security/suricata
sysutils/exa
textproc/mdbook
textproc/ripgrep
www/castor
www/firefox-esr
www/geckodriver
www/mozilla-firefox
www/newsboat
www/seamonkey
www/seamonkey,-lightning
www/tor-browser/browser
www/zola
x11/gnome/librsvg
x11/gnome/tour
x11/xcolor
Some of them have installation based on cargo (nccspot, ripgrep, exa,
...) and some others have complex installation and a part of it is
using cargo (mozilla-firefox, suricata, ...)
If you want to package simple rust tools, the simpler is too look at
these ports for having a template. But preparing a port isn't a
trivial operation for a new comer.
You should also take a look at devel/cargo module, which handle the
cargo/rust part of the port infrastructure. Documentation is at
port-modules(5) man page (see https://man.openbsd.org/port-modules),
and search for "devel/cargo".
Thanks.
--
Sebastien Marie
ospfd adv 0.0.0.0/0
HI all, I get openbgpd and openospfd at same openbsd 6.6server
I want my ospf adv 0.0.0.0/0 to my network.
at bgpd.conf
network 0.0.0.0/0
at ospfd.conf, I have tried
redistribute default
redistribute 0.0.0.0/0
ospfctl sh database self-originated
Link ID Adv Router Age Seq# Checksum
10. xxx.xxx.248 103.xxx.xxx.11 1225 0x80000048 0x2471
10. xxx.xxx.252 103. xxx.xxx.11 1225 0x8000004a 0xf797
103. xxx.xxx.72 103. xxx.xxx.11 1225 0x80000048 0xe1c4
103. xxx.xxx.60 103. xxx.xxx.11 1225 0x8000004a 0x858d
103. xxx.xxx.12 103. xxx.xxx.11 1225 0x8000004a 0x3b05
103. xxx.xxx.40 103. xxx.xxx.11 1225 0x8000004a 0x2a47
103. xxx.xxx.44 103. xxx.xxx.11 1225 0x80000049 0x046a
103. xxx.xxx.48 103. xxx.xxx.11 1225 0x80000049 0xdb8e
103. xxx.xxx.128 103. xxx.xxx.11 1785 0x8000006f 0x2aad
Just link in my frrrouting:
sh ip ospf database self-originate
OSPF Router with ID (103. xxx.xxx.3)
Router Link States (Area 0.0.0.0)
Link ID ADV Router Age Seq# CkSum Route
0.0.0.0 103. xxx.xxx.3 1365 0x80000020 0x9beb E2 0.0.0.0/0 [0x0]
10. xxx.xxx.252 103. xxx.xxx.3 545 0x8000001f 0xc0cf E2 10. xxx.xxx.252/30
[0x0]
103. xxx.xxx.216 103. xxx.xxx.3 515 0x8000001f 0x0114 E2 103.
xxx.xxx.216/30
[0x0]
103. xxx.xxx.3 103. xxx.xxx.3 745 0x8000001f 0x9cad E2 103. xxx.xxx.3/32
[0x0]
I want my ospf adv 0.0.0.0/0 to my network.
at bgpd.conf
network 0.0.0.0/0
at ospfd.conf, I have tried
redistribute default
redistribute 0.0.0.0/0
ospfctl sh database self-originated
Link ID Adv Router Age Seq# Checksum
10. xxx.xxx.248 103.xxx.xxx.11 1225 0x80000048 0x2471
10. xxx.xxx.252 103. xxx.xxx.11 1225 0x8000004a 0xf797
103. xxx.xxx.72 103. xxx.xxx.11 1225 0x80000048 0xe1c4
103. xxx.xxx.60 103. xxx.xxx.11 1225 0x8000004a 0x858d
103. xxx.xxx.12 103. xxx.xxx.11 1225 0x8000004a 0x3b05
103. xxx.xxx.40 103. xxx.xxx.11 1225 0x8000004a 0x2a47
103. xxx.xxx.44 103. xxx.xxx.11 1225 0x80000049 0x046a
103. xxx.xxx.48 103. xxx.xxx.11 1225 0x80000049 0xdb8e
103. xxx.xxx.128 103. xxx.xxx.11 1785 0x8000006f 0x2aad
Just link in my frrrouting:
sh ip ospf database self-originate
OSPF Router with ID (103. xxx.xxx.3)
Router Link States (Area 0.0.0.0)
Link ID ADV Router Age Seq# CkSum Route
0.0.0.0 103. xxx.xxx.3 1365 0x80000020 0x9beb E2 0.0.0.0/0 [0x0]
10. xxx.xxx.252 103. xxx.xxx.3 545 0x8000001f 0xc0cf E2 10. xxx.xxx.252/30
[0x0]
103. xxx.xxx.216 103. xxx.xxx.3 515 0x8000001f 0x0114 E2 103.
xxx.xxx.216/30
[0x0]
103. xxx.xxx.3 103. xxx.xxx.3 745 0x8000001f 0x9cad E2 103. xxx.xxx.3/32
[0x0]
Re: Packaging rust code
Sven Assmann <sven@d34dl0ck.me> writes:
> Hi Dear OpenBSD ports folks,
>
> My name is Sven and I'm very new to openBSD (have some FreeBSD experience from >10years ago).
>
> I'm an author and maintainer of some rust cli tools and I'm totally new to preparing ports packages, have done deb, rpm and homebrew so far.
>
> My question is about the build system to be used to prepare binary
> packages. Since those tools are build with cargo, the rust default
> build tool and rustc and cargo are both available on openBSD is there
> anything special to keep in mind?
>
> Maybe somebody has already packaged some rust tools, then I would
> appreciate to Point me to an example.
You should check out ports devel/cargo/cargo.port.mk which has plenty of usages.
> Hi Dear OpenBSD ports folks,
>
> My name is Sven and I'm very new to openBSD (have some FreeBSD experience from >10years ago).
>
> I'm an author and maintainer of some rust cli tools and I'm totally new to preparing ports packages, have done deb, rpm and homebrew so far.
>
> My question is about the build system to be used to prepare binary
> packages. Since those tools are build with cargo, the rust default
> build tool and rustc and cargo are both available on openBSD is there
> anything special to keep in mind?
>
> Maybe somebody has already packaged some rust tools, then I would
> appreciate to Point me to an example.
You should check out ports devel/cargo/cargo.port.mk which has plenty of usages.
Re: net/ncftp: update with -fno-common
Charlene Wendling <julianaito@posteo.jp> writes:
> Hi,
>
> The fix has been taken from FreeBSD [0]. With that i can build and run
> ncftp without issues on amd64. While here, i moved HOMEPAGE to https.
>
> OK?
OK gnezdo
>
> Charlène.
>
>
> [0] https://github.com/freebsd/freebsd-ports/commit/3f1dcac7
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/net/ncftp/Makefile,v
> retrieving revision 1.47
> diff -u -p -u -p -r1.47 Makefile
> --- Makefile 10 Mar 2020 03:31:45 -0000 1.47
> +++ Makefile 31 Jan 2021 21:07:48 -0000
> @@ -4,8 +4,8 @@ COMMENT= FTP client with advanced user i
>
> DISTNAME= ncftp-3.2.6
> CATEGORIES= net
> -HOMEPAGE= http://www.ncftp.com/ncftp/
> -REVISION= 1
> +HOMEPAGE= https://www.ncftp.com/ncftp/
> +REVISION= 2
>
> # Artistic
> PERMIT_PACKAGE= Yes
> Index: patches/patch-sh_util_gpshare_c
> ===================================================================
> RCS file: patches/patch-sh_util_gpshare_c
> diff -N patches/patch-sh_util_gpshare_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-sh_util_gpshare_c 31 Jan 2021 21:07:48 -0000
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +
> +Fix -fno-common build failure.
> +
> +Index: sh_util/gpshare.c
> +--- sh_util/gpshare.c.orig
> ++++ sh_util/gpshare.c
> +@@ -28,7 +28,7 @@
> +
> + static int gIsAtty1 = 1, gIsAtty2 = 1;
> + extern int gLoadedBm, gBookmarkMatchMode;
> +-Bookmark gBm;
> ++extern Bookmark gBm;
> +
> + double
> + FileSize(double size, const char **uStr0, double *uMult0)
> Hi,
>
> The fix has been taken from FreeBSD [0]. With that i can build and run
> ncftp without issues on amd64. While here, i moved HOMEPAGE to https.
>
> OK?
OK gnezdo
>
> Charlène.
>
>
> [0] https://github.com/freebsd/freebsd-ports/commit/3f1dcac7
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/net/ncftp/Makefile,v
> retrieving revision 1.47
> diff -u -p -u -p -r1.47 Makefile
> --- Makefile 10 Mar 2020 03:31:45 -0000 1.47
> +++ Makefile 31 Jan 2021 21:07:48 -0000
> @@ -4,8 +4,8 @@ COMMENT= FTP client with advanced user i
>
> DISTNAME= ncftp-3.2.6
> CATEGORIES= net
> -HOMEPAGE= http://www.ncftp.com/ncftp/
> -REVISION= 1
> +HOMEPAGE= https://www.ncftp.com/ncftp/
> +REVISION= 2
>
> # Artistic
> PERMIT_PACKAGE= Yes
> Index: patches/patch-sh_util_gpshare_c
> ===================================================================
> RCS file: patches/patch-sh_util_gpshare_c
> diff -N patches/patch-sh_util_gpshare_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-sh_util_gpshare_c 31 Jan 2021 21:07:48 -0000
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +
> +Fix -fno-common build failure.
> +
> +Index: sh_util/gpshare.c
> +--- sh_util/gpshare.c.orig
> ++++ sh_util/gpshare.c
> +@@ -28,7 +28,7 @@
> +
> + static int gIsAtty1 = 1, gIsAtty2 = 1;
> + extern int gLoadedBm, gBookmarkMatchMode;
> +-Bookmark gBm;
> ++extern Bookmark gBm;
> +
> + double
> + FileSize(double size, const char **uStr0, double *uMult0)
ospfd adv 0.0.0.0/0
HI all, I get openbgpd and openospfd at same openbsd 6.6server I want my ospf adv 0.0.0.0/0 to my network.
I put network 0.0.0.0/0 at bgpd.confI put redistribute default at ospfd.cong
ospfctl sh database self-originated
Link ID Adv Router Age Seq# Checksum10. xxx.xxx.248 103.xxx.xxx.11 1225 0x80000048 0x247110. xxx.xxx.252 103. xxx.xxx.11 1225 0x8000004a 0xf797103. xxx.xxx.72 103. xxx.xxx.11 1225 0x80000048 0xe1c4103. xxx.xxx.60 103. xxx.xxx.11 1225 0x8000004a 0x858d103. xxx.xxx.12 103. xxx.xxx.11 1225 0x8000004a 0x3b05103. xxx.xxx.40 103. xxx.xxx.11 1225 0x8000004a 0x2a47103. xxx.xxx.44 103. xxx.xxx.11 1225 0x80000049 0x046a103. xxx.xxx.48 103. xxx.xxx.11 1225 0x80000049 0xdb8e103. xxx.xxx.128 103. xxx.xxx.11 1785 0x8000006f 0x2aad
Just link in my frrrouting: sh ip ospf database self-originate
OSPF Router with ID (103. xxx.xxx.3)
Router Link States (Area 0.0.0.0)
Link ID ADV Router Age Seq# CkSum Route0.0.0.0 103. xxx.xxx.3 1365 0x80000020 0x9beb E2 0.0.0.0/0 [0x0]10. xxx.xxx.252 103. xxx.xxx.3 545 0x8000001f 0xc0cf E2 10. xxx.xxx.252/30 [0x0]103. xxx.xxx.216 103. xxx.xxx.3 515 0x8000001f 0x0114 E2 103. xxx.xxx.216/30 [0x0]103. xxx.xxx.3 103. xxx.xxx.3 745 0x8000001f 0x9cad E2 103. xxx.xxx.3/32 [0x0]
Regards
I put network 0.0.0.0/0 at bgpd.confI put redistribute default at ospfd.cong
ospfctl sh database self-originated
Link ID Adv Router Age Seq# Checksum10. xxx.xxx.248 103.xxx.xxx.11 1225 0x80000048 0x247110. xxx.xxx.252 103. xxx.xxx.11 1225 0x8000004a 0xf797103. xxx.xxx.72 103. xxx.xxx.11 1225 0x80000048 0xe1c4103. xxx.xxx.60 103. xxx.xxx.11 1225 0x8000004a 0x858d103. xxx.xxx.12 103. xxx.xxx.11 1225 0x8000004a 0x3b05103. xxx.xxx.40 103. xxx.xxx.11 1225 0x8000004a 0x2a47103. xxx.xxx.44 103. xxx.xxx.11 1225 0x80000049 0x046a103. xxx.xxx.48 103. xxx.xxx.11 1225 0x80000049 0xdb8e103. xxx.xxx.128 103. xxx.xxx.11 1785 0x8000006f 0x2aad
Just link in my frrrouting: sh ip ospf database self-originate
OSPF Router with ID (103. xxx.xxx.3)
Router Link States (Area 0.0.0.0)
Link ID ADV Router Age Seq# CkSum Route0.0.0.0 103. xxx.xxx.3 1365 0x80000020 0x9beb E2 0.0.0.0/0 [0x0]10. xxx.xxx.252 103. xxx.xxx.3 545 0x8000001f 0xc0cf E2 10. xxx.xxx.252/30 [0x0]103. xxx.xxx.216 103. xxx.xxx.3 515 0x8000001f 0x0114 E2 103. xxx.xxx.216/30 [0x0]103. xxx.xxx.3 103. xxx.xxx.3 745 0x8000001f 0x9cad E2 103. xxx.xxx.3/32 [0x0]
Regards
sparc64 bulk build report
Bulk build on sparc64-0a.ports.openbsd.org
Started : Fri Jan 29 07:49:23 MST 2021
Finished: Sun Jan 31 22:26:46 MST 2021
Duration: 2 Days 14 hours 37 minutes
Built using OpenBSD 6.8-current (GENERIC.MP) #662: Fri Jan 29 04:30:31 MST 2021
Built 9348 packages
Number of packages built each day:
Jan 29: 7500
Jan 30: 1395
Jan 31: 453
Critical path missing pkgs:
http://build-failures.rhaalovely.net/sparc64/2021-01-29/summary.log
Build failures: 20
http://build-failures.rhaalovely.net/sparc64/2021-01-29/audio/libgpod.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/comms/syncterm.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/devel/glog.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/devel/keystone/python,python3.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/devel/spidermonkey78.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/games/frotz.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/games/odamex.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/games/openxcom.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/geo/spatialite/gui.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/graphics/exiv2.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/graphics/inkscape.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/math/mlpack,-main.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/multimedia/gstreamer-0.10/plugins-bad,-main.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/multimedia/mpv.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/net/barrier.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/print/gutenprint.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/productivity/gnucash.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/sysutils/libvirt.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/x11/grantlee-qt5.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/x11/roxterm.log
Recurrent failures:
failures/comms/syncterm.log
failures/devel/glog.log
failures/devel/keystone/python,python3.log
failures/devel/spidermonkey78.log
failures/games/frotz.log
failures/games/odamex.log
failures/games/openxcom.log
failures/graphics/inkscape.log
failures/math/mlpack,-main.log
failures/multimedia/gstreamer-0.10/plugins-bad,-main.log
failures/net/barrier.log
failures/print/gutenprint.log
failures/productivity/gnucash.log
failures/sysutils/libvirt.log
failures/x11/grantlee-qt5.log
failures/x11/roxterm.log
New failures:
+failures/audio/libgpod.log
+failures/multimedia/mpv.log
Resolved failures:
-failures/devel/ccache.log
-failures/devel/woboq_codebrowser.log
-failures/net/samba.log
-failures/x11/qt5/docs,-html.log
Packages newly built:
+devel/ccache
+devel/woboq_codebrowser
+graphics/alembic
+graphics/kcolorpicker
+graphics/kimageannotator
+graphics/ksnip
+net/monitoring-plugins,-samba
+net/py-smbc,python3
+net/samba
+net/samba,-ldb
+net/samba,-main
+sysutils/backuppc
+sysutils/usmb
+www/p5-Test-LWP-UserAgent
+www/squid,-ntlm
+www/squid,krb5,-ntlm
+x11/gnome/gvfs,
+x11/gnome/gvfs,,-goa
+x11/gnome/gvfs,,-google
+x11/gnome/gvfs,,-nfs
+x11/gnome/gvfs,,-smb
+x11/qt5/docs
+x11/qt5/docs,-html
+x11/qt5/docs,-qch
Packages not built this time:
-audio/curseradio
-audio/gtkpod
-audio/libgpod
-audio/libgpod,
-audio/libgpod,,-main
-audio/libgpod,,-python
-audio/libgpod,-main
-audio/libgpod,-python
-audio/py-mutagen
-multimedia/mpv
-security/acme-client
-www/minitube
-x11/gnome-mplayer
-x11/smplayer
-x11/smtube
Started : Fri Jan 29 07:49:23 MST 2021
Finished: Sun Jan 31 22:26:46 MST 2021
Duration: 2 Days 14 hours 37 minutes
Built using OpenBSD 6.8-current (GENERIC.MP) #662: Fri Jan 29 04:30:31 MST 2021
Built 9348 packages
Number of packages built each day:
Jan 29: 7500
Jan 30: 1395
Jan 31: 453
Critical path missing pkgs:
http://build-failures.rhaalovely.net/sparc64/2021-01-29/summary.log
Build failures: 20
http://build-failures.rhaalovely.net/sparc64/2021-01-29/audio/libgpod.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/comms/syncterm.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/devel/glog.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/devel/keystone/python,python3.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/devel/spidermonkey78.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/games/frotz.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/games/odamex.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/games/openxcom.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/geo/spatialite/gui.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/graphics/exiv2.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/graphics/inkscape.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/math/mlpack,-main.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/multimedia/gstreamer-0.10/plugins-bad,-main.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/multimedia/mpv.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/net/barrier.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/print/gutenprint.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/productivity/gnucash.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/sysutils/libvirt.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/x11/grantlee-qt5.log
http://build-failures.rhaalovely.net/sparc64/2021-01-29/x11/roxterm.log
Recurrent failures:
failures/comms/syncterm.log
failures/devel/glog.log
failures/devel/keystone/python,python3.log
failures/devel/spidermonkey78.log
failures/games/frotz.log
failures/games/odamex.log
failures/games/openxcom.log
failures/graphics/inkscape.log
failures/math/mlpack,-main.log
failures/multimedia/gstreamer-0.10/plugins-bad,-main.log
failures/net/barrier.log
failures/print/gutenprint.log
failures/productivity/gnucash.log
failures/sysutils/libvirt.log
failures/x11/grantlee-qt5.log
failures/x11/roxterm.log
New failures:
+failures/audio/libgpod.log
+failures/multimedia/mpv.log
Resolved failures:
-failures/devel/ccache.log
-failures/devel/woboq_codebrowser.log
-failures/net/samba.log
-failures/x11/qt5/docs,-html.log
Packages newly built:
+devel/ccache
+devel/woboq_codebrowser
+graphics/alembic
+graphics/kcolorpicker
+graphics/kimageannotator
+graphics/ksnip
+net/monitoring-plugins,-samba
+net/py-smbc,python3
+net/samba
+net/samba,-ldb
+net/samba,-main
+sysutils/backuppc
+sysutils/usmb
+www/p5-Test-LWP-UserAgent
+www/squid,-ntlm
+www/squid,krb5,-ntlm
+x11/gnome/gvfs,
+x11/gnome/gvfs,,-goa
+x11/gnome/gvfs,,-google
+x11/gnome/gvfs,,-nfs
+x11/gnome/gvfs,,-smb
+x11/qt5/docs
+x11/qt5/docs,-html
+x11/qt5/docs,-qch
Packages not built this time:
-audio/curseradio
-audio/gtkpod
-audio/libgpod
-audio/libgpod,
-audio/libgpod,,-main
-audio/libgpod,,-python
-audio/libgpod,-main
-audio/libgpod,-python
-audio/py-mutagen
-multimedia/mpv
-security/acme-client
-www/minitube
-x11/gnome-mplayer
-x11/smplayer
-x11/smtube
Re: Add MODOCAML_RUNDEP to ocaml.port.mk
On Mon 01/02/2021 01:47, Jeremie Courreges-Anglas wrote:
> On Sat, Jan 23 2021, Bjorn Ketelaars <bket@openbsd.org> wrote:
> > On Sat 23/01/2021 18:22, Jeremie Courreges-Anglas wrote:
> >> On Sat, Jan 23 2021, Stuart Henderson <stu@spacehopper.org> wrote:
> >> > On 2021/01/23 13:33, Jeremie Courreges-Anglas wrote:
> >> >> On Fri, Jan 22 2021, Bjorn Ketelaars <bket@openbsd.org> wrote:
> >> >> >
> >> >> > Don't think so. If we are building on a non-native arch we want to make
> >> >> > sure that lang/ocaml is added as BDEP and RDEP, independent how
> >> >> > MODOCAML_RUNDEP or MODOCAML_BUILDDEP are used in a Makefile.
> >> >> > [...]
> >> >>
> >> >> An OCaml port probably needs lang/ocaml at build time on *all archs*,
> >> >> I don't see a reason to introduce a difference between native and
> >> >> non-native archs *at build time*, nor do I see a good reason to ignore
> >> >> what a port specifies.
> >> >
> >> > Agreed, variable build dependencies per-arch sounds like it's asking for
> >> > trouble.
> >> >
> >> >> | # Assume that we want to automatically add ocaml to BUILD_DEPENDS
> >> >> | -# and RUN_DEPENDS unless the port specifically requests not to.
> >> >> | +# unless the port specifically requests not to.
> >> >> | MODOCAML_BUILDDEP?= Yes
> >> >> | +# Same for RUN_DEPENDS, but MODOCAML_RUN_DEPENDS can take three values:
> >> >> | +# Yes, No or if-not-native (translates to Yes if native-code is unsupported)
> >> >> | MODOCAML_RUNDEP?= Yes
> >> >> |
> >> >> | .if ${NO_BUILD:L} == no && ${MODOCAML_BUILDDEP:L} == yes
> >> >> | BUILD_DEPENDS+= ${MODOCAML_BUILD_DEPENDS}
> >> >> | .endif
> >> >
> >> > I'm not totally objecting to MODOCAML_BUILDDEP=no but I'm not sure
> >> > there's a use for it. I'd be tempted to leave it out for now. If we
> >> > do that and someone does comes up with a port that wants to disable
> >> > build dep's later, they could just change ocaml.port.mk at the same
> >> > time, no need to hack around it.
> >> >
> >> > Apart from anything else port-modules(5) is already hard to read and
> >> > I'd be happy to avoid adding more :)
> >> >
> >> > I think MODGO_BUILDDEP can be removed from go.port.mk too, nothing
> >> > uses it and I don't really see how it could..
> >> >
> >> > It's used quite a lot for python, and a bit for PHP though possibly
> >> > not enough - this discussion made me wonder if I should change that to
> >> > No by default for PHP. But those are quite different to the case of
> >> > go or ocaml.
> >>
> >> By default I'd prefer to have all modules behave similarly, but I can
> >> understand how it doesn't make sense in some situations.
> >>
> >> >> | +.if ${MODOCAML_RUNDEP:L} == if-not-native && ${MODOCAML_NATIVE} == No
> >> >> | +MODOCAML_RUNDEP = Yes
> >> >> | +.endif
> >> >> | .if ${MODOCAML_RUNDEP:L} == yes
> >> >> | RUN_DEPENDS+= ${MODOCAML_RUN_DEPENDS}
> >> >> | .endif
> >> >>
> >> >> This implements the three choice logic suggested by sthen, doesn't
> >> >> affect current defaults, and only cares about the runtime dep.
> >> >> I hope that "if-not-native" is an improvement over "nonative".
> >> >
> >> > love the "if-not-native" wording, that's perfect :)
> >>
> >> Great. Here's the latest, simpler diff. No more MODOCAML_BUILDDEP, no
> >> more MODOCAML_*_DEPENDS either (after all, their content was obvious).
> >>
> >> Bjorn, still ok? Stuart, others?
> >
> > Yes, still OK.
>
> It's in. Here's a documentation proposal, trying to make information
> unambiguous wrt context. Feedback, oks?
>
>
> Index: port-modules.5
> ===================================================================
> RCS file: /d/cvs/src/share/man/man5/port-modules.5,v
> retrieving revision 1.251
> diff -u -p -p -u -r1.251 port-modules.5
> --- port-modules.5 25 Jan 2021 14:02:18 -0000 1.251
> +++ port-modules.5 1 Feb 2021 00:37:50 -0000
> @@ -1309,7 +1309,13 @@ Appends to
> .Ev BUILD_DEPENDS
> and
> .Ev MAKE_ENV .
> -This selects a %%native%% plist fragment and
> +Appends to
> +.Ev RUN_DEPENDS
> +unless
> +.Ev MODOCAML_RUNDEP
> +is set to No, or set to if-not-native and native compilation
> +is supported on this architecture.
> +Including this module selects a %%native%% plist fragment and
> .Ev ocaml_native
> property depending on whether the architecture supports native
> compilation.
OK bket@
> On Sat, Jan 23 2021, Bjorn Ketelaars <bket@openbsd.org> wrote:
> > On Sat 23/01/2021 18:22, Jeremie Courreges-Anglas wrote:
> >> On Sat, Jan 23 2021, Stuart Henderson <stu@spacehopper.org> wrote:
> >> > On 2021/01/23 13:33, Jeremie Courreges-Anglas wrote:
> >> >> On Fri, Jan 22 2021, Bjorn Ketelaars <bket@openbsd.org> wrote:
> >> >> >
> >> >> > Don't think so. If we are building on a non-native arch we want to make
> >> >> > sure that lang/ocaml is added as BDEP and RDEP, independent how
> >> >> > MODOCAML_RUNDEP or MODOCAML_BUILDDEP are used in a Makefile.
> >> >> > [...]
> >> >>
> >> >> An OCaml port probably needs lang/ocaml at build time on *all archs*,
> >> >> I don't see a reason to introduce a difference between native and
> >> >> non-native archs *at build time*, nor do I see a good reason to ignore
> >> >> what a port specifies.
> >> >
> >> > Agreed, variable build dependencies per-arch sounds like it's asking for
> >> > trouble.
> >> >
> >> >> | # Assume that we want to automatically add ocaml to BUILD_DEPENDS
> >> >> | -# and RUN_DEPENDS unless the port specifically requests not to.
> >> >> | +# unless the port specifically requests not to.
> >> >> | MODOCAML_BUILDDEP?= Yes
> >> >> | +# Same for RUN_DEPENDS, but MODOCAML_RUN_DEPENDS can take three values:
> >> >> | +# Yes, No or if-not-native (translates to Yes if native-code is unsupported)
> >> >> | MODOCAML_RUNDEP?= Yes
> >> >> |
> >> >> | .if ${NO_BUILD:L} == no && ${MODOCAML_BUILDDEP:L} == yes
> >> >> | BUILD_DEPENDS+= ${MODOCAML_BUILD_DEPENDS}
> >> >> | .endif
> >> >
> >> > I'm not totally objecting to MODOCAML_BUILDDEP=no but I'm not sure
> >> > there's a use for it. I'd be tempted to leave it out for now. If we
> >> > do that and someone does comes up with a port that wants to disable
> >> > build dep's later, they could just change ocaml.port.mk at the same
> >> > time, no need to hack around it.
> >> >
> >> > Apart from anything else port-modules(5) is already hard to read and
> >> > I'd be happy to avoid adding more :)
> >> >
> >> > I think MODGO_BUILDDEP can be removed from go.port.mk too, nothing
> >> > uses it and I don't really see how it could..
> >> >
> >> > It's used quite a lot for python, and a bit for PHP though possibly
> >> > not enough - this discussion made me wonder if I should change that to
> >> > No by default for PHP. But those are quite different to the case of
> >> > go or ocaml.
> >>
> >> By default I'd prefer to have all modules behave similarly, but I can
> >> understand how it doesn't make sense in some situations.
> >>
> >> >> | +.if ${MODOCAML_RUNDEP:L} == if-not-native && ${MODOCAML_NATIVE} == No
> >> >> | +MODOCAML_RUNDEP = Yes
> >> >> | +.endif
> >> >> | .if ${MODOCAML_RUNDEP:L} == yes
> >> >> | RUN_DEPENDS+= ${MODOCAML_RUN_DEPENDS}
> >> >> | .endif
> >> >>
> >> >> This implements the three choice logic suggested by sthen, doesn't
> >> >> affect current defaults, and only cares about the runtime dep.
> >> >> I hope that "if-not-native" is an improvement over "nonative".
> >> >
> >> > love the "if-not-native" wording, that's perfect :)
> >>
> >> Great. Here's the latest, simpler diff. No more MODOCAML_BUILDDEP, no
> >> more MODOCAML_*_DEPENDS either (after all, their content was obvious).
> >>
> >> Bjorn, still ok? Stuart, others?
> >
> > Yes, still OK.
>
> It's in. Here's a documentation proposal, trying to make information
> unambiguous wrt context. Feedback, oks?
>
>
> Index: port-modules.5
> ===================================================================
> RCS file: /d/cvs/src/share/man/man5/port-modules.5,v
> retrieving revision 1.251
> diff -u -p -p -u -r1.251 port-modules.5
> --- port-modules.5 25 Jan 2021 14:02:18 -0000 1.251
> +++ port-modules.5 1 Feb 2021 00:37:50 -0000
> @@ -1309,7 +1309,13 @@ Appends to
> .Ev BUILD_DEPENDS
> and
> .Ev MAKE_ENV .
> -This selects a %%native%% plist fragment and
> +Appends to
> +.Ev RUN_DEPENDS
> +unless
> +.Ev MODOCAML_RUNDEP
> +is set to No, or set to if-not-native and native compilation
> +is supported on this architecture.
> +Including this module selects a %%native%% plist fragment and
> .Ev ocaml_native
> property depending on whether the architecture supports native
> compilation.
OK bket@
python.port.mk: Run MODPY_BIN_ADJ once for all MODPY_ADJ_FILES
The perl snippat that looks like this can cope with multiple files at
once, so save a few execs:
MODPY_BIN_ADJ = perl -pi \
-e '$$. == 1 && s|^.*env +python.*$$|\#!${MODPY_BIN}|;' \
-e '$$. == 1 && s|^.*bin/python.*$$|\#!${MODPY_BIN}|;' \
-e 'close ARGV if eof;'
To make it more robust, also append `--' to it such that ports cannot
(accidentially) pass options; I've checked the tree that no port does
this on purpose.
The only this where this could fail is with huge MODPY_ADJ_FILES but
that is not the case in our tree; ports where lots of shebangs are
fixed have their own construct around it, e.g. textproc/calibre which
uses the `find -exec ${MODPY_ADJ_FILES} {} +' idiom.
Feedback? Objections? OK?
Index: python.port.mk
===================================================================
RCS file: /cvs/ports/lang/python/python.port.mk,v
retrieving revision 1.124
diff -u -p -r1.124 python.port.mk
--- python.port.mk 29 Dec 2020 23:59:06 -0000 1.124
+++ python.port.mk 1 Feb 2021 04:18:48 -0000
@@ -214,12 +214,11 @@ UPDATE_PLIST_ARGS += -S MODPY_BIN_SUFFIX
MODPY_BIN_ADJ = perl -pi \
-e '$$. == 1 && s|^.*env +python.*$$|\#!${MODPY_BIN}|;' \
-e '$$. == 1 && s|^.*bin/python.*$$|\#!${MODPY_BIN}|;' \
- -e 'close ARGV if eof;'
+ -e 'close ARGV if eof;' --
MODPY_ADJ_FILES ?=
.if !empty(MODPY_ADJ_FILES)
-MODPYTHON_pre-configure += for f in ${MODPY_ADJ_FILES}; do \
- ${MODPY_BIN_ADJ} ${WRKSRC}/$${f}; done
+MODPYTHON_pre-configure += cd ${WRKSRC} && ${MODPY_BIN_ADJ} ${MODPY_ADJ_FILES}
.endif
MODPY_BUILD_TARGET = ${_MODPY_PRE_BUILD_STEPS}; \
once, so save a few execs:
MODPY_BIN_ADJ = perl -pi \
-e '$$. == 1 && s|^.*env +python.*$$|\#!${MODPY_BIN}|;' \
-e '$$. == 1 && s|^.*bin/python.*$$|\#!${MODPY_BIN}|;' \
-e 'close ARGV if eof;'
To make it more robust, also append `--' to it such that ports cannot
(accidentially) pass options; I've checked the tree that no port does
this on purpose.
The only this where this could fail is with huge MODPY_ADJ_FILES but
that is not the case in our tree; ports where lots of shebangs are
fixed have their own construct around it, e.g. textproc/calibre which
uses the `find -exec ${MODPY_ADJ_FILES} {} +' idiom.
Feedback? Objections? OK?
Index: python.port.mk
===================================================================
RCS file: /cvs/ports/lang/python/python.port.mk,v
retrieving revision 1.124
diff -u -p -r1.124 python.port.mk
--- python.port.mk 29 Dec 2020 23:59:06 -0000 1.124
+++ python.port.mk 1 Feb 2021 04:18:48 -0000
@@ -214,12 +214,11 @@ UPDATE_PLIST_ARGS += -S MODPY_BIN_SUFFIX
MODPY_BIN_ADJ = perl -pi \
-e '$$. == 1 && s|^.*env +python.*$$|\#!${MODPY_BIN}|;' \
-e '$$. == 1 && s|^.*bin/python.*$$|\#!${MODPY_BIN}|;' \
- -e 'close ARGV if eof;'
+ -e 'close ARGV if eof;' --
MODPY_ADJ_FILES ?=
.if !empty(MODPY_ADJ_FILES)
-MODPYTHON_pre-configure += for f in ${MODPY_ADJ_FILES}; do \
- ${MODPY_BIN_ADJ} ${WRKSRC}/$${f}; done
+MODPYTHON_pre-configure += cd ${WRKSRC} && ${MODPY_BIN_ADJ} ${MODPY_ADJ_FILES}
.endif
MODPY_BUILD_TARGET = ${_MODPY_PRE_BUILD_STEPS}; \
[update] x11/wmmenu 1.2 -> 1.3 + new devel/libdockapp fixes (4/4)
The below diff updates wmmenu to 1.3.
Port-wise:
- move MASTER_SITES and HOMEPAGE to dockapps.net
- overhaul the gdk_pixbuf flavor
- update the Makefile patch to be as close as possible to the
original patch; note that gdx-pixbuf-1.0 support is gone. There are
-L/-I duplicates, but due to the how the Makefile has been written
it seems unavoidable
- and add fixes for the new libdockapp
Testing:
It has been run tested on amd64 and macppc with the app list provided as
example. Note that you *need* to use this dockapp with windowmaker;
it won't do anything if you don't.
Comments/feedback are welcome,
Charlène.
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/wmmenu/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile 11 Nov 2020 09:51:46 -0000 1.23
+++ Makefile 1 Feb 2021 02:33:59 -0000
@@ -2,22 +2,21 @@
COMMENT= wm-dockapp; A popup menu of icons that launch programs
-DISTNAME= wmmenu-1.2
-REVISION= 5
+DISTNAME= wmmenu-1.3
-CATEGORIES= x11 x11/windowmaker
+CATEGORIES= x11 x11/windowmaker
-HOMEPAGE= http://www.fcoutant.freesurf.fr/wmmenu.html
+HOMEPAGE= https://www.dockapps.net/wmmenu
# GPLv2
PERMIT_PACKAGE= Yes
WANTLIB= X11 Xext Xpm c m dockapp
-MASTER_SITES= http://www.fcoutant.freesurf.fr/download/
+MASTER_SITES= https://www.dockapps.net/download/
-LIB_DEPENDS= devel/libdockapp
+LIB_DEPENDS= devel/libdockapp>=0.7.3
FLAVORS= gdk_pixbuf
FLAVOR?=
@@ -25,12 +24,17 @@ FLAVOR?=
.if ${FLAVOR:Mgdk_pixbuf}
MAKE_FLAGS= GDKPIXBUF2=1
LIB_DEPENDS+= graphics/gdk-pixbuf-xlib
-CFLAGS+= -pthread
-MAKE_ENV+= LDFLAGS="-pthread"
-WANTLIB += pthread gdk_pixbuf_xlib-2.0
+WANTLIB += gdk_pixbuf-2.0 gdk_pixbuf_xlib-2.0 glib-2.0 gobject-2.0
+WANTLIB += intl
.endif
-WRKDIST= ${WRKDIR}/wmmenu
+WRKDIST= ${WRKDIR}/dockapps
+
+
+CFLAGS+= -I${X11BASE}/include
+LDFLAGS+= -L${X11BASE}/lib
+
+MAKE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
pre-configure:
@perl -pi -e 's#%%PREFIX%%#${PREFIX}#' ${WRKSRC}/example/defaults
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/wmmenu/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo 18 Jan 2015 03:16:04 -0000 1.6
+++ distinfo 1 Feb 2021 02:33:59 -0000
@@ -1,2 +1,2 @@
-SHA256 (wmmenu-1.2.tar.gz) = wicP3WNugrzdvTpDxK57jcL18PiJDPj0BM4CTV99q4c=
-SIZE (wmmenu-1.2.tar.gz) = 32845
+SHA256 (wmmenu-1.3.tar.gz) = xvwJ6BKwEvrIPJSLv8N/u9PqcC5G6ULrsp7GovVB+jo=
+SIZE (wmmenu-1.3.tar.gz) = 33766
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/x11/wmmenu/patches/patch-Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-Makefile
--- patches/patch-Makefile 26 Mar 2010 11:28:15 -0000 1.5
+++ patches/patch-Makefile 1 Feb 2021 02:33:59 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-Makefile,v 1.5 2010/03/26 11:28:15 jasper Exp $
---- Makefile.orig Sat Mar 23 13:51:36 2002
-+++ Makefile Fri Mar 26 10:00:50 2010
-@@ -1,36 +1,29 @@
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -1,27 +1,27 @@
-prefix = /usr/local
+prefix = ${PREFIX}
BINDIR = $(prefix)/bin
@@ -9,51 +10,43 @@ $OpenBSD: patch-Makefile,v 1.5 2010/03/2
-ETCDIR = $(prefix)/etc
+ETCDIR = $(prefix)/share/wmmenu
--# comment out both lines to get the old, Xpm-only, version
--GDKPIXBUF = 1
--#GDKPIXBUF2 = 1
+-# comment to get the old, Xpm-only, version
+-GDKPIXBUF2 = 1
+XROOT = ${X11BASE}
+DAROOT = ${LOCALBASE}
--XROOT = /usr/X11R6
--DAROOT = /usr/local
--
- # If you want to use gdk-pixbuf, pass GDKPIXBUF=1 to make command
--ifdef GDKPIXBUF
-+.if GDKPIXBUF
- PIXBUF_DEF = -DWITH_GDKPIXBUF
--PIXBUF_INC := $(shell gdk-pixbuf-config --cflags)
--PIXBUF_LIB := -rdynamic -L$(shell gdk-pixbuf-config --prefix)/lib -lgdk_pixbuf_xlib
--endif
-+PIXBUF_INC != gdk-pixbuf-config --cflags
-+PIXBUF_LIB = -lgdk_pixbuf_xlib -lgtk -lgdk -lgmodule -lglib -lintl -lXext -lX11 -lm -ltiff -ljpeg -lpng -lz
-+.endif
-
# If you want to use gdk-pixbuf-2.0, pass GDKPIXBUF2=1 to make command
-ifdef GDKPIXBUF2
--PIXBUF_CFG = /opt/gtk2/bin/pkg-config gdk-pixbuf-xlib-2.0
--PIXBUF_DEF = -DWITH_GDKPIXBUF
+-PIXBUF_CFG = pkg-config gdk-pixbuf-xlib-2.0
++.if GDKPIXBUF2
++PIXBUF_CFG != pkg-config gdk-pixbuf-xlib-2.0
+ PIXBUF_DEF = -DWITH_GDKPIXBUF
-PIXBUF_INC := $(shell $(PIXBUF_CFG) --cflags)
--PIXBUF_LIB := -rdynamic -L$(shell $(PIXBUF_CFG) --variable=prefix)/lib -lgdk_pixbuf_xlib-2.0
+-PIXBUF_LIB := -rdynamic -L$(shell $(PIXBUF_CFG) --variable=prefix)/lib -lgdk_pixbuf_xlib-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0
-endif
-+.if GDKPIXBUF2
-+PIXBUF_CFG = pkg-config gdk-pixbuf-xlib-2.0
-+PIXBUF_DEF = -DWITH_GDKPIXBUF2
-+PIXBUF_INC != pkg-config --cflgas gdk-pixbuf-xlib-2.0
-+PIXBUF_LIB = -rdynamic -L$(shell $(PIXBUF_CFG) --variable=prefix)/lib -lgdk_pixbuf_xlib-2.0
++PIXBUF_INC != pkg-config --cflags gdk-pixbuf-xlib-2.0
++PIXBUF_LIB != pkg-config --libs gdk-pixbuf-xlib-2.0
+.endif
-CC = gcc #-g
--CFLAGS = -pipe $(CPPFLAGS) -O2
--CPPFLAGS = -MMD -ansi -pedantic -Wall $(INCDIRS) $(DEFINES)
+-CFLAGS = -pipe -O2
+-CPPFLAGS = -MMD -ansi -pedantic -Wall
+-INCDIRS = $(PIXBUF_INC)
+CFLAGS += $(INCDIRS) $(DEFINES)
- INCDIRS = -I$(DAROOT)/include -I$(XROOT)/include $(PIXBUF_INC)
++INCDIRS != pkg-config --cflags dockapp
++INCDIRS += -I$(DAROOT)/include -I$(XROOT)/include $(PIXBUF_INC)
DEFINES = -DETCDIR='"$(ETCDIR)"' $(PIXBUF_DEF)
-LDFLAGS = -s
- LIBDIRS = -L$(DAROOT)/lib -L$(XROOT)/lib $(PIXBUF_LIB)
- LDLIBS = -ldockapp -lXpm -lXext -lX11 -lm
+-LIBDIRS = $(PIXBUF_LIB)
+-LDLIBS = -ldockapp -lXpm -lXext -lX11 -lm
++LIBDIRS != pkg-config --libs-only-L dockapp
++LIBDIRS += $(PIXBUF_LIB)
++LDLIBS != pkg-config --libs-only-l dockapp
++LDLIBS += -lXpm -lXext -lX11 -lm
-@@ -67,4 +60,3 @@ clean :
+ MKDIRHIER = mkdir -p
+ MAN1DIR = $(MANDIR)/man1
+@@ -56,4 +56,3 @@ clean :
$(RM) *.o *.d core tags $(PRGS)
# dependencies -- do not change lines below
Index: patches/patch-buttonbar_c
===================================================================
RCS file: patches/patch-buttonbar_c
diff -N patches/patch-buttonbar_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-buttonbar_c 1 Feb 2021 02:33:59 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Fix with libdockapp>=0.7
+
+Index: buttonbar.c
+--- buttonbar.c.orig
++++ buttonbar.c
+@@ -1,6 +1,6 @@
+ #include <assert.h>
+
+-#include <dockapp.h>
++#include <libdockapp/dockapp.h>
+
+ #include "buttonbar.h"
+ #include "xobjects.h"
Index: patches/patch-events_c
===================================================================
RCS file: patches/patch-events_c
diff -N patches/patch-events_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-events_c 1 Feb 2021 02:33:59 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix with libdockapp>=0.7
+
+Index: events.c
+--- events.c.orig
++++ events.c
+@@ -22,7 +22,7 @@ Reparent and Destroy events are catched with Structure
+
+ #include <stdlib.h>
+
+-#include <dockapp.h>
++#include <libdockapp/dockapp.h>
+
+ #include "types.h"
+ #include "events.h"
Index: patches/patch-example_defaults
===================================================================
RCS file: /cvs/ports/x11/wmmenu/patches/patch-example_defaults,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-example_defaults
--- patches/patch-example_defaults 26 Mar 2010 08:51:44 -0000 1.2
+++ patches/patch-example_defaults 1 Feb 2021 02:33:59 -0000
@@ -1,6 +1,7 @@
$OpenBSD: patch-example_defaults,v 1.2 2010/03/26 08:51:44 jasper Exp $
---- example/defaults.orig Sat May 4 14:50:00 2002
-+++ example/defaults Fri Mar 26 09:51:02 2010
+Index: example/defaults
+--- example/defaults.orig
++++ example/defaults
@@ -20,7 +20,9 @@
#
# hide_timeout 1
Index: patches/patch-pixmaps_c
===================================================================
RCS file: patches/patch-pixmaps_c
diff -N patches/patch-pixmaps_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-pixmaps_c 1 Feb 2021 02:33:59 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix with libdockapp>=0.7
+
+Index: pixmaps.c
+--- pixmaps.c.orig
++++ pixmaps.c
+@@ -4,7 +4,7 @@
+ #ifdef WITH_GDKPIXBUF
+ #include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
+
Port-wise:
- move MASTER_SITES and HOMEPAGE to dockapps.net
- overhaul the gdk_pixbuf flavor
- update the Makefile patch to be as close as possible to the
original patch; note that gdx-pixbuf-1.0 support is gone. There are
-L/-I duplicates, but due to the how the Makefile has been written
it seems unavoidable
- and add fixes for the new libdockapp
Testing:
It has been run tested on amd64 and macppc with the app list provided as
example. Note that you *need* to use this dockapp with windowmaker;
it won't do anything if you don't.
Comments/feedback are welcome,
Charlène.
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/wmmenu/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile 11 Nov 2020 09:51:46 -0000 1.23
+++ Makefile 1 Feb 2021 02:33:59 -0000
@@ -2,22 +2,21 @@
COMMENT= wm-dockapp; A popup menu of icons that launch programs
-DISTNAME= wmmenu-1.2
-REVISION= 5
+DISTNAME= wmmenu-1.3
-CATEGORIES= x11 x11/windowmaker
+CATEGORIES= x11 x11/windowmaker
-HOMEPAGE= http://www.fcoutant.freesurf.fr/wmmenu.html
+HOMEPAGE= https://www.dockapps.net/wmmenu
# GPLv2
PERMIT_PACKAGE= Yes
WANTLIB= X11 Xext Xpm c m dockapp
-MASTER_SITES= http://www.fcoutant.freesurf.fr/download/
+MASTER_SITES= https://www.dockapps.net/download/
-LIB_DEPENDS= devel/libdockapp
+LIB_DEPENDS= devel/libdockapp>=0.7.3
FLAVORS= gdk_pixbuf
FLAVOR?=
@@ -25,12 +24,17 @@ FLAVOR?=
.if ${FLAVOR:Mgdk_pixbuf}
MAKE_FLAGS= GDKPIXBUF2=1
LIB_DEPENDS+= graphics/gdk-pixbuf-xlib
-CFLAGS+= -pthread
-MAKE_ENV+= LDFLAGS="-pthread"
-WANTLIB += pthread gdk_pixbuf_xlib-2.0
+WANTLIB += gdk_pixbuf-2.0 gdk_pixbuf_xlib-2.0 glib-2.0 gobject-2.0
+WANTLIB += intl
.endif
-WRKDIST= ${WRKDIR}/wmmenu
+WRKDIST= ${WRKDIR}/dockapps
+
+
+CFLAGS+= -I${X11BASE}/include
+LDFLAGS+= -L${X11BASE}/lib
+
+MAKE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
pre-configure:
@perl -pi -e 's#%%PREFIX%%#${PREFIX}#' ${WRKSRC}/example/defaults
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/wmmenu/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo 18 Jan 2015 03:16:04 -0000 1.6
+++ distinfo 1 Feb 2021 02:33:59 -0000
@@ -1,2 +1,2 @@
-SHA256 (wmmenu-1.2.tar.gz) = wicP3WNugrzdvTpDxK57jcL18PiJDPj0BM4CTV99q4c=
-SIZE (wmmenu-1.2.tar.gz) = 32845
+SHA256 (wmmenu-1.3.tar.gz) = xvwJ6BKwEvrIPJSLv8N/u9PqcC5G6ULrsp7GovVB+jo=
+SIZE (wmmenu-1.3.tar.gz) = 33766
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/x11/wmmenu/patches/patch-Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-Makefile
--- patches/patch-Makefile 26 Mar 2010 11:28:15 -0000 1.5
+++ patches/patch-Makefile 1 Feb 2021 02:33:59 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-Makefile,v 1.5 2010/03/26 11:28:15 jasper Exp $
---- Makefile.orig Sat Mar 23 13:51:36 2002
-+++ Makefile Fri Mar 26 10:00:50 2010
-@@ -1,36 +1,29 @@
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -1,27 +1,27 @@
-prefix = /usr/local
+prefix = ${PREFIX}
BINDIR = $(prefix)/bin
@@ -9,51 +10,43 @@ $OpenBSD: patch-Makefile,v 1.5 2010/03/2
-ETCDIR = $(prefix)/etc
+ETCDIR = $(prefix)/share/wmmenu
--# comment out both lines to get the old, Xpm-only, version
--GDKPIXBUF = 1
--#GDKPIXBUF2 = 1
+-# comment to get the old, Xpm-only, version
+-GDKPIXBUF2 = 1
+XROOT = ${X11BASE}
+DAROOT = ${LOCALBASE}
--XROOT = /usr/X11R6
--DAROOT = /usr/local
--
- # If you want to use gdk-pixbuf, pass GDKPIXBUF=1 to make command
--ifdef GDKPIXBUF
-+.if GDKPIXBUF
- PIXBUF_DEF = -DWITH_GDKPIXBUF
--PIXBUF_INC := $(shell gdk-pixbuf-config --cflags)
--PIXBUF_LIB := -rdynamic -L$(shell gdk-pixbuf-config --prefix)/lib -lgdk_pixbuf_xlib
--endif
-+PIXBUF_INC != gdk-pixbuf-config --cflags
-+PIXBUF_LIB = -lgdk_pixbuf_xlib -lgtk -lgdk -lgmodule -lglib -lintl -lXext -lX11 -lm -ltiff -ljpeg -lpng -lz
-+.endif
-
# If you want to use gdk-pixbuf-2.0, pass GDKPIXBUF2=1 to make command
-ifdef GDKPIXBUF2
--PIXBUF_CFG = /opt/gtk2/bin/pkg-config gdk-pixbuf-xlib-2.0
--PIXBUF_DEF = -DWITH_GDKPIXBUF
+-PIXBUF_CFG = pkg-config gdk-pixbuf-xlib-2.0
++.if GDKPIXBUF2
++PIXBUF_CFG != pkg-config gdk-pixbuf-xlib-2.0
+ PIXBUF_DEF = -DWITH_GDKPIXBUF
-PIXBUF_INC := $(shell $(PIXBUF_CFG) --cflags)
--PIXBUF_LIB := -rdynamic -L$(shell $(PIXBUF_CFG) --variable=prefix)/lib -lgdk_pixbuf_xlib-2.0
+-PIXBUF_LIB := -rdynamic -L$(shell $(PIXBUF_CFG) --variable=prefix)/lib -lgdk_pixbuf_xlib-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0
-endif
-+.if GDKPIXBUF2
-+PIXBUF_CFG = pkg-config gdk-pixbuf-xlib-2.0
-+PIXBUF_DEF = -DWITH_GDKPIXBUF2
-+PIXBUF_INC != pkg-config --cflgas gdk-pixbuf-xlib-2.0
-+PIXBUF_LIB = -rdynamic -L$(shell $(PIXBUF_CFG) --variable=prefix)/lib -lgdk_pixbuf_xlib-2.0
++PIXBUF_INC != pkg-config --cflags gdk-pixbuf-xlib-2.0
++PIXBUF_LIB != pkg-config --libs gdk-pixbuf-xlib-2.0
+.endif
-CC = gcc #-g
--CFLAGS = -pipe $(CPPFLAGS) -O2
--CPPFLAGS = -MMD -ansi -pedantic -Wall $(INCDIRS) $(DEFINES)
+-CFLAGS = -pipe -O2
+-CPPFLAGS = -MMD -ansi -pedantic -Wall
+-INCDIRS = $(PIXBUF_INC)
+CFLAGS += $(INCDIRS) $(DEFINES)
- INCDIRS = -I$(DAROOT)/include -I$(XROOT)/include $(PIXBUF_INC)
++INCDIRS != pkg-config --cflags dockapp
++INCDIRS += -I$(DAROOT)/include -I$(XROOT)/include $(PIXBUF_INC)
DEFINES = -DETCDIR='"$(ETCDIR)"' $(PIXBUF_DEF)
-LDFLAGS = -s
- LIBDIRS = -L$(DAROOT)/lib -L$(XROOT)/lib $(PIXBUF_LIB)
- LDLIBS = -ldockapp -lXpm -lXext -lX11 -lm
+-LIBDIRS = $(PIXBUF_LIB)
+-LDLIBS = -ldockapp -lXpm -lXext -lX11 -lm
++LIBDIRS != pkg-config --libs-only-L dockapp
++LIBDIRS += $(PIXBUF_LIB)
++LDLIBS != pkg-config --libs-only-l dockapp
++LDLIBS += -lXpm -lXext -lX11 -lm
-@@ -67,4 +60,3 @@ clean :
+ MKDIRHIER = mkdir -p
+ MAN1DIR = $(MANDIR)/man1
+@@ -56,4 +56,3 @@ clean :
$(RM) *.o *.d core tags $(PRGS)
# dependencies -- do not change lines below
Index: patches/patch-buttonbar_c
===================================================================
RCS file: patches/patch-buttonbar_c
diff -N patches/patch-buttonbar_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-buttonbar_c 1 Feb 2021 02:33:59 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Fix with libdockapp>=0.7
+
+Index: buttonbar.c
+--- buttonbar.c.orig
++++ buttonbar.c
+@@ -1,6 +1,6 @@
+ #include <assert.h>
+
+-#include <dockapp.h>
++#include <libdockapp/dockapp.h>
+
+ #include "buttonbar.h"
+ #include "xobjects.h"
Index: patches/patch-events_c
===================================================================
RCS file: patches/patch-events_c
diff -N patches/patch-events_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-events_c 1 Feb 2021 02:33:59 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix with libdockapp>=0.7
+
+Index: events.c
+--- events.c.orig
++++ events.c
+@@ -22,7 +22,7 @@ Reparent and Destroy events are catched with Structure
+
+ #include <stdlib.h>
+
+-#include <dockapp.h>
++#include <libdockapp/dockapp.h>
+
+ #include "types.h"
+ #include "events.h"
Index: patches/patch-example_defaults
===================================================================
RCS file: /cvs/ports/x11/wmmenu/patches/patch-example_defaults,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-example_defaults
--- patches/patch-example_defaults 26 Mar 2010 08:51:44 -0000 1.2
+++ patches/patch-example_defaults 1 Feb 2021 02:33:59 -0000
@@ -1,6 +1,7 @@
$OpenBSD: patch-example_defaults,v 1.2 2010/03/26 08:51:44 jasper Exp $
---- example/defaults.orig Sat May 4 14:50:00 2002
-+++ example/defaults Fri Mar 26 09:51:02 2010
+Index: example/defaults
+--- example/defaults.orig
++++ example/defaults
@@ -20,7 +20,9 @@
#
# hide_timeout 1
Index: patches/patch-pixmaps_c
===================================================================
RCS file: patches/patch-pixmaps_c
diff -N patches/patch-pixmaps_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-pixmaps_c 1 Feb 2021 02:33:59 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix with libdockapp>=0.7
+
+Index: pixmaps.c
+--- pixmaps.c.orig
++++ pixmaps.c
+@@ -4,7 +4,7 @@
+ #ifdef WITH_GDKPIXBUF
+ #include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
+
x11/wmdate: fix with the new devel/libdockapp (3/4)
This has been tested successfully on macppc and amd64. If you don't use
windowmaker, you'll need to use the '-w' option.
A vintage patch got refreshed while here.
Comments/feedback are welcome,
Charlène.
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/wmdate/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile 12 Jul 2019 20:51:24 -0000 1.23
+++ Makefile 1 Feb 2021 01:27:06 -0000
@@ -3,7 +3,7 @@
COMMENT= wm-dockapp; shows the current date
DISTNAME= wmdate-0.7
-REVISION= 3
+REVISION= 4
CATEGORIES= x11 x11/windowmaker
# BSD
@@ -11,7 +11,7 @@ PERMIT_PACKAGE= Yes
WANTLIB= X11 Xau Xdmcp Xext Xpm c dockapp
-LIB_DEPENDS= devel/libdockapp
+LIB_DEPENDS= devel/libdockapp>=0.7.3
NO_TEST= Yes
CONFIGURE_STYLE= imake noman
Index: patches/patch-Imakefile
===================================================================
RCS file: /cvs/ports/x11/wmdate/patches/patch-Imakefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-Imakefile
--- patches/patch-Imakefile 16 Jan 2001 22:10:15 -0000 1.1.1.1
+++ patches/patch-Imakefile 1 Feb 2021 01:27:06 -0000
@@ -1,6 +1,7 @@
$OpenBSD: patch-Imakefile,v 1.1.1.1 2001/01/16 22:10:15 naddy Exp $
---- Imakefile.orig Mon May 17 22:36:35 1999
-+++ Imakefile Tue Jan 16 16:41:43 2001
+Index: Imakefile
+--- Imakefile.orig
++++ Imakefile
@@ -89,8 +89,7 @@ XCOMM
MASTERXPM = xpm/$(MASTER_XPM).xpm
@@ -11,7 +12,7 @@ $OpenBSD: patch-Imakefile,v 1.1.1.1 2001
-L. \
-ldockapp \
-lXpm -lXext -lX11
-@@ -132,7 +131,7 @@ XCOMM ----------------------------------
+@@ -132,7 +131,7 @@ XCOMM ---------------------------------------
XCOMM Create Makefile
XCOMM ---------------------------------------
Index: patches/patch-wmdate_c
===================================================================
RCS file: /cvs/ports/x11/wmdate/patches/patch-wmdate_c,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-wmdate_c
--- patches/patch-wmdate_c 16 Jan 2001 22:10:16 -0000 1.1.1.1
+++ patches/patch-wmdate_c 1 Feb 2021 01:27:06 -0000
@@ -1,9 +1,25 @@
$OpenBSD: patch-wmdate_c,v 1.1.1.1 2001/01/16 22:10:16 naddy Exp $
---- wmdate.c.orig Mon May 17 22:25:23 1999
-+++ wmdate.c Tue Jan 16 16:35:36 2001
-@@ -95,7 +95,7 @@ main (int argc, char *argv[])
+
+Hunk #1: fix with libdockapp>=0.7
+
+Index: wmdate.c
+--- wmdate.c.orig
++++ wmdate.c
+@@ -39,7 +39,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S
+ #include <X11/extensions/shape.h>
+ #include <time.h>
+
+-#include <dockapp.h>
++#include <libdockapp/dockapp.h>
+ #include "config.h"
+ #include "geometry.h"
+
+@@ -93,9 +93,9 @@ main (int argc, char *argv[])
+ Pixmap disp; /* Pixmap that is actually displayed */
+ unsigned long fore_pix, back_pix;
int old_day;
- unsigned int w=183, h=84;
+- unsigned int w=183, h=84;
++ unsigned short w=183, h=84;
- DAParseArguments(argc, argv, options, 4, DESCRIPTION, VERSION);
+ DAParseArguments(argc, argv, options, 3, DESCRIPTION, VERSION);
windowmaker, you'll need to use the '-w' option.
A vintage patch got refreshed while here.
Comments/feedback are welcome,
Charlène.
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/wmdate/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile 12 Jul 2019 20:51:24 -0000 1.23
+++ Makefile 1 Feb 2021 01:27:06 -0000
@@ -3,7 +3,7 @@
COMMENT= wm-dockapp; shows the current date
DISTNAME= wmdate-0.7
-REVISION= 3
+REVISION= 4
CATEGORIES= x11 x11/windowmaker
# BSD
@@ -11,7 +11,7 @@ PERMIT_PACKAGE= Yes
WANTLIB= X11 Xau Xdmcp Xext Xpm c dockapp
-LIB_DEPENDS= devel/libdockapp
+LIB_DEPENDS= devel/libdockapp>=0.7.3
NO_TEST= Yes
CONFIGURE_STYLE= imake noman
Index: patches/patch-Imakefile
===================================================================
RCS file: /cvs/ports/x11/wmdate/patches/patch-Imakefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-Imakefile
--- patches/patch-Imakefile 16 Jan 2001 22:10:15 -0000 1.1.1.1
+++ patches/patch-Imakefile 1 Feb 2021 01:27:06 -0000
@@ -1,6 +1,7 @@
$OpenBSD: patch-Imakefile,v 1.1.1.1 2001/01/16 22:10:15 naddy Exp $
---- Imakefile.orig Mon May 17 22:36:35 1999
-+++ Imakefile Tue Jan 16 16:41:43 2001
+Index: Imakefile
+--- Imakefile.orig
++++ Imakefile
@@ -89,8 +89,7 @@ XCOMM
MASTERXPM = xpm/$(MASTER_XPM).xpm
@@ -11,7 +12,7 @@ $OpenBSD: patch-Imakefile,v 1.1.1.1 2001
-L. \
-ldockapp \
-lXpm -lXext -lX11
-@@ -132,7 +131,7 @@ XCOMM ----------------------------------
+@@ -132,7 +131,7 @@ XCOMM ---------------------------------------
XCOMM Create Makefile
XCOMM ---------------------------------------
Index: patches/patch-wmdate_c
===================================================================
RCS file: /cvs/ports/x11/wmdate/patches/patch-wmdate_c,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-wmdate_c
--- patches/patch-wmdate_c 16 Jan 2001 22:10:16 -0000 1.1.1.1
+++ patches/patch-wmdate_c 1 Feb 2021 01:27:06 -0000
@@ -1,9 +1,25 @@
$OpenBSD: patch-wmdate_c,v 1.1.1.1 2001/01/16 22:10:16 naddy Exp $
---- wmdate.c.orig Mon May 17 22:25:23 1999
-+++ wmdate.c Tue Jan 16 16:35:36 2001
-@@ -95,7 +95,7 @@ main (int argc, char *argv[])
+
+Hunk #1: fix with libdockapp>=0.7
+
+Index: wmdate.c
+--- wmdate.c.orig
++++ wmdate.c
+@@ -39,7 +39,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S
+ #include <X11/extensions/shape.h>
+ #include <time.h>
+
+-#include <dockapp.h>
++#include <libdockapp/dockapp.h>
+ #include "config.h"
+ #include "geometry.h"
+
+@@ -93,9 +93,9 @@ main (int argc, char *argv[])
+ Pixmap disp; /* Pixmap that is actually displayed */
+ unsigned long fore_pix, back_pix;
int old_day;
- unsigned int w=183, h=84;
+- unsigned int w=183, h=84;
++ unsigned short w=183, h=84;
- DAParseArguments(argc, argv, options, 4, DESCRIPTION, VERSION);
+ DAParseArguments(argc, argv, options, 3, DESCRIPTION, VERSION);
net/wmnetload: fix with the new devel/libdockapp (2/4)
This has been tested on amd64 and macppc. To potential testers, if
you're not using windowmaker, you'll need to use the '-w' option.
Comments/feedback are welcome,
Charlène.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/wmnetload/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- Makefile 12 Jul 2019 20:48:52 -0000 1.15
+++ Makefile 1 Feb 2021 01:31:12 -0000
@@ -3,7 +3,7 @@
COMMENT= wm-dockapp; simple network interface monitoring tool
DISTNAME= wmnetload-1.3
-REVISION= 4
+REVISION= 5
CATEGORIES= net x11 x11/windowmaker
HOMEPAGE= http://freshmeat.net/projects/wmnetload
@@ -14,7 +14,7 @@ WANTLIB= X11 Xext Xpm c m dockapp
MASTER_SITES= ftp://truffula.com/pub/
-LIB_DEPENDS= devel/libdockapp
+LIB_DEPENDS= devel/libdockapp>=0.7.3
SEPARATE_BUILD= Yes
CONFIGURE_STYLE= gnu
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/net/wmnetload/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-configure
--- patches/patch-configure 7 Dec 2015 14:58:54 -0000 1.2
+++ patches/patch-configure 1 Feb 2021 01:31:12 -0000
@@ -1,6 +1,10 @@
$OpenBSD: patch-configure,v 1.2 2015/12/07 14:58:54 jasper Exp $
---- configure.orig Sun Feb 23 10:08:00 2003
-+++ configure Mon Dec 7 14:35:10 2015
+
+Hunk #2, 3: fix the build with libdockapp>=0.7
+
+Index: configure
+--- configure.orig
++++ configure
@@ -3052,6 +3052,9 @@ case $host_os in
OS=freebsd
LIBRARY_RPATH="$LIBRARY_RPATH:/usr/X11R6/lib"
@@ -11,3 +15,21 @@ $OpenBSD: patch-configure,v 1.2 2015/12/
*)
echo ""
echo "Sorry, $host_os is not supported yet."
+@@ -4713,7 +4716,7 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
+-#include <dockapp.h>
++#include <libdockapp/dockapp.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+@@ -4748,7 +4751,7 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <dockapp.h>
++#include <libdockapp/dockapp.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
Index: patches/patch-src_wmnetload_c
===================================================================
RCS file: patches/patch-src_wmnetload_c
diff -N patches/patch-src_wmnetload_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_wmnetload_c 1 Feb 2021 01:31:12 -0000
@@ -0,0 +1,26 @@
+$OpenBSD$
+
+Hunk #1: Unbreak with libdockapp>=0.7
+Hunk #2: fix text display that was blank
+
+Index: src/wmnetload.c
+--- src/wmnetload.c.orig
++++ src/wmnetload.c
+@@ -37,7 +37,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/time.h>
+ #include <unistd.h>
+-#include <dockapp.h>
++#include <libdockapp/dockapp.h>
+ #ifdef HAVE_SYS_SOCKIO_H
+ #include <sys/sockio.h>
+
you're not using windowmaker, you'll need to use the '-w' option.
Comments/feedback are welcome,
Charlène.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/wmnetload/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- Makefile 12 Jul 2019 20:48:52 -0000 1.15
+++ Makefile 1 Feb 2021 01:31:12 -0000
@@ -3,7 +3,7 @@
COMMENT= wm-dockapp; simple network interface monitoring tool
DISTNAME= wmnetload-1.3
-REVISION= 4
+REVISION= 5
CATEGORIES= net x11 x11/windowmaker
HOMEPAGE= http://freshmeat.net/projects/wmnetload
@@ -14,7 +14,7 @@ WANTLIB= X11 Xext Xpm c m dockapp
MASTER_SITES= ftp://truffula.com/pub/
-LIB_DEPENDS= devel/libdockapp
+LIB_DEPENDS= devel/libdockapp>=0.7.3
SEPARATE_BUILD= Yes
CONFIGURE_STYLE= gnu
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/net/wmnetload/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-configure
--- patches/patch-configure 7 Dec 2015 14:58:54 -0000 1.2
+++ patches/patch-configure 1 Feb 2021 01:31:12 -0000
@@ -1,6 +1,10 @@
$OpenBSD: patch-configure,v 1.2 2015/12/07 14:58:54 jasper Exp $
---- configure.orig Sun Feb 23 10:08:00 2003
-+++ configure Mon Dec 7 14:35:10 2015
+
+Hunk #2, 3: fix the build with libdockapp>=0.7
+
+Index: configure
+--- configure.orig
++++ configure
@@ -3052,6 +3052,9 @@ case $host_os in
OS=freebsd
LIBRARY_RPATH="$LIBRARY_RPATH:/usr/X11R6/lib"
@@ -11,3 +15,21 @@ $OpenBSD: patch-configure,v 1.2 2015/12/
*)
echo ""
echo "Sorry, $host_os is not supported yet."
+@@ -4713,7 +4716,7 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
+-#include <dockapp.h>
++#include <libdockapp/dockapp.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+@@ -4748,7 +4751,7 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <dockapp.h>
++#include <libdockapp/dockapp.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
Index: patches/patch-src_wmnetload_c
===================================================================
RCS file: patches/patch-src_wmnetload_c
diff -N patches/patch-src_wmnetload_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_wmnetload_c 1 Feb 2021 01:31:12 -0000
@@ -0,0 +1,26 @@
+$OpenBSD$
+
+Hunk #1: Unbreak with libdockapp>=0.7
+Hunk #2: fix text display that was blank
+
+Index: src/wmnetload.c
+--- src/wmnetload.c.orig
++++ src/wmnetload.c
+@@ -37,7 +37,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/time.h>
+ #include <unistd.h>
+-#include <dockapp.h>
++#include <libdockapp/dockapp.h>
+ #ifdef HAVE_SYS_SOCKIO_H
+ #include <sys/sockio.h>
+
[update] devel/libdockapp 0.4 -> 0.7.3 (1/4)
Hi,
Here is an update for libdockapp to 0.7.3. This is needed to update
some dockapps (i've already a diff for x11/wmitime) concerned by
-fno-common and that now uses this lib.
The major highlight is that the include file for <dockapp.h> changed. All
consumers are impacted and no updates for them in this regard has been
provided, so there will be follow up diffs.
Port-wise:
- symbols have been removed, bump major
- install fonts (a first for me, i took example from comms/x3270)
- move HOMEPAGE and MASTER_SITES to dockapps.net
This has been tested on amd64 and macppc successfully.
Comments and feedback are welcome,
Charlène.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/libdockapp/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- Makefile 12 Jul 2019 20:44:37 -0000 1.25
+++ Makefile 1 Feb 2021 01:44:40 -0000
@@ -2,21 +2,24 @@
COMMENT= dockapp-making standard library for Window Maker
-DISTNAME= libdockapp-0.4.0
-REVISION= 5
-SHARED_LIBS= dockapp 1.0 # .1.0
+DISTNAME= libdockapp-0.7.3
+SHARED_LIBS= dockapp 2.0 # .1.0
CATEGORIES= devel
+HOMEPAGE= https://www.dockapps.net/libdockapp/
+
# BSD
PERMIT_PACKAGE= Yes
-WANTLIB= X11 Xau Xdmcp Xext Xpm xcb
-MASTER_SITES= ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
+WANTLIB= X11 Xext Xpm xcb
+
+MASTER_SITES= https://www.dockapps.net/download/
NO_TEST= Yes
SEPARATE_BUILD= Yes
CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --enable-static
+CONFIGURE_ARGS+= --enable-static \
+ --with-fontdir=${PREFIX}/share/fonts/libdockapps
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libdockapp
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/libdockapp/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo 18 Jan 2015 03:13:15 -0000 1.4
+++ distinfo 1 Feb 2021 01:44:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (libdockapp-0.4.0.tar.gz) = /X7Prvw8z2VCyKhmo3C85NUey4AozYmLCCNpgfiwzGU=
-SIZE (libdockapp-0.4.0.tar.gz) = 108566
+SHA256 (libdockapp-0.7.3.tar.gz) = FtmS9oTfzbGeNoKCLUlfRzYV+6bp4vp6EGMHvHZ7OJw=
+SIZE (libdockapp-0.7.3.tar.gz) = 387507
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/devel/libdockapp/patches/patch-src_Makefile_in,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 2 Jan 2006 18:15:53 -0000 1.1
+++ patches/patch-src_Makefile_in 1 Feb 2021 01:44:40 -0000
@@ -1,12 +1,13 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2006/01/02 18:15:53 bernd Exp $
---- src/Makefile.in.orig Mon Jan 2 18:19:24 2006
-+++ src/Makefile.in Mon Jan 2 18:19:44 2006
-@@ -79,7 +79,7 @@ AUTOMAKE_OPTIONS = no-dependencies
-
+Index: src/Makefile.in
+--- src/Makefile.in.orig
++++ src/Makefile.in
+@@ -335,7 +335,7 @@ xpm_CFLAGS = @xpm_CFLAGS@
+ xpm_LIBS = @xpm_LIBS@
+ AUTOMAKE_OPTIONS = no-dependencies
lib_LTLIBRARIES = libdockapp.la
-
--libdockapp_la_LDFLAGS = -version-info 1:0:0 @X_LIBS@
-+libdockapp_la_LDFLAGS = $(LIBdockapp_LTVERSION) @X_LIBS@
-
- include_HEADERS = dockapp.h
-
+-libdockapp_la_LDFLAGS = -version-info 3:1:0
++libdockapp_la_LDFLAGS = $(LIBdockapp_LTVERSION)
+ otherincludedir = $(includedir)/libdockapp
+ otherinclude_HEADERS = dockapp.h \
+ wmgeneral.h \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/libdockapp/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 16 Mar 2015 18:07:41 -0000 1.3
+++ pkg/PLIST 1 Feb 2021 01:44:40 -0000
@@ -1,7 +1,26 @@
@comment $OpenBSD: PLIST,v 1.3 2015/03/16 18:07:41 naddy Exp $
-include/dockapp.h
-lib/libdockapp.a
+include/libdockapp/
+include/libdockapp/dockapp.h
+include/libdockapp/list.h
+include/libdockapp/misc.h
+include/libdockapp/wmgeneral.h
+@static-lib lib/libdockapp.a
lib/libdockapp.la
@lib lib/libdockapp.so.${LIBdockapp_VERSION}
+lib/pkgconfig/dockapp.pc
share/doc/libdockapp/
share/doc/libdockapp/COPYING
+share/doc/libdockapp/README
+share/doc/libdockapp/basic/
+share/doc/libdockapp/basic/Makefile
+share/doc/libdockapp/basic/README
+share/doc/libdockapp/basic/ball_red.xpm
+share/doc/libdockapp/basic/basic.c
+share/doc/libdockapp/rectangles/
+share/doc/libdockapp/rectangles/Makefile
+share/doc/libdockapp/rectangles/rectangles.c
+share/fonts/
+@fontdir share/fonts/libdockapps/
+share/fonts/libdockapps/fonts.dir
+share/fonts/libdockapps/luxel-ascii-06x09.pcf.gz
+share/fonts/libdockapps/seg7-ascii-05x07.pcf.gz
Here is an update for libdockapp to 0.7.3. This is needed to update
some dockapps (i've already a diff for x11/wmitime) concerned by
-fno-common and that now uses this lib.
The major highlight is that the include file for <dockapp.h> changed. All
consumers are impacted and no updates for them in this regard has been
provided, so there will be follow up diffs.
Port-wise:
- symbols have been removed, bump major
- install fonts (a first for me, i took example from comms/x3270)
- move HOMEPAGE and MASTER_SITES to dockapps.net
This has been tested on amd64 and macppc successfully.
Comments and feedback are welcome,
Charlène.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/libdockapp/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- Makefile 12 Jul 2019 20:44:37 -0000 1.25
+++ Makefile 1 Feb 2021 01:44:40 -0000
@@ -2,21 +2,24 @@
COMMENT= dockapp-making standard library for Window Maker
-DISTNAME= libdockapp-0.4.0
-REVISION= 5
-SHARED_LIBS= dockapp 1.0 # .1.0
+DISTNAME= libdockapp-0.7.3
+SHARED_LIBS= dockapp 2.0 # .1.0
CATEGORIES= devel
+HOMEPAGE= https://www.dockapps.net/libdockapp/
+
# BSD
PERMIT_PACKAGE= Yes
-WANTLIB= X11 Xau Xdmcp Xext Xpm xcb
-MASTER_SITES= ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
+WANTLIB= X11 Xext Xpm xcb
+
+MASTER_SITES= https://www.dockapps.net/download/
NO_TEST= Yes
SEPARATE_BUILD= Yes
CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --enable-static
+CONFIGURE_ARGS+= --enable-static \
+ --with-fontdir=${PREFIX}/share/fonts/libdockapps
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libdockapp
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/libdockapp/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo 18 Jan 2015 03:13:15 -0000 1.4
+++ distinfo 1 Feb 2021 01:44:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (libdockapp-0.4.0.tar.gz) = /X7Prvw8z2VCyKhmo3C85NUey4AozYmLCCNpgfiwzGU=
-SIZE (libdockapp-0.4.0.tar.gz) = 108566
+SHA256 (libdockapp-0.7.3.tar.gz) = FtmS9oTfzbGeNoKCLUlfRzYV+6bp4vp6EGMHvHZ7OJw=
+SIZE (libdockapp-0.7.3.tar.gz) = 387507
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/devel/libdockapp/patches/patch-src_Makefile_in,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 2 Jan 2006 18:15:53 -0000 1.1
+++ patches/patch-src_Makefile_in 1 Feb 2021 01:44:40 -0000
@@ -1,12 +1,13 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2006/01/02 18:15:53 bernd Exp $
---- src/Makefile.in.orig Mon Jan 2 18:19:24 2006
-+++ src/Makefile.in Mon Jan 2 18:19:44 2006
-@@ -79,7 +79,7 @@ AUTOMAKE_OPTIONS = no-dependencies
-
+Index: src/Makefile.in
+--- src/Makefile.in.orig
++++ src/Makefile.in
+@@ -335,7 +335,7 @@ xpm_CFLAGS = @xpm_CFLAGS@
+ xpm_LIBS = @xpm_LIBS@
+ AUTOMAKE_OPTIONS = no-dependencies
lib_LTLIBRARIES = libdockapp.la
-
--libdockapp_la_LDFLAGS = -version-info 1:0:0 @X_LIBS@
-+libdockapp_la_LDFLAGS = $(LIBdockapp_LTVERSION) @X_LIBS@
-
- include_HEADERS = dockapp.h
-
+-libdockapp_la_LDFLAGS = -version-info 3:1:0
++libdockapp_la_LDFLAGS = $(LIBdockapp_LTVERSION)
+ otherincludedir = $(includedir)/libdockapp
+ otherinclude_HEADERS = dockapp.h \
+ wmgeneral.h \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/libdockapp/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 16 Mar 2015 18:07:41 -0000 1.3
+++ pkg/PLIST 1 Feb 2021 01:44:40 -0000
@@ -1,7 +1,26 @@
@comment $OpenBSD: PLIST,v 1.3 2015/03/16 18:07:41 naddy Exp $
-include/dockapp.h
-lib/libdockapp.a
+include/libdockapp/
+include/libdockapp/dockapp.h
+include/libdockapp/list.h
+include/libdockapp/misc.h
+include/libdockapp/wmgeneral.h
+@static-lib lib/libdockapp.a
lib/libdockapp.la
@lib lib/libdockapp.so.${LIBdockapp_VERSION}
+lib/pkgconfig/dockapp.pc
share/doc/libdockapp/
share/doc/libdockapp/COPYING
+share/doc/libdockapp/README
+share/doc/libdockapp/basic/
+share/doc/libdockapp/basic/Makefile
+share/doc/libdockapp/basic/README
+share/doc/libdockapp/basic/ball_red.xpm
+share/doc/libdockapp/basic/basic.c
+share/doc/libdockapp/rectangles/
+share/doc/libdockapp/rectangles/Makefile
+share/doc/libdockapp/rectangles/rectangles.c
+share/fonts/
+@fontdir share/fonts/libdockapps/
+share/fonts/libdockapps/fonts.dir
+share/fonts/libdockapps/luxel-ascii-06x09.pcf.gz
+share/fonts/libdockapps/seg7-ascii-05x07.pcf.gz
[NEW] devel/py-importlib_resources
Information for inst:py3-importlib_resources-5.1.0
Comment:
backport of the importlib.resources module
Required by:
qutebrowser-2.0.0
Description:
importlib_resources is a backport of Python standard library importlib.resources
module for older Pythons. Users of Python 3.9 and beyond should use the standard
library module, since for these versions, importlib_resources just delegates to
that module.
Maintainer: Dimitri Karamazov <deserter666@danwin1210.me>
WWW: https://pypi.python.org/pypi/importlib_resources
Any comments/OK's?
Comment:
backport of the importlib.resources module
Required by:
qutebrowser-2.0.0
Description:
importlib_resources is a backport of Python standard library importlib.resources
module for older Pythons. Users of Python 3.9 and beyond should use the standard
library module, since for these versions, importlib_resources just delegates to
that module.
Maintainer: Dimitri Karamazov <deserter666@danwin1210.me>
WWW: https://pypi.python.org/pypi/importlib_resources
Any comments/OK's?
Re: [UPDATE] devel/py-setuptools_scm -> 3.4.1
On Mon, Feb 01, 2021 at 03:13:32AM +0000, Dimitri Karamazov wrote:
> On Sun, Jan 31, 2021 at 09:04:49PM +0000, Stuart Henderson wrote:
> > It really would be preferable to avoid bringing back a py2 port that was
> > already removed.
> >
> > py-toml is only needed for ports that use setuptools_scm[toml] and not
> > just standard setuptools_scm ports isn't it?
> >
> Yes, and for success in tests
Great, thanks both of you.
> > Can't you skip the py-toml dep in setuptools_scm and just add it in
> > py-importlib_resources (which presumably will be py3-only since
> > qutebrowser is py3-only)?
> >
> I can do that.
>
> > All current ports depending on setuptools_scm build/package OK with 3.4.1
> > without py-toml/py3-toml.
> Good to know, I tested a few myself.
OK kn
> On Sun, Jan 31, 2021 at 09:04:49PM +0000, Stuart Henderson wrote:
> > It really would be preferable to avoid bringing back a py2 port that was
> > already removed.
> >
> > py-toml is only needed for ports that use setuptools_scm[toml] and not
> > just standard setuptools_scm ports isn't it?
> >
> Yes, and for success in tests
Great, thanks both of you.
> > Can't you skip the py-toml dep in setuptools_scm and just add it in
> > py-importlib_resources (which presumably will be py3-only since
> > qutebrowser is py3-only)?
> >
> I can do that.
>
> > All current ports depending on setuptools_scm build/package OK with 3.4.1
> > without py-toml/py3-toml.
> Good to know, I tested a few myself.
OK kn
Re: [UPDATE] devel/py-setuptools_scm -> 3.4.1
On Sun, Jan 31, 2021 at 09:04:49PM +0000, Stuart Henderson wrote:
> On 2021/01/31 13:09, Dimitri Karamazov wrote:
> > Update py-setuptools_scm to 3.4.1
> > py-toml update is required before this.
> > Required for py-importlib_resources port
> > to update qutebrowser.
>
> It really would be preferable to avoid bringing back a py2 port that was
> already removed.
>
> py-toml is only needed for ports that use setuptools_scm[toml] and not
> just standard setuptools_scm ports isn't it?
>
Yes, and for success in tests
>
> Can't you skip the py-toml dep in setuptools_scm and just add it in
> py-importlib_resources (which presumably will be py3-only since
> qutebrowser is py3-only)?
>
I can do that.
> All current ports depending on setuptools_scm build/package OK with 3.4.1
> without py-toml/py3-toml.
Good to know, I tested a few myself.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-setuptools_scm/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile 3 Jul 2020 21:12:49 -0000 1.15
+++ Makefile 1 Feb 2021 03:02:37 -0000
@@ -2,11 +2,10 @@
COMMENT = plugin to manage your versions by scm tags
-MODPY_EGG_VERSION = 3.3.3
+MODPY_EGG_VERSION = 3.4.1
DISTNAME = setuptools_scm-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = devel
-REVISION = 0
# MIT
PERMIT_PACKAGE = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-setuptools_scm/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 31 Jul 2019 13:12:27 -0000 1.9
+++ distinfo 1 Feb 2021 03:02:37 -0000
@@ -1,2 +1,2 @@
-SHA256 (setuptools_scm-3.3.3.tar.gz) = vSXh+15NYD3PSQ8f3kD7TFlbNXeVZ0w+XLf2IXqznqU=
-SIZE (setuptools_scm-3.3.3.tar.gz) = 36903
+SHA256 (setuptools_scm-3.4.1.tar.gz) = aqpvvrgdCJnW9HOw1578zdmijzMZL0edXSvZK463UJA=
+SIZE (setuptools_scm-3.4.1.tar.gz) = 45371
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-setuptools_scm/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 31 Jul 2019 13:12:27 -0000 1.3
+++ pkg/PLIST 1 Feb 2021 03:02:37 -0000
@@ -5,6 +5,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/setuptools_scm-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/setuptools_scm-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/setuptools_scm-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/setuptools_scm-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/setuptools_scm-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/setuptools_scm-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/zip-safe
lib/python${MODPY_VERSION}/site-packages/setuptools_scm/__init__.py
> On 2021/01/31 13:09, Dimitri Karamazov wrote:
> > Update py-setuptools_scm to 3.4.1
> > py-toml update is required before this.
> > Required for py-importlib_resources port
> > to update qutebrowser.
>
> It really would be preferable to avoid bringing back a py2 port that was
> already removed.
>
> py-toml is only needed for ports that use setuptools_scm[toml] and not
> just standard setuptools_scm ports isn't it?
>
Yes, and for success in tests
>
> Can't you skip the py-toml dep in setuptools_scm and just add it in
> py-importlib_resources (which presumably will be py3-only since
> qutebrowser is py3-only)?
>
I can do that.
> All current ports depending on setuptools_scm build/package OK with 3.4.1
> without py-toml/py3-toml.
Good to know, I tested a few myself.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-setuptools_scm/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile 3 Jul 2020 21:12:49 -0000 1.15
+++ Makefile 1 Feb 2021 03:02:37 -0000
@@ -2,11 +2,10 @@
COMMENT = plugin to manage your versions by scm tags
-MODPY_EGG_VERSION = 3.3.3
+MODPY_EGG_VERSION = 3.4.1
DISTNAME = setuptools_scm-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = devel
-REVISION = 0
# MIT
PERMIT_PACKAGE = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-setuptools_scm/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 31 Jul 2019 13:12:27 -0000 1.9
+++ distinfo 1 Feb 2021 03:02:37 -0000
@@ -1,2 +1,2 @@
-SHA256 (setuptools_scm-3.3.3.tar.gz) = vSXh+15NYD3PSQ8f3kD7TFlbNXeVZ0w+XLf2IXqznqU=
-SIZE (setuptools_scm-3.3.3.tar.gz) = 36903
+SHA256 (setuptools_scm-3.4.1.tar.gz) = aqpvvrgdCJnW9HOw1578zdmijzMZL0edXSvZK463UJA=
+SIZE (setuptools_scm-3.4.1.tar.gz) = 45371
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-setuptools_scm/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 31 Jul 2019 13:12:27 -0000 1.3
+++ pkg/PLIST 1 Feb 2021 03:02:37 -0000
@@ -5,6 +5,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/setuptools_scm-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/setuptools_scm-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/setuptools_scm-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/setuptools_scm-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/setuptools_scm-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/setuptools_scm-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/zip-safe
lib/python${MODPY_VERSION}/site-packages/setuptools_scm/__init__.py
Re: Use -fcommon with or remove security/siphon
On Mon, 1 Feb 2021 02:34:53 +0100
Klemens Nanni <kn@openbsd.org> wrote:
> Upstream still ships the tarball, that's it,
> "primary distsite and homepage have gone away" in 2002 as per CVS log.
>
> The only TCP port I've been able to detect (after producing traffing
> on a variety of them) is SSH -- and that only worked after enabling
> IPv4.
>
> Siphon does not seem to support/detect IPv6 at all and it's OS
> fingerprints are extremely old; with Gentoo we're the only ones still
> packaging it according to Repology.
>
> I tend to simply remove it (ports tree house keeping), but here's a
> diff to "fix" the port in case anyone actually finds it useful.
>
> OK either for removal or the diff?
OK cwen@ to remove.
> ---
> Set "-fcommon" for twelve duplicate symbols.
>
> Regen patch and add "@bin" PLIST marker while here.
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/security/siphon/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- Makefile 12 Jul 2019 20:49:36 -0000 1.16
> +++ Makefile 1 Feb 2021 01:13:10 -0000
> @@ -4,7 +4,7 @@ COMMENT= passive network mapping tool
>
> DISTNAME= siphon-v.666
> PKGNAME= siphon-0.666
> -REVISION= 0
> +REVISION= 1
> CATEGORIES= security net
>
> # BSD-style
> @@ -22,6 +22,9 @@ MAKE_FLAGS= CC="${CC}" \
> MAKE_ENV= SYSCONFDIR="${SYSCONFDIR}"
>
> NO_TEST= Yes
> +
> +# twelve duplicate symbols
> +CFLAGS += -fcommon
>
> do-install:
> ${INSTALL_PROGRAM} ${WRKSRC}/siphon ${PREFIX}/bin
> Index: patches/patch-log_c
> ===================================================================
> RCS file: /cvs/ports/security/siphon/patches/patch-log_c,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-log_c
> --- patches/patch-log_c 16 Jun 2001 14:56:26 -0000
> 1.1.1.1 +++ patches/patch-log_c 1 Feb 2021 01:12:32 -0000
> @@ -1,7 +1,8 @@
> $OpenBSD: patch-log_c,v 1.1.1.1 2001/06/16 14:56:26 lebel Exp $
> ---- log.c.orig Fri Jun 15 18:36:47 2001
> -+++ log.c Fri Jun 15 18:36:55 2001
> -@@ -137,7 +137,7 @@ char *oslookup(int window, int ttl, int
> +Index: log.c
> +--- log.c.orig
> ++++ log.c
> +@@ -137,7 +137,7 @@ char *oslookup(int window, int ttl, int df)
> FILE *osprints;
> static char line[80], *oswin, *osttl, *osdf, *os, hexed[10];
> static int check = 0;
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/security/siphon/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST
> --- pkg/PLIST 24 Sep 2004 09:37:39 -0000 1.4
> +++ pkg/PLIST 1 Feb 2021 01:13:24 -0000
> @@ -1,5 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.4 2004/09/24 09:37:39 espie Exp $
> -bin/siphon
> +@bin bin/siphon
> share/doc/siphon/
> share/doc/siphon/LICENSE
> share/doc/siphon/README
>
Klemens Nanni <kn@openbsd.org> wrote:
> Upstream still ships the tarball, that's it,
> "primary distsite and homepage have gone away" in 2002 as per CVS log.
>
> The only TCP port I've been able to detect (after producing traffing
> on a variety of them) is SSH -- and that only worked after enabling
> IPv4.
>
> Siphon does not seem to support/detect IPv6 at all and it's OS
> fingerprints are extremely old; with Gentoo we're the only ones still
> packaging it according to Repology.
>
> I tend to simply remove it (ports tree house keeping), but here's a
> diff to "fix" the port in case anyone actually finds it useful.
>
> OK either for removal or the diff?
OK cwen@ to remove.
> ---
> Set "-fcommon" for twelve duplicate symbols.
>
> Regen patch and add "@bin" PLIST marker while here.
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/security/siphon/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- Makefile 12 Jul 2019 20:49:36 -0000 1.16
> +++ Makefile 1 Feb 2021 01:13:10 -0000
> @@ -4,7 +4,7 @@ COMMENT= passive network mapping tool
>
> DISTNAME= siphon-v.666
> PKGNAME= siphon-0.666
> -REVISION= 0
> +REVISION= 1
> CATEGORIES= security net
>
> # BSD-style
> @@ -22,6 +22,9 @@ MAKE_FLAGS= CC="${CC}" \
> MAKE_ENV= SYSCONFDIR="${SYSCONFDIR}"
>
> NO_TEST= Yes
> +
> +# twelve duplicate symbols
> +CFLAGS += -fcommon
>
> do-install:
> ${INSTALL_PROGRAM} ${WRKSRC}/siphon ${PREFIX}/bin
> Index: patches/patch-log_c
> ===================================================================
> RCS file: /cvs/ports/security/siphon/patches/patch-log_c,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-log_c
> --- patches/patch-log_c 16 Jun 2001 14:56:26 -0000
> 1.1.1.1 +++ patches/patch-log_c 1 Feb 2021 01:12:32 -0000
> @@ -1,7 +1,8 @@
> $OpenBSD: patch-log_c,v 1.1.1.1 2001/06/16 14:56:26 lebel Exp $
> ---- log.c.orig Fri Jun 15 18:36:47 2001
> -+++ log.c Fri Jun 15 18:36:55 2001
> -@@ -137,7 +137,7 @@ char *oslookup(int window, int ttl, int
> +Index: log.c
> +--- log.c.orig
> ++++ log.c
> +@@ -137,7 +137,7 @@ char *oslookup(int window, int ttl, int df)
> FILE *osprints;
> static char line[80], *oswin, *osttl, *osdf, *os, hexed[10];
> static int check = 0;
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/security/siphon/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST
> --- pkg/PLIST 24 Sep 2004 09:37:39 -0000 1.4
> +++ pkg/PLIST 1 Feb 2021 01:13:24 -0000
> @@ -1,5 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.4 2004/09/24 09:37:39 espie Exp $
> -bin/siphon
> +@bin bin/siphon
> share/doc/siphon/
> share/doc/siphon/LICENSE
> share/doc/siphon/README
>
Use -fcommon with or remove security/siphon
Upstream still ships the tarball, that's it,
"primary distsite and homepage have gone away" in 2002 as per CVS log.
The only TCP port I've been able to detect (after producing traffing on
a variety of them) is SSH -- and that only worked after enabling IPv4.
Siphon does not seem to support/detect IPv6 at all and it's OS
fingerprints are extremely old; with Gentoo we're the only ones still
packaging it according to Repology.
I tend to simply remove it (ports tree house keeping), but here's a diff
to "fix" the port in case anyone actually finds it useful.
OK either for removal or the diff?
---
Set "-fcommon" for twelve duplicate symbols.
Regen patch and add "@bin" PLIST marker while here.
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/siphon/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile 12 Jul 2019 20:49:36 -0000 1.16
+++ Makefile 1 Feb 2021 01:13:10 -0000
@@ -4,7 +4,7 @@ COMMENT= passive network mapping tool
DISTNAME= siphon-v.666
PKGNAME= siphon-0.666
-REVISION= 0
+REVISION= 1
CATEGORIES= security net
# BSD-style
@@ -22,6 +22,9 @@ MAKE_FLAGS= CC="${CC}" \
MAKE_ENV= SYSCONFDIR="${SYSCONFDIR}"
NO_TEST= Yes
+
+# twelve duplicate symbols
+CFLAGS += -fcommon
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/siphon ${PREFIX}/bin
Index: patches/patch-log_c
===================================================================
RCS file: /cvs/ports/security/siphon/patches/patch-log_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-log_c
--- patches/patch-log_c 16 Jun 2001 14:56:26 -0000 1.1.1.1
+++ patches/patch-log_c 1 Feb 2021 01:12:32 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-log_c,v 1.1.1.1 2001/06/16 14:56:26 lebel Exp $
---- log.c.orig Fri Jun 15 18:36:47 2001
-+++ log.c Fri Jun 15 18:36:55 2001
-@@ -137,7 +137,7 @@ char *oslookup(int window, int ttl, int
+Index: log.c
+--- log.c.orig
++++ log.c
+@@ -137,7 +137,7 @@ char *oslookup(int window, int ttl, int df)
FILE *osprints;
static char line[80], *oswin, *osttl, *osdf, *os, hexed[10];
static int check = 0;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/siphon/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 24 Sep 2004 09:37:39 -0000 1.4
+++ pkg/PLIST 1 Feb 2021 01:13:24 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.4 2004/09/24 09:37:39 espie Exp $
-bin/siphon
+@bin bin/siphon
share/doc/siphon/
share/doc/siphon/LICENSE
share/doc/siphon/README
"primary distsite and homepage have gone away" in 2002 as per CVS log.
The only TCP port I've been able to detect (after producing traffing on
a variety of them) is SSH -- and that only worked after enabling IPv4.
Siphon does not seem to support/detect IPv6 at all and it's OS
fingerprints are extremely old; with Gentoo we're the only ones still
packaging it according to Repology.
I tend to simply remove it (ports tree house keeping), but here's a diff
to "fix" the port in case anyone actually finds it useful.
OK either for removal or the diff?
---
Set "-fcommon" for twelve duplicate symbols.
Regen patch and add "@bin" PLIST marker while here.
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/siphon/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile 12 Jul 2019 20:49:36 -0000 1.16
+++ Makefile 1 Feb 2021 01:13:10 -0000
@@ -4,7 +4,7 @@ COMMENT= passive network mapping tool
DISTNAME= siphon-v.666
PKGNAME= siphon-0.666
-REVISION= 0
+REVISION= 1
CATEGORIES= security net
# BSD-style
@@ -22,6 +22,9 @@ MAKE_FLAGS= CC="${CC}" \
MAKE_ENV= SYSCONFDIR="${SYSCONFDIR}"
NO_TEST= Yes
+
+# twelve duplicate symbols
+CFLAGS += -fcommon
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/siphon ${PREFIX}/bin
Index: patches/patch-log_c
===================================================================
RCS file: /cvs/ports/security/siphon/patches/patch-log_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-log_c
--- patches/patch-log_c 16 Jun 2001 14:56:26 -0000 1.1.1.1
+++ patches/patch-log_c 1 Feb 2021 01:12:32 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-log_c,v 1.1.1.1 2001/06/16 14:56:26 lebel Exp $
---- log.c.orig Fri Jun 15 18:36:47 2001
-+++ log.c Fri Jun 15 18:36:55 2001
-@@ -137,7 +137,7 @@ char *oslookup(int window, int ttl, int
+Index: log.c
+--- log.c.orig
++++ log.c
+@@ -137,7 +137,7 @@ char *oslookup(int window, int ttl, int df)
FILE *osprints;
static char line[80], *oswin, *osttl, *osdf, *os, hexed[10];
static int check = 0;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/siphon/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 24 Sep 2004 09:37:39 -0000 1.4
+++ pkg/PLIST 1 Feb 2021 01:13:24 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.4 2004/09/24 09:37:39 espie Exp $
-bin/siphon
+@bin bin/siphon
share/doc/siphon/
share/doc/siphon/LICENSE
share/doc/siphon/README
Re: misc/deco: -fno-common fix
On Sun, Jan 31, 2021 at 10:40:16PM +0100, Charlene Wendling wrote:
> This fix has been taken once again from FreeBSD [0]. This builds and
> works fine on amd64.
OK kn
> This fix has been taken once again from FreeBSD [0]. This builds and
> works fine on amd64.
OK kn
Re: Remove net/lxnb
On Mon, Feb 01, 2021 at 01:29:46AM +0100, Klemens Nanni wrote:
> That's a NetBus 1.6 client... upstream's dead as in NXDOMAIN, we seem to
> be the only folks still packaging it.
>
> Can we remove this port that hasn't changed in twenty years and
> basically only exists to screw around with old old Windows boxes which
> actually have the server running?
>
> Fails with `-fno-common'.
> OK?
>
it is security/lxnb not net/lxnb
ok jsg@ to remove
> That's a NetBus 1.6 client... upstream's dead as in NXDOMAIN, we seem to
> be the only folks still packaging it.
>
> Can we remove this port that hasn't changed in twenty years and
> basically only exists to screw around with old old Windows boxes which
> actually have the server running?
>
> Fails with `-fno-common'.
> OK?
>
it is security/lxnb not net/lxnb
ok jsg@ to remove
Re: Add MODOCAML_RUNDEP to ocaml.port.mk
On Sat, Jan 23 2021, Bjorn Ketelaars <bket@openbsd.org> wrote:
> On Sat 23/01/2021 18:22, Jeremie Courreges-Anglas wrote:
>> On Sat, Jan 23 2021, Stuart Henderson <stu@spacehopper.org> wrote:
>> > On 2021/01/23 13:33, Jeremie Courreges-Anglas wrote:
>> >> On Fri, Jan 22 2021, Bjorn Ketelaars <bket@openbsd.org> wrote:
>> >> >
>> >> > Don't think so. If we are building on a non-native arch we want to make
>> >> > sure that lang/ocaml is added as BDEP and RDEP, independent how
>> >> > MODOCAML_RUNDEP or MODOCAML_BUILDDEP are used in a Makefile.
>> >> > [...]
>> >>
>> >> An OCaml port probably needs lang/ocaml at build time on *all archs*,
>> >> I don't see a reason to introduce a difference between native and
>> >> non-native archs *at build time*, nor do I see a good reason to ignore
>> >> what a port specifies.
>> >
>> > Agreed, variable build dependencies per-arch sounds like it's asking for
>> > trouble.
>> >
>> >> | # Assume that we want to automatically add ocaml to BUILD_DEPENDS
>> >> | -# and RUN_DEPENDS unless the port specifically requests not to.
>> >> | +# unless the port specifically requests not to.
>> >> | MODOCAML_BUILDDEP?= Yes
>> >> | +# Same for RUN_DEPENDS, but MODOCAML_RUN_DEPENDS can take three values:
>> >> | +# Yes, No or if-not-native (translates to Yes if native-code is unsupported)
>> >> | MODOCAML_RUNDEP?= Yes
>> >> |
>> >> | .if ${NO_BUILD:L} == no && ${MODOCAML_BUILDDEP:L} == yes
>> >> | BUILD_DEPENDS+= ${MODOCAML_BUILD_DEPENDS}
>> >> | .endif
>> >
>> > I'm not totally objecting to MODOCAML_BUILDDEP=no but I'm not sure
>> > there's a use for it. I'd be tempted to leave it out for now. If we
>> > do that and someone does comes up with a port that wants to disable
>> > build dep's later, they could just change ocaml.port.mk at the same
>> > time, no need to hack around it.
>> >
>> > Apart from anything else port-modules(5) is already hard to read and
>> > I'd be happy to avoid adding more :)
>> >
>> > I think MODGO_BUILDDEP can be removed from go.port.mk too, nothing
>> > uses it and I don't really see how it could..
>> >
>> > It's used quite a lot for python, and a bit for PHP though possibly
>> > not enough - this discussion made me wonder if I should change that to
>> > No by default for PHP. But those are quite different to the case of
>> > go or ocaml.
>>
>> By default I'd prefer to have all modules behave similarly, but I can
>> understand how it doesn't make sense in some situations.
>>
>> >> | +.if ${MODOCAML_RUNDEP:L} == if-not-native && ${MODOCAML_NATIVE} == No
>> >> | +MODOCAML_RUNDEP = Yes
>> >> | +.endif
>> >> | .if ${MODOCAML_RUNDEP:L} == yes
>> >> | RUN_DEPENDS+= ${MODOCAML_RUN_DEPENDS}
>> >> | .endif
>> >>
>> >> This implements the three choice logic suggested by sthen, doesn't
>> >> affect current defaults, and only cares about the runtime dep.
>> >> I hope that "if-not-native" is an improvement over "nonative".
>> >
>> > love the "if-not-native" wording, that's perfect :)
>>
>> Great. Here's the latest, simpler diff. No more MODOCAML_BUILDDEP, no
>> more MODOCAML_*_DEPENDS either (after all, their content was obvious).
>>
>> Bjorn, still ok? Stuart, others?
>
> Yes, still OK.
It's in. Here's a documentation proposal, trying to make information
unambiguous wrt context. Feedback, oks?
Index: port-modules.5
===================================================================
RCS file: /d/cvs/src/share/man/man5/port-modules.5,v
retrieving revision 1.251
diff -u -p -p -u -r1.251 port-modules.5
--- port-modules.5 25 Jan 2021 14:02:18 -0000 1.251
+++ port-modules.5 1 Feb 2021 00:37:50 -0000
@@ -1309,7 +1309,13 @@ Appends to
.Ev BUILD_DEPENDS
and
.Ev MAKE_ENV .
-This selects a %%native%% plist fragment and
+Appends to
+.Ev RUN_DEPENDS
+unless
+.Ev MODOCAML_RUNDEP
+is set to No, or set to if-not-native and native compilation
+is supported on this architecture.
+Including this module selects a %%native%% plist fragment and
.Ev ocaml_native
property depending on whether the architecture supports native
compilation.
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
> On Sat 23/01/2021 18:22, Jeremie Courreges-Anglas wrote:
>> On Sat, Jan 23 2021, Stuart Henderson <stu@spacehopper.org> wrote:
>> > On 2021/01/23 13:33, Jeremie Courreges-Anglas wrote:
>> >> On Fri, Jan 22 2021, Bjorn Ketelaars <bket@openbsd.org> wrote:
>> >> >
>> >> > Don't think so. If we are building on a non-native arch we want to make
>> >> > sure that lang/ocaml is added as BDEP and RDEP, independent how
>> >> > MODOCAML_RUNDEP or MODOCAML_BUILDDEP are used in a Makefile.
>> >> > [...]
>> >>
>> >> An OCaml port probably needs lang/ocaml at build time on *all archs*,
>> >> I don't see a reason to introduce a difference between native and
>> >> non-native archs *at build time*, nor do I see a good reason to ignore
>> >> what a port specifies.
>> >
>> > Agreed, variable build dependencies per-arch sounds like it's asking for
>> > trouble.
>> >
>> >> | # Assume that we want to automatically add ocaml to BUILD_DEPENDS
>> >> | -# and RUN_DEPENDS unless the port specifically requests not to.
>> >> | +# unless the port specifically requests not to.
>> >> | MODOCAML_BUILDDEP?= Yes
>> >> | +# Same for RUN_DEPENDS, but MODOCAML_RUN_DEPENDS can take three values:
>> >> | +# Yes, No or if-not-native (translates to Yes if native-code is unsupported)
>> >> | MODOCAML_RUNDEP?= Yes
>> >> |
>> >> | .if ${NO_BUILD:L} == no && ${MODOCAML_BUILDDEP:L} == yes
>> >> | BUILD_DEPENDS+= ${MODOCAML_BUILD_DEPENDS}
>> >> | .endif
>> >
>> > I'm not totally objecting to MODOCAML_BUILDDEP=no but I'm not sure
>> > there's a use for it. I'd be tempted to leave it out for now. If we
>> > do that and someone does comes up with a port that wants to disable
>> > build dep's later, they could just change ocaml.port.mk at the same
>> > time, no need to hack around it.
>> >
>> > Apart from anything else port-modules(5) is already hard to read and
>> > I'd be happy to avoid adding more :)
>> >
>> > I think MODGO_BUILDDEP can be removed from go.port.mk too, nothing
>> > uses it and I don't really see how it could..
>> >
>> > It's used quite a lot for python, and a bit for PHP though possibly
>> > not enough - this discussion made me wonder if I should change that to
>> > No by default for PHP. But those are quite different to the case of
>> > go or ocaml.
>>
>> By default I'd prefer to have all modules behave similarly, but I can
>> understand how it doesn't make sense in some situations.
>>
>> >> | +.if ${MODOCAML_RUNDEP:L} == if-not-native && ${MODOCAML_NATIVE} == No
>> >> | +MODOCAML_RUNDEP = Yes
>> >> | +.endif
>> >> | .if ${MODOCAML_RUNDEP:L} == yes
>> >> | RUN_DEPENDS+= ${MODOCAML_RUN_DEPENDS}
>> >> | .endif
>> >>
>> >> This implements the three choice logic suggested by sthen, doesn't
>> >> affect current defaults, and only cares about the runtime dep.
>> >> I hope that "if-not-native" is an improvement over "nonative".
>> >
>> > love the "if-not-native" wording, that's perfect :)
>>
>> Great. Here's the latest, simpler diff. No more MODOCAML_BUILDDEP, no
>> more MODOCAML_*_DEPENDS either (after all, their content was obvious).
>>
>> Bjorn, still ok? Stuart, others?
>
> Yes, still OK.
It's in. Here's a documentation proposal, trying to make information
unambiguous wrt context. Feedback, oks?
Index: port-modules.5
===================================================================
RCS file: /d/cvs/src/share/man/man5/port-modules.5,v
retrieving revision 1.251
diff -u -p -p -u -r1.251 port-modules.5
--- port-modules.5 25 Jan 2021 14:02:18 -0000 1.251
+++ port-modules.5 1 Feb 2021 00:37:50 -0000
@@ -1309,7 +1309,13 @@ Appends to
.Ev BUILD_DEPENDS
and
.Ev MAKE_ENV .
-This selects a %%native%% plist fragment and
+Appends to
+.Ev RUN_DEPENDS
+unless
+.Ev MODOCAML_RUNDEP
+is set to No, or set to if-not-native and native compilation
+is supported on this architecture.
+Including this module selects a %%native%% plist fragment and
.Ev ocaml_native
property depending on whether the architecture supports native
compilation.
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Remove net/lxnb
That's a NetBus 1.6 client... upstream's dead as in NXDOMAIN, we seem to
be the only folks still packaging it.
Can we remove this port that hasn't changed in twenty years and
basically only exists to screw around with old old Windows boxes which
actually have the server running?
Fails with `-fno-common'.
OK?
be the only folks still packaging it.
Can we remove this port that hasn't changed in twenty years and
basically only exists to screw around with old old Windows boxes which
actually have the server running?
Fails with `-fno-common'.
OK?
Update net/echoping [WIP]
Came here for "-fno-common".
Not sure why we're patching things in our 5.2.0 version from 2004 when
there was 6.0.0 released in 2007.
6.0.1 came out a month after and marked the end of echoping.
Upstream moved code to https://framagit.org and confusingly enough,
https://framagit.org/bortzmeyer/echoping/-/blob/master/SRC/ChangeLog
shows 6.0.1 as last release with 6.1 marked as "NOT YET", even though
https://framagit.org/bortzmeyer/echoping/-/blob/master/README.md says
echoping is no longer maintained. This repository is for historical interest only.
To add to that, https://framagit.org/bortzmeyer/echoping/-/tags shows
a 6.0.2 tag (not listed in ChangeLog).
FreeBSD now simply fetches latest HEAD and packages it as 6.0.2;
we can do the same or use the 6.0.2 tag from 13 years ago, which is what
I did below.
From there on, I fail to satisfy the autoconf thing as it always fails
with
Running autoconf-2.54 in /usr/ports/pobj/echoping-6.0.2/echoping-RELEASE_6_0_2/SRC
configure.ac:6: error: possibly undefined macro: AM_INIT_AUTOMAKE
If this token and others are legitimate, please use m4_pattern_allow.
See the Autoconf documentation.
configure.ac:7: error: possibly undefined macro: AM_CONFIG_HEADER
configure:1935: error: possibly undefined macro: AC_LIBTOOL_DLOPEN
configure:1936: error: possibly undefined macro: AC_PROG_LIBTOOL
Diff below is what I've got for the update; patches have been merged
upstream.
Does someone want to massage that diff in and keep echoping alive
(until upstream drops it completely)?
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/echoping/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile 17 Jul 2019 14:46:33 -0000 1.13
+++ Makefile 1 Feb 2021 00:02:43 -0000
@@ -2,12 +2,13 @@
COMMENT= test performance of a remote TCP service
-VERSION= 5.2.0
-REVISION= 3
-DISTNAME= echoping-${VERSION}
+VERSION= 6.0.2
+RELEASE= RELEASE_${VERSION:S/./_/g}
+DISTNAME= echoping-${RELEASE}
+PKGNAME= echoping-${VERSION}
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=echoping/}
+MASTER_SITES= https://framagit.org/bortzmeyer/echoping/-/archive/${RELEASE}/
HOMEPAGE= https://github.com/bortzmeyer/echoping
@@ -17,7 +18,8 @@ WANTLIB= c crypto m ssl
NO_TEST= Yes
-CONFIGURE_STYLE= gnu
+AUTOCONF_VERSION= 2.54
+CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS+= --enable-http \
--enable-icp \
--enable-smtp \
@@ -25,5 +27,14 @@ CONFIGURE_ARGS+= --enable-http \
--without-libidn \
--with-ssl=/usr
+WRKDIST= ${WRKDIR}/${DISTNAME}/SRC
+
+# from https://svnweb.freebsd.org/ports/head/net/echoping/Makefile?revision=544003&view=co
+pre-configure:
+ find ${WRKSRC} -name configure.ac -execdir sh -c '\
+ cat ${WRKSRC}/configure-common.ac > configure.ac.tmp && \
+ sed '/configure-common\.ac/d' configure.ac >> configure.ac.tmp && \
+ mv configure.ac.tmp configure.ac' \;
+ sed -i '/^echoping_LDADD =/s/$$/ -lm/' ${WRKSRC}/Makefile.am
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/echoping/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 18 Jan 2015 03:14:38 -0000 1.5
+++ distinfo 31 Jan 2021 23:19:35 -0000
@@ -1,2 +1,2 @@
-SHA256 (echoping-5.2.0.tar.gz) = t8lCifhgcW6P64pTRI1NOnwZcoQAdV28WE5zGQSsa78=
-SIZE (echoping-5.2.0.tar.gz) = 120911
+SHA256 (echoping-RELEASE_6_0_2.tar.gz) = LwOSnCcB01ywR4AMIm+aToN7EZT/ixLDCeJ/KZ9v7cA=
+SIZE (echoping-RELEASE_6_0_2.tar.gz) = 77792
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 28 Apr 2018 20:50:52 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-configure,v 1.1 2018/04/28 20:50:52 jca Exp $
-
-Index: configure
---- configure.orig
-+++ configure
-@@ -4432,9 +4432,8 @@ cat >>conftest.$ac_ext <<_ACEOF
- int
- main ()
- {
--pow(a,b)
-+return pow(a,b)
- ;
-- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
Index: patches/patch-util_c
===================================================================
RCS file: patches/patch-util_c
diff -N patches/patch-util_c
--- patches/patch-util_c 28 Apr 2018 20:33:55 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-util_c,v 1.1 2018/04/28 20:33:55 tb Exp $
-
-Index: util.c
---- util.c.orig
-+++ util.c
-@@ -13,7 +13,7 @@ random_string (unsigned length)
- {
-
- char *state = (char *) malloc (sizeof (char) * STATES);
-- char *result = (char *) malloc (length);
-+ char *result = (char *) malloc (length + 1);
- int i, number;
- unsigned seed = (unsigned) time ((time_t *) NULL);
-
Not sure why we're patching things in our 5.2.0 version from 2004 when
there was 6.0.0 released in 2007.
6.0.1 came out a month after and marked the end of echoping.
Upstream moved code to https://framagit.org and confusingly enough,
https://framagit.org/bortzmeyer/echoping/-/blob/master/SRC/ChangeLog
shows 6.0.1 as last release with 6.1 marked as "NOT YET", even though
https://framagit.org/bortzmeyer/echoping/-/blob/master/README.md says
echoping is no longer maintained. This repository is for historical interest only.
To add to that, https://framagit.org/bortzmeyer/echoping/-/tags shows
a 6.0.2 tag (not listed in ChangeLog).
FreeBSD now simply fetches latest HEAD and packages it as 6.0.2;
we can do the same or use the 6.0.2 tag from 13 years ago, which is what
I did below.
From there on, I fail to satisfy the autoconf thing as it always fails
with
Running autoconf-2.54 in /usr/ports/pobj/echoping-6.0.2/echoping-RELEASE_6_0_2/SRC
configure.ac:6: error: possibly undefined macro: AM_INIT_AUTOMAKE
If this token and others are legitimate, please use m4_pattern_allow.
See the Autoconf documentation.
configure.ac:7: error: possibly undefined macro: AM_CONFIG_HEADER
configure:1935: error: possibly undefined macro: AC_LIBTOOL_DLOPEN
configure:1936: error: possibly undefined macro: AC_PROG_LIBTOOL
Diff below is what I've got for the update; patches have been merged
upstream.
Does someone want to massage that diff in and keep echoping alive
(until upstream drops it completely)?
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/echoping/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile 17 Jul 2019 14:46:33 -0000 1.13
+++ Makefile 1 Feb 2021 00:02:43 -0000
@@ -2,12 +2,13 @@
COMMENT= test performance of a remote TCP service
-VERSION= 5.2.0
-REVISION= 3
-DISTNAME= echoping-${VERSION}
+VERSION= 6.0.2
+RELEASE= RELEASE_${VERSION:S/./_/g}
+DISTNAME= echoping-${RELEASE}
+PKGNAME= echoping-${VERSION}
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=echoping/}
+MASTER_SITES= https://framagit.org/bortzmeyer/echoping/-/archive/${RELEASE}/
HOMEPAGE= https://github.com/bortzmeyer/echoping
@@ -17,7 +18,8 @@ WANTLIB= c crypto m ssl
NO_TEST= Yes
-CONFIGURE_STYLE= gnu
+AUTOCONF_VERSION= 2.54
+CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS+= --enable-http \
--enable-icp \
--enable-smtp \
@@ -25,5 +27,14 @@ CONFIGURE_ARGS+= --enable-http \
--without-libidn \
--with-ssl=/usr
+WRKDIST= ${WRKDIR}/${DISTNAME}/SRC
+
+# from https://svnweb.freebsd.org/ports/head/net/echoping/Makefile?revision=544003&view=co
+pre-configure:
+ find ${WRKSRC} -name configure.ac -execdir sh -c '\
+ cat ${WRKSRC}/configure-common.ac > configure.ac.tmp && \
+ sed '/configure-common\.ac/d' configure.ac >> configure.ac.tmp && \
+ mv configure.ac.tmp configure.ac' \;
+ sed -i '/^echoping_LDADD =/s/$$/ -lm/' ${WRKSRC}/Makefile.am
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/echoping/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 18 Jan 2015 03:14:38 -0000 1.5
+++ distinfo 31 Jan 2021 23:19:35 -0000
@@ -1,2 +1,2 @@
-SHA256 (echoping-5.2.0.tar.gz) = t8lCifhgcW6P64pTRI1NOnwZcoQAdV28WE5zGQSsa78=
-SIZE (echoping-5.2.0.tar.gz) = 120911
+SHA256 (echoping-RELEASE_6_0_2.tar.gz) = LwOSnCcB01ywR4AMIm+aToN7EZT/ixLDCeJ/KZ9v7cA=
+SIZE (echoping-RELEASE_6_0_2.tar.gz) = 77792
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 28 Apr 2018 20:50:52 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-configure,v 1.1 2018/04/28 20:50:52 jca Exp $
-
-Index: configure
---- configure.orig
-+++ configure
-@@ -4432,9 +4432,8 @@ cat >>conftest.$ac_ext <<_ACEOF
- int
- main ()
- {
--pow(a,b)
-+return pow(a,b)
- ;
-- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
Index: patches/patch-util_c
===================================================================
RCS file: patches/patch-util_c
diff -N patches/patch-util_c
--- patches/patch-util_c 28 Apr 2018 20:33:55 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-util_c,v 1.1 2018/04/28 20:33:55 tb Exp $
-
-Index: util.c
---- util.c.orig
-+++ util.c
-@@ -13,7 +13,7 @@ random_string (unsigned length)
- {
-
- char *state = (char *) malloc (sizeof (char) * STATES);
-- char *result = (char *) malloc (length);
-+ char *result = (char *) malloc (length + 1);
- int i, number;
- unsigned seed = (unsigned) time ((time_t *) NULL);
-
Re: [update] py-ldap0 and web2ldap
On Jan 31, 2021, at 4:31 PM, Stuart Henderson <stu@spacehopper.org> wrote:
>
> On 2021/01/30 20:51, Lucas Raab wrote:
>> Hello,
>>
>> Here are updates to databases/py-ldap0 and databases/web2ldap after the
>> py-dnspython split.
>>
>> web2ldap changelog: https://web2ldap.de/changes-1.5.html
>
> I tried looking, but web2ldap.de is down.
>
Curious, seems fine currently. In case it isn't later, here's the list
of changes since the last version in the tree
1.5.112 Release Date: 2020-11-26
HTML templates for object class msPwdResetObject were moved to
global templates directory for general use.
Fixed str/bytes regression when handling input form exceptions.
Added type hints for form exceptions.
Added attribute msPwdChangeNotification to HTML templates for object
class msPwdResetPolicy.
Fixed input field in plugin class Timespan.
1.5.108 Release Date: 2020-11-20
Added quick search field for Æ-DIR.
1.5.107 Release Date: 2020-11-19
Plugin class for OpenLDAP accesslog attribute reqMod now uses
validate method for LDAP syntax OctetString.
Installation check now also logs result of sys.getfilesystemencoding()
at DEBUG log level.
1.5.106 Release Date: 2020-11-04
New global configuration variable httpenv_override allows to override
all env vars of a request. For example this can be used to set
HTTPS=on to enforce setting the "secure" cookie flag. E.g. this is
highly recommended when running under control of gunicorn.
1.5.105 Release Date: 2020-11-02
Plugin class for dhcpStatements now ignores ValueError when trying
to display search link for DNS PTR RRs fails.
1.5.104 Release Date: 2020-10-29
Installing module dnspython is now optional again.
Fixed str/bytes regression when processing DNS SRV RRs.
1.5.103 Release Date: 2020-10-27
Added link when displaying attributes reqDN and reqAuthzID to search
other OpenLDAP accesslog entries with same values.
1.5.101 Release Date: 2020-10-16
Split env var value referenced by httpenv_remote_addr by comma and
use last value, e.g. in case IP addresses of cascaded proxies are
stored in HTTP_X_FORWARDED_FOR.
1.5.100 Release Date: 2020-09-24
Lazy initialization of session store and expiry thread. When running
under control of gunicorn this ensures that the initialization is
done after forking the master process which also fixes stopping the
expiry thread during shutdown.
1.5.98 Release Date: 2020-09-22
Re-factored removal of expired sessions as an incomplete work-around
when running under control of gunicorn.
1.5.97 Release Date: 2020-09-19
Improved HTML templates for TLS attributes in cn=config. New global
configuration variable httpenv_remote_addr especially used for
running under control of gunicorn behind a front-end web server.
1.5.96 Release Date: 2020-09-05
Fixed interop issue when running under control of gunicorn by not
closing input stream file object anymore (legacy code clean-up).
1.5.95 Release Date: 2020-08-26
Fixed deprecation warning for dnspython 2.0.0+.
1.5.94 Release Date: 2020-07-04
Regression fixes for password change:
Fixed str/bytes regression when generating password self-service
reset URL.
Fixed setting shadowLastChange.
Fixed setting pwdReset and pwdLastSet.
Fixed str/bytes regression when handling PasswordPolicyException.
Code cleaning.
1.5.93 Release Date: 2020-07-01
Added link to Æ-DIR plugin class for entryDN of aeUser and aeService
entries to search for entries created or modified by this entity.
SessionException is now ignored in case of disconnect because
probably user has disconnected in other tab before.
1.5.91 Release Date: 2020-06-30
More compact string literal syntax for host-specific parameter
search_tdtemplate in config presets for Æ-DIR.
More compact string literal syntax when displaying search results.
This seems to reduce approx. 15…20 % of traffic.
Code cleaning.
1.5.90 Release Date: 2020-06-30
Added log warning in case IOError was catched when reading the
search form template.
Fixed determining zone DN in Æ-DIR plugin classes (e.g. used for
aeProxyFor).
Refactored Æ-DIR plugin class hierarchy for attributes containing
references to aeSrvGroup entries with the DNs being displayed like
user group DNs.
1.5.88 Release Date: 2020-06-28
Some small web style changes (CSS).
Removed unmaintained style terminal.css.
1.5.86 Release Date: 2020-06-28
<h1> and error message now part of login HTML template.
Fixed displaying the Who Am I? result in [conninfo] if None.
1.5.85 Release Date: 2020-06-27
Fixed str/bytes regression in plugin class for attribute sambaAcctFlags.
Updated some LDIF templates for Æ-DIR from ansible role.
Some small web style changes (CSS).
Added line-break after value description when displaying Æ-DIR
attribute values based on select lists.
1.5.84 Release Date: 2020-06-21
When skipping HTML templates because of misconfiguration error/warning
messages are now written to log instead of broken error handling
in UI.
Code cleaning.
1.5.82 Release Date: 2020-06-19
Added more / better man-page links to HTML templates for OpenLDAP's
back-config.
Fixed str/bytes regression when displaying OpenLDAP syncrepl
statements (attribute olcSyncrepl).
>
> On 2021/01/30 20:51, Lucas Raab wrote:
>> Hello,
>>
>> Here are updates to databases/py-ldap0 and databases/web2ldap after the
>> py-dnspython split.
>>
>> web2ldap changelog: https://web2ldap.de/changes-1.5.html
>
> I tried looking, but web2ldap.de is down.
>
Curious, seems fine currently. In case it isn't later, here's the list
of changes since the last version in the tree
1.5.112 Release Date: 2020-11-26
HTML templates for object class msPwdResetObject were moved to
global templates directory for general use.
Fixed str/bytes regression when handling input form exceptions.
Added type hints for form exceptions.
Added attribute msPwdChangeNotification to HTML templates for object
class msPwdResetPolicy.
Fixed input field in plugin class Timespan.
1.5.108 Release Date: 2020-11-20
Added quick search field for Æ-DIR.
1.5.107 Release Date: 2020-11-19
Plugin class for OpenLDAP accesslog attribute reqMod now uses
validate method for LDAP syntax OctetString.
Installation check now also logs result of sys.getfilesystemencoding()
at DEBUG log level.
1.5.106 Release Date: 2020-11-04
New global configuration variable httpenv_override allows to override
all env vars of a request. For example this can be used to set
HTTPS=on to enforce setting the "secure" cookie flag. E.g. this is
highly recommended when running under control of gunicorn.
1.5.105 Release Date: 2020-11-02
Plugin class for dhcpStatements now ignores ValueError when trying
to display search link for DNS PTR RRs fails.
1.5.104 Release Date: 2020-10-29
Installing module dnspython is now optional again.
Fixed str/bytes regression when processing DNS SRV RRs.
1.5.103 Release Date: 2020-10-27
Added link when displaying attributes reqDN and reqAuthzID to search
other OpenLDAP accesslog entries with same values.
1.5.101 Release Date: 2020-10-16
Split env var value referenced by httpenv_remote_addr by comma and
use last value, e.g. in case IP addresses of cascaded proxies are
stored in HTTP_X_FORWARDED_FOR.
1.5.100 Release Date: 2020-09-24
Lazy initialization of session store and expiry thread. When running
under control of gunicorn this ensures that the initialization is
done after forking the master process which also fixes stopping the
expiry thread during shutdown.
1.5.98 Release Date: 2020-09-22
Re-factored removal of expired sessions as an incomplete work-around
when running under control of gunicorn.
1.5.97 Release Date: 2020-09-19
Improved HTML templates for TLS attributes in cn=config. New global
configuration variable httpenv_remote_addr especially used for
running under control of gunicorn behind a front-end web server.
1.5.96 Release Date: 2020-09-05
Fixed interop issue when running under control of gunicorn by not
closing input stream file object anymore (legacy code clean-up).
1.5.95 Release Date: 2020-08-26
Fixed deprecation warning for dnspython 2.0.0+.
1.5.94 Release Date: 2020-07-04
Regression fixes for password change:
Fixed str/bytes regression when generating password self-service
reset URL.
Fixed setting shadowLastChange.
Fixed setting pwdReset and pwdLastSet.
Fixed str/bytes regression when handling PasswordPolicyException.
Code cleaning.
1.5.93 Release Date: 2020-07-01
Added link to Æ-DIR plugin class for entryDN of aeUser and aeService
entries to search for entries created or modified by this entity.
SessionException is now ignored in case of disconnect because
probably user has disconnected in other tab before.
1.5.91 Release Date: 2020-06-30
More compact string literal syntax for host-specific parameter
search_tdtemplate in config presets for Æ-DIR.
More compact string literal syntax when displaying search results.
This seems to reduce approx. 15…20 % of traffic.
Code cleaning.
1.5.90 Release Date: 2020-06-30
Added log warning in case IOError was catched when reading the
search form template.
Fixed determining zone DN in Æ-DIR plugin classes (e.g. used for
aeProxyFor).
Refactored Æ-DIR plugin class hierarchy for attributes containing
references to aeSrvGroup entries with the DNs being displayed like
user group DNs.
1.5.88 Release Date: 2020-06-28
Some small web style changes (CSS).
Removed unmaintained style terminal.css.
1.5.86 Release Date: 2020-06-28
<h1> and error message now part of login HTML template.
Fixed displaying the Who Am I? result in [conninfo] if None.
1.5.85 Release Date: 2020-06-27
Fixed str/bytes regression in plugin class for attribute sambaAcctFlags.
Updated some LDIF templates for Æ-DIR from ansible role.
Some small web style changes (CSS).
Added line-break after value description when displaying Æ-DIR
attribute values based on select lists.
1.5.84 Release Date: 2020-06-21
When skipping HTML templates because of misconfiguration error/warning
messages are now written to log instead of broken error handling
in UI.
Code cleaning.
1.5.82 Release Date: 2020-06-19
Added more / better man-page links to HTML templates for OpenLDAP's
back-config.
Fixed str/bytes regression when displaying OpenLDAP syncrepl
statements (attribute olcSyncrepl).
Re: Remove audio/gimmix
Stuart Henderson writes:
> Are you doing your testing with
> strict vm.malloc_conf options? It is unrealistic to expect random crap
> from ports to work with anything tighter than the defaults (and even the
> defaults are asking a bit much for some of it..)
I've run vm.malloc_conf=SU for the last few years and while it helpfully
exposes a few new bugs it's not significantly moreso than what you get
from running OpenBSD in the first place, in my experience. IMO it's a
good idea for porters (those who aren't already swamped anyway) to run
with these options. Not unrealistic for day-to-day use even outside of
base.
> Are you doing your testing with
> strict vm.malloc_conf options? It is unrealistic to expect random crap
> from ports to work with anything tighter than the defaults (and even the
> defaults are asking a bit much for some of it..)
I've run vm.malloc_conf=SU for the last few years and while it helpfully
exposes a few new bugs it's not significantly moreso than what you get
from running OpenBSD in the first place, in my experience. IMO it's a
good idea for porters (those who aren't already swamped anyway) to run
with these options. Not unrealistic for day-to-day use even outside of
base.
Re: Remove audio/gimmix
Klemens Nanni:
> Upstream is completely dead, even FreeBSD has marked their port as such
> (EXPIRATION DATE: 2021-04-01, not sure what will happen then, though).
It will be removed.
rene@FreeBSD.org performs regular "Remove expired ports" commits.
--
Christian "naddy" Weisgerber naddy@mips.inka.de
> Upstream is completely dead, even FreeBSD has marked their port as such
> (EXPIRATION DATE: 2021-04-01, not sure what will happen then, though).
It will be removed.
rene@FreeBSD.org performs regular "Remove expired ports" commits.
--
Christian "naddy" Weisgerber naddy@mips.inka.de
Re: Cisco AnyConnect Secure Mobility Client Alternatives with MFA?
On 2021-01-31, Predrag Punosevac <punosevac72@gmail.com> wrote:
>> On Sun, 2021-01-31 at 21:41 +0300, somebody from mother Russia wrote:
>> > Hello,
>> > Our employer decided that AnyConnect Secure Mobility Client with
>> > multifactor Azure authentication is the only secure option to connect
>> > to
>> > work. No alternatives, no discussions.
>> > There are packages for Windows and Linux only.
>> > Did anybody succeed in running vpn clients compatible with all that
>> > funny stuff?
>> >
>>
>> Hi,
>>
>> have you tried your luck with Openconnect? It's in packages. I've had
>> luck with that at least on Linux side on my work laptop.
If openconnect doesn't work directly with Azure MFA there's a fair chance
someone else has done it, so worth searching around for clues.
> I have been using Openconnect for a while and with exception of the 6.8
> release cycle it worked perfectly. At the beggining of the 6.8 release
> cycle OpenBSD package was "broken". I am not sure if it was OpenBSD SSL
> stack or the server side (Cisco black box) but I just tried again today
> and there was no error.
openconnect uses gnutls not libressl so I would guess at more likely an
issue on the server side.
>> On Sun, 2021-01-31 at 21:41 +0300, somebody from mother Russia wrote:
>> > Hello,
>> > Our employer decided that AnyConnect Secure Mobility Client with
>> > multifactor Azure authentication is the only secure option to connect
>> > to
>> > work. No alternatives, no discussions.
>> > There are packages for Windows and Linux only.
>> > Did anybody succeed in running vpn clients compatible with all that
>> > funny stuff?
>> >
>>
>> Hi,
>>
>> have you tried your luck with Openconnect? It's in packages. I've had
>> luck with that at least on Linux side on my work laptop.
If openconnect doesn't work directly with Azure MFA there's a fair chance
someone else has done it, so worth searching around for clues.
> I have been using Openconnect for a while and with exception of the 6.8
> release cycle it worked perfectly. At the beggining of the 6.8 release
> cycle OpenBSD package was "broken". I am not sure if it was OpenBSD SSL
> stack or the server side (Cisco black box) but I just tried again today
> and there was no error.
openconnect uses gnutls not libressl so I would guess at more likely an
issue on the server side.
Re: UPDATE: Boost 1.72
On 2021/01/29 19:09, Brad Smith wrote:
> On 1/27/2021 12:54 AM, Brad Smith wrote:
> > On Wed, Jan 20, 2021 at 04:06:20PM -0500, Brad Smith wrote:
> > > Here is an update to Boost 1.72.
> > >
> > > Took a bit more digging. After a bit of adjustments and with debugging
> > > messages turned on in one step, hinting that user-config.jam was being created
> > > in the wrong spot, I was able to get the build to use the proper compiler in
> > > the various configure and build steps.
> > >
> > > Looking for any further feedback / Oks at this point.
> > An updated diff rolling in a sort of errata patch which seems to resolve a
> > build issue with Icinga. With that down the tree appears to be good in
> > good shape on amd64.
>
> Also good on i386 and sparc64.
>
This is OK with me.
For ease of reference, diff is in https://marc.info/?l=openbsd-ports&m=161172703710502&q=mbox
> On 1/27/2021 12:54 AM, Brad Smith wrote:
> > On Wed, Jan 20, 2021 at 04:06:20PM -0500, Brad Smith wrote:
> > > Here is an update to Boost 1.72.
> > >
> > > Took a bit more digging. After a bit of adjustments and with debugging
> > > messages turned on in one step, hinting that user-config.jam was being created
> > > in the wrong spot, I was able to get the build to use the proper compiler in
> > > the various configure and build steps.
> > >
> > > Looking for any further feedback / Oks at this point.
> > An updated diff rolling in a sort of errata patch which seems to resolve a
> > build issue with Icinga. With that down the tree appears to be good in
> > good shape on amd64.
>
> Also good on i386 and sparc64.
>
This is OK with me.
For ease of reference, diff is in https://marc.info/?l=openbsd-ports&m=161172703710502&q=mbox
Re: Remove audio/gimmix
On Sun, Jan 31, 2021 at 10:25:15PM +0000, Stuart Henderson wrote:
> That doesn't happen here. I don't have an mpd setup to test if it
> actually works but it doesn't crash. Are you doing your testing with
> strict vm.malloc_conf options? It is unrealistic to expect random crap
> from ports to work with anything tighter than the defaults (and even the
> defaults are asking a bit much for some of it..)
No, it happens for me with default malloc options on amd64:
$ sysctl vm.malloc_conf
vm.malloc_conf=
$ gimmix
Segmentation fault (core dumped)
> Where is it depending on Python?
Sorry, it's an indirect dependency, here it's pulled in via libglade2.
> That doesn't happen here. I don't have an mpd setup to test if it
> actually works but it doesn't crash. Are you doing your testing with
> strict vm.malloc_conf options? It is unrealistic to expect random crap
> from ports to work with anything tighter than the defaults (and even the
> defaults are asking a bit much for some of it..)
No, it happens for me with default malloc options on amd64:
$ sysctl vm.malloc_conf
vm.malloc_conf=
$ gimmix
Segmentation fault (core dumped)
> Where is it depending on Python?
Sorry, it's an indirect dependency, here it's pulled in via libglade2.
Re: [update] py-ldap0 and web2ldap
On 2021/01/30 20:51, Lucas Raab wrote:
> Hello,
>
> Here are updates to databases/py-ldap0 and databases/web2ldap after the
> py-dnspython split.
>
> web2ldap changelog: https://web2ldap.de/changes-1.5.html
I tried looking, but web2ldap.de is down.
> Hello,
>
> Here are updates to databases/py-ldap0 and databases/web2ldap after the
> py-dnspython split.
>
> web2ldap changelog: https://web2ldap.de/changes-1.5.html
I tried looking, but web2ldap.de is down.
Re: Remove audio/gimmix
On 2021/01/31 22:43, Klemens Nanni wrote:
> Starting the app shows a window, I leave user/password and host/port to
> the defaults and click OK, then it dies:
That doesn't happen here. I don't have an mpd setup to test if it
actually works but it doesn't crash. Are you doing your testing with
strict vm.malloc_conf options? It is unrealistic to expect random crap
from ports to work with anything tighter than the defaults (and even the
defaults are asking a bit much for some of it..)
> Upstream is completely dead, even FreeBSD has marked their port as such
> (EXPIRATION DATE: 2021-04-01, not sure what will happen then, though).
>
> It does not work, depends on old Python and GTK and already carries a
> local patch to cope with an cURL update.
>
> OK?
>
Where is it depending on Python?
> Starting the app shows a window, I leave user/password and host/port to
> the defaults and click OK, then it dies:
That doesn't happen here. I don't have an mpd setup to test if it
actually works but it doesn't crash. Are you doing your testing with
strict vm.malloc_conf options? It is unrealistic to expect random crap
from ports to work with anything tighter than the defaults (and even the
defaults are asking a bit much for some of it..)
> Upstream is completely dead, even FreeBSD has marked their port as such
> (EXPIRATION DATE: 2021-04-01, not sure what will happen then, though).
>
> It does not work, depends on old Python and GTK and already carries a
> local patch to cope with an cURL update.
>
> OK?
>
Where is it depending on Python?
UPDATE: ircd-hybrid 8.2.38
Here is an update to ircd-hybrid 8.2.38.
-- Noteworthy changes in version 8.2.38 (2021-01-17)
* Backwards compatibility mode for ircd-hybrid 8.2.22 and below has been removed
* Minimum supported version of the Anope IRC services is now 2.0.8
* Fixed displaying issue with channel MODE messages
* Characters valid for user names for local clients are now [A-Za-z0-9._-]. 'Special'
characters like }|{`^]\[$, that were allowed previously, are no longer valid.
Also user names may not begin with '.', '_', or '-'.
* The `general::dots_in_ident` configuration directive has been renamed to
`general::specials_in_ident` and now covers the '-' and '_' characters in
addition to '.'
* Fixed issue with clients connected from IPv6 localhost that, depending on the
system's getaddrinfo() implementation, could lead to a crash of remote servers
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/net/ircd-hybrid/Makefile,v
retrieving revision 1.58
diff -u -p -u -p -r1.58 Makefile
--- Makefile 17 Jan 2021 15:47:40 -0000 1.58
+++ Makefile 31 Jan 2021 22:20:55 -0000
@@ -2,7 +2,7 @@
COMMENT = Internet Relay Chat server
-DISTNAME = ircd-hybrid-8.2.37
+DISTNAME = ircd-hybrid-8.2.38
CATEGORIES = net
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ircd-hybrid/}
EXTRACT_SUFX = .tgz
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/net/ircd-hybrid/distinfo,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 distinfo
--- distinfo 17 Jan 2021 15:47:40 -0000 1.35
+++ distinfo 31 Jan 2021 22:21:02 -0000
@@ -1,2 +1,2 @@
-SHA256 (ircd-hybrid-8.2.37.tgz) = rvFAVcnWO9CdRGc3CfCJoPeCvUXjhDNP5K3WQRcZibA=
-SIZE (ircd-hybrid-8.2.37.tgz) = 1046778
+SHA256 (ircd-hybrid-8.2.38.tgz) = xRA0hzowgjSQtb37Pnw7de1nPtlHAg2FwRMSaKdr+2M=
+SIZE (ircd-hybrid-8.2.38.tgz) = 1039787
-- Noteworthy changes in version 8.2.38 (2021-01-17)
* Backwards compatibility mode for ircd-hybrid 8.2.22 and below has been removed
* Minimum supported version of the Anope IRC services is now 2.0.8
* Fixed displaying issue with channel MODE messages
* Characters valid for user names for local clients are now [A-Za-z0-9._-]. 'Special'
characters like }|{`^]\[$, that were allowed previously, are no longer valid.
Also user names may not begin with '.', '_', or '-'.
* The `general::dots_in_ident` configuration directive has been renamed to
`general::specials_in_ident` and now covers the '-' and '_' characters in
addition to '.'
* Fixed issue with clients connected from IPv6 localhost that, depending on the
system's getaddrinfo() implementation, could lead to a crash of remote servers
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/net/ircd-hybrid/Makefile,v
retrieving revision 1.58
diff -u -p -u -p -r1.58 Makefile
--- Makefile 17 Jan 2021 15:47:40 -0000 1.58
+++ Makefile 31 Jan 2021 22:20:55 -0000
@@ -2,7 +2,7 @@
COMMENT = Internet Relay Chat server
-DISTNAME = ircd-hybrid-8.2.37
+DISTNAME = ircd-hybrid-8.2.38
CATEGORIES = net
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ircd-hybrid/}
EXTRACT_SUFX = .tgz
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/net/ircd-hybrid/distinfo,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 distinfo
--- distinfo 17 Jan 2021 15:47:40 -0000 1.35
+++ distinfo 31 Jan 2021 22:21:02 -0000
@@ -1,2 +1,2 @@
-SHA256 (ircd-hybrid-8.2.37.tgz) = rvFAVcnWO9CdRGc3CfCJoPeCvUXjhDNP5K3WQRcZibA=
-SIZE (ircd-hybrid-8.2.37.tgz) = 1046778
+SHA256 (ircd-hybrid-8.2.38.tgz) = xRA0hzowgjSQtb37Pnw7de1nPtlHAg2FwRMSaKdr+2M=
+SIZE (ircd-hybrid-8.2.38.tgz) = 1039787
Re: Remove audio/soundtracker
On Sun, Jan 31, 2021 at 10:18:10PM +0000, Stuart Henderson wrote:
> I've updated to 1.0.1 and cleaned up the autoconf patches, it still
> crashes at startup though (but in a different way, now it's in xkeymap
> setup code..).
OK, thanks.
> No python there at all?
It's an indirect dependency.
> I've updated to 1.0.1 and cleaned up the autoconf patches, it still
> crashes at startup though (but in a different way, now it's in xkeymap
> setup code..).
OK, thanks.
> No python there at all?
It's an indirect dependency.
Re: Remove audio/soundtracker
I've updated to 1.0.1 and cleaned up the autoconf patches, it still
crashes at startup though (but in a different way, now it's in xkeymap
setup code..).
> More or less functional GTK+ 3 port: Git gtk3 branch
> Last release for GTK+ 1: v0.6.8 (25-Feb-2006)
> The rest of this web site is mostly out of date.
>
> So we're massively behind with a broken port that won't see updates.
> Id' say interested users may port newer versions (once they're stable).
>
> It also requires Python 2.
No python there at all?
crashes at startup though (but in a different way, now it's in xkeymap
setup code..).
> More or less functional GTK+ 3 port: Git gtk3 branch
> Last release for GTK+ 1: v0.6.8 (25-Feb-2006)
> The rest of this web site is mostly out of date.
>
> So we're massively behind with a broken port that won't see updates.
> Id' say interested users may port newer versions (once they're stable).
>
> It also requires Python 2.
No python there at all?
Remove audio/xhippo
Upstream at https://www.gnu.org/software/xhippo/ no longer provides
distfiles since at least 2019, FreeBSD also has marked the port as such;
the website says
The GNU xhippo has been decommissioned.
I think we should stop carrying such cruft.
Other ports such as audio/mkplaylist do similar jobs, most media players
also have such functionality, e.g. VLC does.
OK?
distfiles since at least 2019, FreeBSD also has marked the port as such;
the website says
The GNU xhippo has been decommissioned.
I think we should stop carrying such cruft.
Other ports such as audio/mkplaylist do similar jobs, most media players
also have such functionality, e.g. VLC does.
OK?
Remove audio/gimmix
Starting the app shows a window, I leave user/password and host/port to
the defaults and click OK, then it dies:
(gdb) bt
#0 strlen () at /usr/src/lib/libc/arch/amd64/string/strlen.S:125
#1 0x00000a766b5c1914 in ?? ()
#2 0x00000a766b5cd6fb in ?? ()
#3 0x00000a78ff5263b9 in g_closure_invoke () from /usr/local/lib/libgobject-2.0.so.4200.12
#4 0x00000a78ff53efda in signal_emit_unlocked_R () from /usr/local/lib/libgobject-2.0.so.4200.12
#5 0x00000a78ff53fdda in g_signal_emit_valist () from /usr/local/lib/libgobject-2.0.so.4200.12
#6 0x00000a78ff5404a1 in g_signal_emit () from /usr/local/lib/libgobject-2.0.so.4200.12
#7 0x00000a78906de78c in gtk_real_button_released () from /usr/local/lib/libgtk-x11-2.0.so.2400.0
#8 0x00000a78ff5263b9 in g_closure_invoke () from /usr/local/lib/libgobject-2.0.so.4200.12
#9 0x00000a78ff53ed9a in signal_emit_unlocked_R () from /usr/local/lib/libgobject-2.0.so.4200.12
#10 0x00000a78ff53fdda in g_signal_emit_valist () from /usr/local/lib/libgobject-2.0.so.4200.12
#11 0x00000a78ff5404a1 in g_signal_emit () from /usr/local/lib/libgobject-2.0.so.4200.12
#12 0x00000a78906de31d in gtk_button_button_release () from /usr/local/lib/libgtk-x11-2.0.so.2400.0
#13 0x00000a78907ab1ae in _gtk_marshal_BOOLEAN__BOXED () from /usr/local/lib/libgtk-x11-2.0.so.2400.0
#14 0x00000a78ff5263b9 in g_closure_invoke () from /usr/local/lib/libgobject-2.0.so.4200.12
#15 0x00000a78ff53f117 in signal_emit_unlocked_R () from /usr/local/lib/libgobject-2.0.so.4200.12
#16 0x00000a78ff53fe23 in g_signal_emit_valist () from /usr/local/lib/libgobject-2.0.so.4200.12
#17 0x00000a78ff5404a1 in g_signal_emit () from /usr/local/lib/libgobject-2.0.so.4200.12
#18 0x00000a7890901696 in gtk_widget_event_internal () from /usr/local/lib/libgtk-x11-2.0.so.2400.0
#19 0x00000a78907a8d47 in gtk_propagate_event () from /usr/local/lib/libgtk-x11-2.0.so.2400.0
#20 0x00000a78907a8aca in gtk_main_do_event () from /usr/local/lib/libgtk-x11-2.0.so.2400.0
#21 0x00000a7872116f94 in gdk_event_dispatch () from /usr/local/lib/libgdk-x11-2.0.so.2400.0
#22 0x00000a796375c56f in g_main_context_dispatch () from /usr/local/lib/libglib-2.0.so.4201.5
#23 0x00000a796375c930 in g_main_context_iterate () from /usr/local/lib/libglib-2.0.so.4201.5
#24 0x00000a796375cd5a in g_main_loop_run () from /usr/local/lib/libglib-2.0.so.4201.5
#25 0x00000a78907a80e7 in gtk_main () from /usr/local/lib/libgtk-x11-2.0.so.2400.0
#26 0x00000a766b5d129b in ?? ()
#27 0x00000a766b5c13c1 in ?? ()
#28 0x0000000000000000 in ?? ()
Upstream is completely dead, even FreeBSD has marked their port as such
(EXPIRATION DATE: 2021-04-01, not sure what will happen then, though).
It does not work, depends on old Python and GTK and already carries a
local patch to cope with an cURL update.
OK?
the defaults and click OK, then it dies:
(gdb) bt
#0 strlen () at /usr/src/lib/libc/arch/amd64/string/strlen.S:125
#1 0x00000a766b5c1914 in ?? ()
#2 0x00000a766b5cd6fb in ?? ()
#3 0x00000a78ff5263b9 in g_closure_invoke () from /usr/local/lib/libgobject-2.0.so.4200.12
#4 0x00000a78ff53efda in signal_emit_unlocked_R () from /usr/local/lib/libgobject-2.0.so.4200.12
#5 0x00000a78ff53fdda in g_signal_emit_valist () from /usr/local/lib/libgobject-2.0.so.4200.12
#6 0x00000a78ff5404a1 in g_signal_emit () from /usr/local/lib/libgobject-2.0.so.4200.12
#7 0x00000a78906de78c in gtk_real_button_released () from /usr/local/lib/libgtk-x11-2.0.so.2400.0
#8 0x00000a78ff5263b9 in g_closure_invoke () from /usr/local/lib/libgobject-2.0.so.4200.12
#9 0x00000a78ff53ed9a in signal_emit_unlocked_R () from /usr/local/lib/libgobject-2.0.so.4200.12
#10 0x00000a78ff53fdda in g_signal_emit_valist () from /usr/local/lib/libgobject-2.0.so.4200.12
#11 0x00000a78ff5404a1 in g_signal_emit () from /usr/local/lib/libgobject-2.0.so.4200.12
#12 0x00000a78906de31d in gtk_button_button_release () from /usr/local/lib/libgtk-x11-2.0.so.2400.0
#13 0x00000a78907ab1ae in _gtk_marshal_BOOLEAN__BOXED () from /usr/local/lib/libgtk-x11-2.0.so.2400.0
#14 0x00000a78ff5263b9 in g_closure_invoke () from /usr/local/lib/libgobject-2.0.so.4200.12
#15 0x00000a78ff53f117 in signal_emit_unlocked_R () from /usr/local/lib/libgobject-2.0.so.4200.12
#16 0x00000a78ff53fe23 in g_signal_emit_valist () from /usr/local/lib/libgobject-2.0.so.4200.12
#17 0x00000a78ff5404a1 in g_signal_emit () from /usr/local/lib/libgobject-2.0.so.4200.12
#18 0x00000a7890901696 in gtk_widget_event_internal () from /usr/local/lib/libgtk-x11-2.0.so.2400.0
#19 0x00000a78907a8d47 in gtk_propagate_event () from /usr/local/lib/libgtk-x11-2.0.so.2400.0
#20 0x00000a78907a8aca in gtk_main_do_event () from /usr/local/lib/libgtk-x11-2.0.so.2400.0
#21 0x00000a7872116f94 in gdk_event_dispatch () from /usr/local/lib/libgdk-x11-2.0.so.2400.0
#22 0x00000a796375c56f in g_main_context_dispatch () from /usr/local/lib/libglib-2.0.so.4201.5
#23 0x00000a796375c930 in g_main_context_iterate () from /usr/local/lib/libglib-2.0.so.4201.5
#24 0x00000a796375cd5a in g_main_loop_run () from /usr/local/lib/libglib-2.0.so.4201.5
#25 0x00000a78907a80e7 in gtk_main () from /usr/local/lib/libgtk-x11-2.0.so.2400.0
#26 0x00000a766b5d129b in ?? ()
#27 0x00000a766b5c13c1 in ?? ()
#28 0x0000000000000000 in ?? ()
Upstream is completely dead, even FreeBSD has marked their port as such
(EXPIRATION DATE: 2021-04-01, not sure what will happen then, though).
It does not work, depends on old Python and GTK and already carries a
local patch to cope with an cURL update.
OK?
misc/deco: -fno-common fix
Hi,
This fix has been taken once again from FreeBSD [0]. This builds and
works fine on amd64.
OK?
Charlène.
[0] https://github.com/freebsd/freebsd-ports/commit/4b6803fe
Index: Makefile
===================================================================
RCS file: /cvs/ports/misc/deco/Makefile,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 Makefile
--- Makefile 26 Jan 2020 11:14:32 -0000 1.27
+++ Makefile 31 Jan 2021 21:39:05 -0000
@@ -4,7 +4,7 @@ COMMENT= Demos Commander, a free Norton
DISTNAME= deco383
PKGNAME= deco-3.8.3
-REVISION= 1
+REVISION= 2
CATEGORIES= misc
MASTER_SITES= https://distfiles.sigtrap.nl/
EXTRACT_SUFX= .tgz
Index: patches/patch-env_h
===================================================================
RCS file: patches/patch-env_h
diff -N patches/patch-env_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-env_h 31 Jan 2021 21:39:05 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: env.h
+--- env.h.orig
++++ env.h
+@@ -1,4 +1,4 @@
+-char **EnvVector;
++static char **EnvVector;
+ void EnvInit (char **env);
+ char *EnvGet (char *name);
+ void EnvPut (char *name, char *value);
Index: patches/patch-scr_c
===================================================================
RCS file: /cvs/ports/misc/deco/patches/patch-scr_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-scr_c
--- patches/patch-scr_c 21 Mar 2002 09:59:48 -0000 1.1
+++ patches/patch-scr_c 31 Jan 2021 21:39:05 -0000
@@ -1,6 +1,19 @@
$OpenBSD: patch-scr_c,v 1.1 2002/03/21 09:59:48 form Exp $
---- scr.c.orig Tue Dec 29 22:57:11 1998
-+++ scr.c Thu Mar 21 15:31:17 2002
+
+Hunk #1: Fix -fno-common build failure.
+
+Index: scr.c
+--- scr.c.orig
++++ scr.c
+@@ -148,7 +148,7 @@ WINDOW VScreen;
+ int BlackWhite = 0;
+ int ColorMode = 1;
+ int GraphMode = 1;
+-int TtyUpperCase = 0;
++extern int TtyUpperCase;
+
+ static WINDOW curscr;
+ static scrool, rscrool;
@@ -167,7 +167,7 @@ static char *KS, *KE;
static char *CL, *CM, *SE, *SO, *TE, *TI, *VE, *VS,
Index: patches/patch-tty_c
===================================================================
RCS file: patches/patch-tty_c
diff -N patches/patch-tty_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-tty_c 31 Jan 2021 21:39:05 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: tty.c
+--- tty.c.orig
++++ tty.c
+@@ -82,7 +82,7 @@ static struct ltchars oldchars, newchars;
+ # define OXTABS TAB3
+
This fix has been taken once again from FreeBSD [0]. This builds and
works fine on amd64.
OK?
Charlène.
[0] https://github.com/freebsd/freebsd-ports/commit/4b6803fe
Index: Makefile
===================================================================
RCS file: /cvs/ports/misc/deco/Makefile,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 Makefile
--- Makefile 26 Jan 2020 11:14:32 -0000 1.27
+++ Makefile 31 Jan 2021 21:39:05 -0000
@@ -4,7 +4,7 @@ COMMENT= Demos Commander, a free Norton
DISTNAME= deco383
PKGNAME= deco-3.8.3
-REVISION= 1
+REVISION= 2
CATEGORIES= misc
MASTER_SITES= https://distfiles.sigtrap.nl/
EXTRACT_SUFX= .tgz
Index: patches/patch-env_h
===================================================================
RCS file: patches/patch-env_h
diff -N patches/patch-env_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-env_h 31 Jan 2021 21:39:05 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: env.h
+--- env.h.orig
++++ env.h
+@@ -1,4 +1,4 @@
+-char **EnvVector;
++static char **EnvVector;
+ void EnvInit (char **env);
+ char *EnvGet (char *name);
+ void EnvPut (char *name, char *value);
Index: patches/patch-scr_c
===================================================================
RCS file: /cvs/ports/misc/deco/patches/patch-scr_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-scr_c
--- patches/patch-scr_c 21 Mar 2002 09:59:48 -0000 1.1
+++ patches/patch-scr_c 31 Jan 2021 21:39:05 -0000
@@ -1,6 +1,19 @@
$OpenBSD: patch-scr_c,v 1.1 2002/03/21 09:59:48 form Exp $
---- scr.c.orig Tue Dec 29 22:57:11 1998
-+++ scr.c Thu Mar 21 15:31:17 2002
+
+Hunk #1: Fix -fno-common build failure.
+
+Index: scr.c
+--- scr.c.orig
++++ scr.c
+@@ -148,7 +148,7 @@ WINDOW VScreen;
+ int BlackWhite = 0;
+ int ColorMode = 1;
+ int GraphMode = 1;
+-int TtyUpperCase = 0;
++extern int TtyUpperCase;
+
+ static WINDOW curscr;
+ static scrool, rscrool;
@@ -167,7 +167,7 @@ static char *KS, *KE;
static char *CL, *CM, *SE, *SO, *TE, *TI, *VE, *VS,
Index: patches/patch-tty_c
===================================================================
RCS file: patches/patch-tty_c
diff -N patches/patch-tty_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-tty_c 31 Jan 2021 21:39:05 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: tty.c
+--- tty.c.orig
++++ tty.c
+@@ -82,7 +82,7 @@ static struct ltchars oldchars, newchars;
+ # define OXTABS TAB3
+
Re: Cisco AnyConnect Secure Mobility Client Alternatives with MFA?
> On Sun, 2021-01-31 at 21:41 +0300, somebody from mother Russia wrote:
> > Hello,
> > Our employer decided that AnyConnect Secure Mobility Client with
> > multifactor Azure authentication is the only secure option to connect
> > to
> > work. No alternatives, no discussions.
> > There are packages for Windows and Linux only.
> > Did anybody succeed in running vpn clients compatible with all that
> > funny stuff?
> >
>
> Hi,
>
> have you tried your luck with Openconnect? It's in packages. I've had
> luck with that at least on Linux side on my work laptop.
I have been using Openconnect for a while and with exception of the 6.8
release cycle it worked perfectly. At the beggining of the 6.8 release
cycle OpenBSD package was "broken". I am not sure if it was OpenBSD SSL
stack or the server side (Cisco black box) but I just tried again today
and there was no error.
oko# openconnect https://nrec.vpn.cmu.edu
POST https://nrec.vpn.cmu.edu/
Connected to 128.2.5.164:443
SSL negotiation with nrec.vpn.cmu.edu
Connected to HTTPS on nrec.vpn.cmu.edu with ciphersuite
(TLS1.2)-(ECDHE-SECP256R1)-(RSA-SHA512)-(AES-256-GCM)
oko# uname -a
OpenBSD oko.int.bagdala2.net 6.8 GENERIC.MP#4 amd64
oko# syspatch -l
001_bgpd
002_icmp6
003_tmux
004_wg
005_unwind
006_rpki
007_xmaplen
008_asn1
009_exit
010_smtpd
011_nd6
012_carp
>
> --
> Kind regards,
> Ville
> > Hello,
> > Our employer decided that AnyConnect Secure Mobility Client with
> > multifactor Azure authentication is the only secure option to connect
> > to
> > work. No alternatives, no discussions.
> > There are packages for Windows and Linux only.
> > Did anybody succeed in running vpn clients compatible with all that
> > funny stuff?
> >
>
> Hi,
>
> have you tried your luck with Openconnect? It's in packages. I've had
> luck with that at least on Linux side on my work laptop.
I have been using Openconnect for a while and with exception of the 6.8
release cycle it worked perfectly. At the beggining of the 6.8 release
cycle OpenBSD package was "broken". I am not sure if it was OpenBSD SSL
stack or the server side (Cisco black box) but I just tried again today
and there was no error.
oko# openconnect https://nrec.vpn.cmu.edu
POST https://nrec.vpn.cmu.edu/
Connected to 128.2.5.164:443
SSL negotiation with nrec.vpn.cmu.edu
Connected to HTTPS on nrec.vpn.cmu.edu with ciphersuite
(TLS1.2)-(ECDHE-SECP256R1)-(RSA-SHA512)-(AES-256-GCM)
oko# uname -a
OpenBSD oko.int.bagdala2.net 6.8 GENERIC.MP#4 amd64
oko# syspatch -l
001_bgpd
002_icmp6
003_tmux
004_wg
005_unwind
006_rpki
007_xmaplen
008_asn1
009_exit
010_smtpd
011_nd6
012_carp
>
> --
> Kind regards,
> Ville
Subscribe to:
Posts (Atom)