CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2024/04/23 11:50:55 Modified files: lang/ocaml : Makefile Log message: Unbreak ocaml on i386. Extra linker args are no longer needed. OK sthen@
Re: [UPDATE] OCaml 4.14.1 -> 4.14.2
Stuart Henderson writes:
> The updated ocaml version fails to build on i386; the new ocamlc.opt run
> as part of the build segfaults segfaults, looks like during runtime linking.
>
This fixes it in my i386 vm. Can you try this? Should probably get
tested with other ocaml-based ports on i386 before I commit this time :|
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index 244c1b7315f..d88cb8f466d 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -3,6 +3,7 @@ COMMENT = ML language with complete class-based
objective system
# XXX Don't even think of updating ocaml alone.
# Do check that the ports that depend on it still work, or repair them.
VERSION= 4.14.2
+REVISION= 0
# if the ocaml compiler gains support for BTI, as well as
# removing USE_NOBTCFI here (or changing to an arch-dependent
@@ -60,8 +61,6 @@ LDFLAGS +=-L${LOCALBASE}/lib
.if ${MACHINE_ARCH} == "i386"
# configure: error: fma does not work, enable emulation with
--enable-imprecise-c99-float-ops
CONFIGURE_ARGS += --enable-imprecise-c99-float-ops
-# non-PIC assembly in asmrun/i386.S
-LDFLAGS+= -Wl,-z,notext
.endif
USE_GMAKE= Yes
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2024/04/20 08:06:23 Modified files: lang/ocaml : Makefile distinfo Removed files: lang/ocaml/patches: patch-configure Log message: Update OCaml to 4.14.2. Drops patches for configure now that upstream handles no-execute-only. Updates Makefile now that upstream handles nobtcfi linker args. ok volker@
Re: [UPDATE] OCaml 4.14.1 -> 4.14.2
ping.
Dave Voutila writes:
> OCaml 4.14.2 is a bugfix release that includes some of our patches and
> tweaks upstreamed thanks to miod@:
>
> - the nobtcfi linker flags are now set in OCaml's configure script so
>we don't need the LDFLAGS dance in the Makefile
> - the no-execute-only flag is also set, so we can drop the patch
>
> Built on both amd64 and arm64. (I don't have other machines.)
>
> Running `make test` has the same single test failure as 4.14.1.
>
> I don't commit to ports often so:
> - Do we keep an empty patches directory or no? I'd presume yes.
> - Can someone help run a build of any dependent ports or point me to
>how?
> - I kept the USE_NOBTCFI flag. I'm not sure how we incorporate that
>into the ports infra, but since OCaml is still not able to build
>without the linker flag, I'm assuming it's sensible to keep that for
>reference?
>
> feedback welcome :)
>
> -dv
>
> diff refs/heads/master refs/heads/ocaml-4
> commit - 4aa8f0d502946b9c12dc190e1ff27c02dba9cca5
> commit + b26e117aba3d2931b28a8443b0ec65f12003c909
> blob - 744f9992f6a1812450bcb4c2e96e483c25e87971
> blob + 244c1b7315faa3a96849574ea5d05e78a7a22cd9
> --- lang/ocaml/Makefile
> +++ lang/ocaml/Makefile
> @@ -2,7 +2,7 @@ COMMENT =ML language with complete class-based obj
>
> # XXX Don't even think of updating ocaml alone.
> # Do check that the ports that depend on it still work, or repair them.
> -VERSION= 4.14.1
> +VERSION= 4.14.2
>
> # if the ocaml compiler gains support for BTI, as well as
> # removing USE_NOBTCFI here (or changing to an arch-dependent
> @@ -64,12 +64,6 @@ CONFIGURE_ARGS += --enable-imprecise-c99-float-ops
> LDFLAGS+=-Wl,-z,notext
> .endif
>
> -# We need to pass nobtcfi in LDFLAGS so that ocamlopt
> -# will pick it up when building OCaml native binaries
> -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "arm64"
> -LDFLAGS+=-Wl,-z,nobtcfi
> -.endif
> -
> USE_GMAKE= Yes
>
> WANTLIB =c m pthread
> blob - 07c4adb25913fc8db722c8753fefbf55e7182ceb
> blob + b2ed4b8eda49096b389cc1b7e95d69075810b55e
> --- lang/ocaml/distinfo
> +++ lang/ocaml/distinfo
> @@ -1,4 +1,4 @@
> SHA256 (ocaml-4.14-refman-html.tar.gz) =
> +dILjzxXO797/JkVVzFHK5G5vwhOndK1U50q5HNAbKc=
> -SHA256 (ocaml-4.14.1.tar.gz) = GDl53JwJyw9YCiMraFMaCbAlqmKLjY1ydEnxRv1vX+4=
> +SHA256 (ocaml-4.14.2.tar.gz) = k7TzujnVWalj/BB0RWO0xukun/tUDOieXF6/dghrmfM=
> SIZE (ocaml-4.14-refman-html.tar.gz) = 1982462
> -SIZE (ocaml-4.14.1.tar.gz) = 5497979
> +SIZE (ocaml-4.14.2.tar.gz) = 5504138
> blob - 8e2f6dcfd97891503f2704b423fd429e5cb357d8 (mode 644)
> blob + /dev/null
> --- lang/ocaml/patches/patch-configure
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -Backport part of https://github.com/ocaml/ocaml/pull/12372/files
> -Pointed out by avsm@
> -
> -Index: configure
> configure.orig
> -+++ configure
> -@@ -14133,6 +14133,17 @@ if test -z "$mkmaindll"; then :
> - mkmaindll=$mksharedlib
> - fi
> -
> -+# Make sure code sections in OCaml-generated executables are readable
> -+# (required for marshaling of function closures)
> -+
> -+case $host in #(
> -+ *-*-openbsd7.[3-9]|*-*-openbsd[89].*) :
> -+oc_ldflags="$oc_ldflags -Wl,--no-execute-only"
> -+ natdynlinkopts="$natdynlinkopts -Wl,--no-execute-only" ;; #(
> -+ *) :
> -+ ;;
> -+esac
> -+
> - # Configure native dynlink
> -
> - natdynlink=false
[UPDATE] OCaml 4.14.1 -> 4.14.2
OCaml 4.14.2 is a bugfix release that includes some of our patches and
tweaks upstreamed thanks to miod@:
- the nobtcfi linker flags are now set in OCaml's configure script so
we don't need the LDFLAGS dance in the Makefile
- the no-execute-only flag is also set, so we can drop the patch
Built on both amd64 and arm64. (I don't have other machines.)
Running `make test` has the same single test failure as 4.14.1.
I don't commit to ports often so:
- Do we keep an empty patches directory or no? I'd presume yes.
- Can someone help run a build of any dependent ports or point me to
how?
- I kept the USE_NOBTCFI flag. I'm not sure how we incorporate that
into the ports infra, but since OCaml is still not able to build
without the linker flag, I'm assuming it's sensible to keep that for
reference?
feedback welcome :)
-dv
diff refs/heads/master refs/heads/ocaml-4
commit - 4aa8f0d502946b9c12dc190e1ff27c02dba9cca5
commit + b26e117aba3d2931b28a8443b0ec65f12003c909
blob - 744f9992f6a1812450bcb4c2e96e483c25e87971
blob + 244c1b7315faa3a96849574ea5d05e78a7a22cd9
--- lang/ocaml/Makefile
+++ lang/ocaml/Makefile
@@ -2,7 +2,7 @@ COMMENT = ML language with complete class-based obj
# XXX Don't even think of updating ocaml alone.
# Do check that the ports that depend on it still work, or repair them.
-VERSION= 4.14.1
+VERSION= 4.14.2
# if the ocaml compiler gains support for BTI, as well as
# removing USE_NOBTCFI here (or changing to an arch-dependent
@@ -64,12 +64,6 @@ CONFIGURE_ARGS +=--enable-imprecise-c99-float-ops
LDFLAGS+= -Wl,-z,notext
.endif
-# We need to pass nobtcfi in LDFLAGS so that ocamlopt
-# will pick it up when building OCaml native binaries
-.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "arm64"
-LDFLAGS+= -Wl,-z,nobtcfi
-.endif
-
USE_GMAKE= Yes
WANTLIB = c m pthread
blob - 07c4adb25913fc8db722c8753fefbf55e7182ceb
blob + b2ed4b8eda49096b389cc1b7e95d69075810b55e
--- lang/ocaml/distinfo
+++ lang/ocaml/distinfo
@@ -1,4 +1,4 @@
SHA256 (ocaml-4.14-refman-html.tar.gz) =
+dILjzxXO797/JkVVzFHK5G5vwhOndK1U50q5HNAbKc=
-SHA256 (ocaml-4.14.1.tar.gz) = GDl53JwJyw9YCiMraFMaCbAlqmKLjY1ydEnxRv1vX+4=
+SHA256 (ocaml-4.14.2.tar.gz) = k7TzujnVWalj/BB0RWO0xukun/tUDOieXF6/dghrmfM=
SIZE (ocaml-4.14-refman-html.tar.gz) = 1982462
-SIZE (ocaml-4.14.1.tar.gz) = 5497979
+SIZE (ocaml-4.14.2.tar.gz) = 5504138
blob - 8e2f6dcfd97891503f2704b423fd429e5cb357d8 (mode 644)
blob + /dev/null
--- lang/ocaml/patches/patch-configure
+++ /dev/null
@@ -1,24 +0,0 @@
-Backport part of https://github.com/ocaml/ocaml/pull/12372/files
-Pointed out by avsm@
-
-Index: configure
configure.orig
-+++ configure
-@@ -14133,6 +14133,17 @@ if test -z "$mkmaindll"; then :
- mkmaindll=$mksharedlib
- fi
-
-+# Make sure code sections in OCaml-generated executables are readable
-+# (required for marshaling of function closures)
-+
-+case $host in #(
-+ *-*-openbsd7.[3-9]|*-*-openbsd[89].*) :
-+oc_ldflags="$oc_ldflags -Wl,--no-execute-only"
-+ natdynlinkopts="$natdynlinkopts -Wl,--no-execute-only" ;; #(
-+ *) :
-+ ;;
-+esac
-+
- # Configure native dynlink
-
- natdynlink=false
Re: sysutils/firmware/vmm: update to 1.16.2
Stuart Henderson writes: > On 2023/09/02 12:26, Dave Voutila wrote: >> >> $ make package >> >> # fw_update /usr/ports/packages/amd64/all/vmm-firmware-1.16.2p4.tgz >> >> >> >> works for me. >> >> Feedback? OK? >> > >> > Now with old REVISION removed. >> > >> >> Neither apply cleanly for me for some reason. Only one failing hunk: > > Does apply ok here. Try cleaning and reapplying with > > ftp -o- 'https://marc.info/?l=openbsd-ports=169367080404734=mbox' | patch > > Builds ok on i386 fwiw. Presumably it needs testing with a range of guest OS. Ah, thanks. That fixes it for me. Must be dangling whitespace or something my emacs config is zapping. Working for me on my system with amd64 -current, Debian 12, and Alpine 3.17 guests. Maybe collect a few more sanity checks, but ok dv@
Re: sysutils/firmware/vmm: update to 1.16.2
Klemens Nanni writes: > On Sat, Sep 02, 2023 at 05:06:04PM +0100, Klemens Nanni wrote: >> https://www.seabios.org/Releases#SeaBIOS_1.16.0 >> >> $ make package >> # fw_update /usr/ports/packages/amd64/all/vmm-firmware-1.16.2p4.tgz >> >> works for me. >> Feedback? OK? > > Now with old REVISION removed. > Neither apply cleanly for me for some reason. Only one failing hunk: Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -- |Index: patches/patch-src_boot_c |=== |RCS file: /cvs/ports/sysutils/firmware/vmm/patches/patch-src_boot_c,v |retrieving revision 1.4 |diff -u -p -r1.4 patch-src_boot_c |--- patches/patch-src_boot_c 7 Mar 2022 22:03:32 - 1.4 |+++ patches/patch-src_boot_c 2 Sep 2023 15:58:52 - -- Patching file patches/patch-src_boot_c using Plan A... Hunk #1 succeeded at 1. Hunk #2 succeeded at 10 with fuzz 1. Hunk #3 failed at 19. Hunk #4 succeeded at 28. 1 out of 4 hunks failed done
Re: [new] sysutils/lsblk
Benjamin Stürz writes: > Hi Omar, > > On 30.05.23 19:03, Omar Polo wrote: >> Hello, >> I remember that when I started using OpenBSD I kind of missed >> lsblk... >> Now I wouldn't look back probably, but it could be nice for newcommers >> (at least :-) > Yeah, that's the reason why I made this tool. > Using sysctl + disklabel + df is a little annoying. > >> Bummer that it needs superuser privileges to show the list, but I >> haven't looked at how it's implemented so don't know. > Actually if you do > # chgrp operator /usr/local/sbin/lsblk > # chmod g+s /usr/local/sbin/lslbk Adding a setguid program even in ports seems like a bad idea to me. > or > # make unroot > you can run it as a normal user. > > But I didn't know if I should include it in the port. > >> The port itself looks fine to me, except for the permissions of >> distinfo and PLIST... All files should be 0644 and directories 0755. > Fixed, the problem was my umask of 027. > >> No need to send an updated tarball just for this however, whoever will >> import it can easily fix it. > Did it anyway + for the reasons below. > >> OK op@ to import with perms fixed. >> Now, some misc nits that don't really affect the port: >> - you could set yourself as MAINTAINER for the port. It is not >> required of course, but seems you seem to be the upstream too >> you're qualified enough I'd say ;-) > Done > >> - I'd drop -Werror from release tarballs. While it is super-useful >> during development, it is a super-pita for packagers when the C >> compiler gets updated. > Done > > Best regards, > Benjamin Stürz > > [2. application/octet-stream; lsblk-1.2.3.tgz]...
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2022/12/30 12:27:53 Removed files: sysutils/firmware/vmm/patches: patch-src_fw_paravirt_h patch-src_post_c Log message: Forgot to remove the un-needed patch files.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2022/12/30 08:48:39 Modified files: sysutils/firmware/vmm: Makefile sysutils/firmware/vmm/patches: patch-src_fw_paravirt_c patch-src_fw_paravirt_h patch-src_optionroms_c patch-src_post_c Log message: Drop memory range and screen-debug patches in SeaBIOS. Now that vmd(8) supports communicating e820 ranges via fw_cfg, we No longer need the patches that make SeaBIOS identify the guest memory via the nvram registers. vmd(8) already communicates etc/screen-and-debug via fw_cfg as well, so drop that patch, too. OK sthen@, mlarkin@
update seabios (vmm-firmware) removing vmd memory hacks
ports@,
Just sent an email to tech@ about this, subject:
vmd(8): create a proper e820 bios memory map
https://marc.info/?l=openbsd-tech=167071344902372=2
In short, this nukes some old hacks we've been carrying to communicate
things like >4GB of memory to SeaBIOS via CMOS. It assumes vmd(8)
properly builds and conveys a bios e820 memory map via the fw_cfg api.
While nuking, I also ripped out the etc/screen-and-debug tweak as vmd
has been communicating that value (0) via fw_cfg for awhile now. There's
no need to patch that.
The below diff isn't ready to commit until the changes to vmm/vmd land
(assuming they do), but I wanted to share this for any testers and get
eyeballs on my approach.
btw, I'm not bumping the SeaBIOS version at all, just revision.
-dv
diff refs/heads/master refs/heads/seabios-e820
commit - 2e9128e724420d4d786f1537c31c67623878de0a
commit + e27c83b9ed21ac29efaa0a8b2d8238af95799b0c
blob - ba30a80601c23dfd2f64eaa489418518c1f75800
blob + 32d68c925aa891000fdf411899d58bbe3805f333
--- sysutils/firmware/vmm/Makefile
+++ sysutils/firmware/vmm/Makefile
@@ -17,7 +17,7 @@ REVISION= 0
FW_VER=1.14.0
SB_VER=20180715
DISTNAME= seabios-${FW_VER}
-REVISION= 0
+REVISION= 1
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
sgabios-${SB_VER}{72f39d48bedf044e202fd51fecf3e2218fc2ae66}.tar.gz:0
blob - 2382176b2d3b8f3ca809985fa0cafc40423a3a79
blob + f81983fb071984dafe9a24ff6781244dbcd0086d
--- sysutils/firmware/vmm/patches/patch-src_fw_paravirt_c
+++ sysutils/firmware/vmm/patches/patch-src_fw_paravirt_c
@@ -1,11 +1,9 @@
- Don't use 'rep insb' to read IO ports, vmm does not support that yet.
-- Allow detection of >4GB RAM. Normally seabios only allows this with the
- QEMU config device which VMM does not have.
Index: src/fw/paravirt.c
--- src/fw/paravirt.c.orig
+++ src/fw/paravirt.c
-@@ -310,7 +310,9 @@ qemu_cfg_read(void *buf, int len)
+@@ -310,6 +310,8 @@ qemu_cfg_read(void *buf, int len)
if (qemu_cfg_dma_enabled()) {
qemu_cfg_dma_transfer(buf, len, QEMU_CFG_DMA_CTL_READ);
} else {
@@ -15,23 +13,3 @@ Index: src/fw/paravirt.c
+ *d++ = inb(PORT_QEMU_CFG_DATA);
}
}
-
-@@ -515,6 +517,18 @@ qemu_cfg_e820(void)
- e820_add(0xfffbc000, 4*4096, E820_RESERVED);
- }
-
-+// Check for memory over 4Gig in cmos
-+u64 high = ((rtc_read(CMOS_MEM_HIGHMEM_LOW) << 16)
-+| ((u32)rtc_read(CMOS_MEM_HIGHMEM_MID) << 24)
-+| ((u64)rtc_read(CMOS_MEM_HIGHMEM_HIGH) << 32));
-+RamSizeOver4G = high;
-+e820_add(0x1ull, high, E820_RAM);
-+dprintf(1, "RamSizeOver4G: 0x%016llx [cmos]\n", RamSizeOver4G);
-+}
-+
-+void
-+vmm_check_high_mem(void)
-+{
- // Check for memory over 4Gig in cmos
- u64 high = ((rtc_read(CMOS_MEM_HIGHMEM_LOW) << 16)
- | ((u32)rtc_read(CMOS_MEM_HIGHMEM_MID) << 24)
blob - 06accf4cae866712fc782ccc6920e20184ee1957 (mode 644)
blob + /dev/null
--- sysutils/firmware/vmm/patches/patch-src_fw_paravirt_h
+++ /dev/null
@@ -1,12 +0,0 @@
-Allow detection of >4GB RAM. Normally seabios only allows this with the
-QEMU config device which VMM does not have.
-
-Index: src/fw/paravirt.h
src/fw/paravirt.h.orig
-+++ src/fw/paravirt.h
-@@ -75,4 +75,5 @@ int qemu_cfg_write_file(void *src, struct romfile_s *f
- int qemu_cfg_write_file_simple(void *src, u16 key, u32 offset, u32 len);
- u16 qemu_get_romfile_key(struct romfile_s *file);
-
-+void vmm_check_high_mem(void);
- #endif
blob - ac0a7376d85a599c2dba0703fdd0e499a9837bde
blob + 89b46991f85530edc0c2fb5c808c9c84a5ecdf5b
--- sysutils/firmware/vmm/patches/patch-src_optionroms_c
+++ sysutils/firmware/vmm/patches/patch-src_optionroms_c
@@ -1,25 +1,15 @@
- Needed for SGABIOS option ROM for VMM. Normally these are setup based on
the QEMU fw_cfg interface (or coreboot CBFS on hardware).
-- Turn off screen-and-debug to prevent double printing of chars.
Index: src/optionroms.c
--- src/optionroms.c.orig
+++ src/optionroms.c
@@ -387,7 +387,7 @@ optionrom_setup(void)
-
+
// All option roms found and deployed - now build BEV/BCV vectors.
-
+
-u32 pos = post_vga;
+u32 pos = BUILD_BIOS_ADDR - BUILD_ROM_START;
while (pos < rom_get_last()) {
struct rom_header *rom = (void*)pos;
if (! is_valid_rom(rom)) {
-@@ -461,7 +461,7 @@ vgarom_setup(void)
- EnforceChecksum = romfile_loadint("etc/optionroms-checksum", 1);
- S3ResumeVga = romfile_loadint("etc/s3-resume-vga-init", CONFIG_QEMU);
- RunPCIroms = romfile_loadint("etc/pci-optionrom-exec", 2);
--ScreenAndDebug = romfile_loadint("etc/screen-and-debug", 1);
-+ScreenAndDebug = romfile_loadint("etc/screen-and-debug", 0);
-
- // Clear option rom memory
- memset((void*)BUILD_ROM_START, 0, rom_get_max() - BUILD_ROM_START);
blob - b95bf5b010beb1dcbe4f508992a42b8d386a523c (mode 644)
blob + /dev/null
--- sysutils/firmware/vmm/patches/patch-src_post_c
+++ /dev/null
@@ -1,14 +0,0 @@
Re: chrome - not signed in
Dave Voutila writes: > Jan Stary writes: > >> This is current/amd64 running the latest chromium package. >> The user icon in the upper right corner says "not signed in", >> and indeed chrome does not sync. I don't see any place >> where I could sign in, but I know this used to work: >> I logged into my Google account when setting up sync. >> >> Now Settings > You and Google just calls me "Person 1" >> (renamable to whatever). >> >> Is anyone seeing the same? How do you log into >> your Google Account in Chrome? >> >> (I can even be logged into my Google account on the Google >> account webpage that Crhome is displaying, but from Chrome's >> point of view, I am still "Not signed in".) >> >> Jan > > I may be wrong, but I believe Google recently decided to only allow > access to the Google Sync API from their official Chrome builds and not > from Chromium. > Yup, see the following commit: https://marc.info/?l=openbsd-ports-cvs=161544126605997=2 The keys were removed http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/www/chromium/Makefile.diff?r1=1.550=1.551 -dv
Re: chrome - not signed in
Jan Stary writes: > This is current/amd64 running the latest chromium package. > The user icon in the upper right corner says "not signed in", > and indeed chrome does not sync. I don't see any place > where I could sign in, but I know this used to work: > I logged into my Google account when setting up sync. > > Now Settings > You and Google just calls me "Person 1" > (renamable to whatever). > > Is anyone seeing the same? How do you log into > your Google Account in Chrome? > > (I can even be logged into my Google account on the Google > account webpage that Crhome is displaying, but from Chrome's > point of view, I am still "Not signed in".) > > Jan I may be wrong, but I believe Google recently decided to only allow access to the Google Sync API from their official Chrome builds and not from Chromium. -dv
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2021/03/25 15:39:30 Modified files: geo/openbsd-developers: Makefile geo/openbsd-developers/files: OpenBSD Log message: Add myself ok mlarkin@
Add myself to openbsd-developers
Hi! Index: Makefile === RCS file: /cvs/ports/geo/openbsd-developers/Makefile,v retrieving revision 1.173 diff -u -p -a -u -r1.173 Makefile --- Makefile21 Nov 2020 01:50:57 - 1.173 +++ Makefile25 Mar 2021 21:32:54 - @@ -4,7 +4,7 @@ CATEGORIES= geo COMMENT= geographic location of past and present OpenBSD developers DISTNAME= openbsd-developers-2.0 -REVISION= 39 +REVISION= 40 DISTFILES= HOMEPAGE= https://www.openbsd.org/ Index: files/OpenBSD === RCS file: /cvs/ports/geo/openbsd-developers/files/OpenBSD,v retrieving revision 1.169 diff -u -p -a -u -r1.169 OpenBSD --- files/OpenBSD 21 Nov 2020 01:50:57 - 1.169 +++ files/OpenBSD 25 Mar 2021 21:32:54 - @@ -72,6 +72,7 @@ 44.01 -79.93 "ian" # Ian Darwin 44.1 -77.580556 "brynet"# Bryan Steele 44.432526.103889 "pirofti" # Paul Irofti +44.437481 -73.068176 "dv"# Dave Voutila 45.095683 -93.4982"jim" # Jim Razmus II 45.20025.7222 "ratchov" # Alexandre Ratchov 45.25135 3.19975 "miod" # Miod Vallat
[UPDATE] security/ccid 1.4.30
Hi, This patch updates the port of the chip/smart card interface driver port security/ccid to 1.4.30, released 19 September 2018. It adds support for additional card readers, updates reader names for common Yubikey models, and has a few bug fixes. I've also updated the HOMEPAGE and MASTER_SITES since it seems the original domain no longer resolves to an active website. The author has migrated their projects (like pcsc-lite) to another domain. Inline patch follows. -Dave Index: Makefile === RCS file: /cvs/ports/security/ccid/Makefile,v retrieving revision 1.27 diff -u -p -u -r1.27 Makefile --- Makefile6 Jun 2017 14:58:58 - 1.27 +++ Makefile6 Oct 2018 03:23:34 - @@ -2,13 +2,13 @@ COMMENT = USB Chip/Smart Card Interface Devices driver -DISTNAME = ccid-1.4.27 +DISTNAME = ccid-1.4.30 CATEGORIES = security -HOMEPAGE = http://pcsclite.alioth.debian.org/ccid.html +HOMEPAGE = https://ccid.apdu.fr -MASTER_SITES = https://alioth.debian.org/frs/download.php/latestfile/112/ +MASTER_SITES = https://ccid.apdu.fr/files/ EXTRACT_SUFX = .tar.bz2 Index: distinfo === RCS file: /cvs/ports/security/ccid/distinfo,v retrieving revision 1.20 diff -u -p -u -r1.20 distinfo --- distinfo6 Jun 2017 14:58:58 - 1.20 +++ distinfo6 Oct 2018 03:23:34 - @@ -1,2 +1,2 @@ -SHA256 (ccid-1.4.27.tar.bz2) = pmDiaWBphsuUhArVuoAv+wzSPdErmPaaNQNeDeud0Tc= -SIZE (ccid-1.4.27.tar.bz2) = 632817 +SHA256 (ccid-1.4.30.tar.bz2) = rBcIe+CIgKDN+ZqKJ5mk7wBNxv+gi02bCtmV85pT/3w= +SIZE (ccid-1.4.30.tar.bz2) = 642342 Index: patches/patch-src_Makefile_in === RCS file: /cvs/ports/security/ccid/patches/patch-src_Makefile_in,v retrieving revision 1.10 diff -u -p -u -r1.10 patch-src_Makefile_in --- patches/patch-src_Makefile_in 6 Jun 2017 14:58:58 - 1.10 +++ patches/patch-src_Makefile_in 6 Oct 2018 03:23:34 - @@ -1,4 +1,5 @@ -$OpenBSD: patch-src_Makefile_in,v 1.10 2017/06/06 14:58:58 dcoppa Exp $ +$OpenBSD$ + Index: src/Makefile.in --- src/Makefile.in.orig +++ src/Makefile.in @@ -11,18 +12,18 @@ Index: src/Makefile.in all: all-am @@ -1193,13 +1192,12 @@ install_ccid: libccid.la Info.plist - $(mkinstalldirs) $(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/ - cp Info.plist $(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/ - cp .libs/$(CCID_LIB) $(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/$(CCID_LIB) + $(mkinstalldirs) "$(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/" + cp Info.plist "$(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/" + cp .libs/$(CCID_LIB) "$(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/$(CCID_LIB)" - $(INSTALL_UDEV_RULE_FILE) install_ccidtwin: libccidtwin.la - $(mkinstalldirs) $(DESTDIR)$(ccidtwindir) - cp .libs/$(CCIDTWIN_LIB) $(DESTDIR)$(ccidtwindir)/$(CCIDTWIN_LIB) -- $(mkinstalldirs) $(DESTDIR)/$(serialconfdir) ; \ -- perl -ne "s|TARGET|$(ccidtwindir)/$(CCIDTWIN_LIB)| ; print" $(srcdir)/reader.conf.in > $(DESTDIR)/$(serialconfdir)/libccidtwin -+ $(mkinstalldirs) $(DESTDIR)$(datadir)/examples/ccid ; \ -+ perl -ne "s|TARGET|$(ccidtwindir)/$(CCIDTWIN_LIB)| ; print" $(srcdir)/reader.conf.in > $(DESTDIR)$(datadir)/examples/ccid/libccidtwin + $(mkinstalldirs) "$(DESTDIR)$(ccidtwindir)" + cp .libs/$(CCIDTWIN_LIB) "$(DESTDIR)$(ccidtwindir)/$(CCIDTWIN_LIB)" +- $(mkinstalldirs) "$(DESTDIR)/$(serialconfdir)" ; \ +- perl -ne "s|TARGET|$(ccidtwindir)/$(CCIDTWIN_LIB)| ; print" $(srcdir)/reader.conf.in > "$(DESTDIR)/$(serialconfdir)/libccidtwin" ++ $(mkinstalldirs) "$(DESTDIR)$(datadir)/examples/ccid" ; \ ++ perl -ne "s|TARGET|$(ccidtwindir)/$(CCIDTWIN_LIB)| ; print" $(srcdir)/reader.conf.in > "$(DESTDIR)$(datadir)/examples/ccid/libccidtwin" # do not uninstall the serial driver by default # use explicitely 'make uninstall_ccidtwin'
fyi for those using gnome on -current
tl;dr: wait a bit to update gnome3 or you should build from source If you're like me and follow -current and happened to do a `pkg_update -Uu` blindly in the last few days, you may have upgraded gnome3 to the latest (from 3.26). Currently it has potential to bork GDM and you won't get a login screen (I got a black screen with cursor). In my case, it seems the gnome-weather app/service was crashing at start-up...and for some gnome-ish reason it took down the whole gnome-shell. (Yes, startx with a blank .xinitrc work[s/ed] fine loading fvwm, so it wasn't xorg issues.) The good news is (for at least on my machine) some issues have already been identified and fixed by aja@ and jasperla@ (and reported upstream). Thanks to you two! -Dave
[NEW] sysutils/docker-machine 0.13.0
Hi ports@, I've recently ported docker-machine, the management client used to install Docker Engine on virtual hosts (local via Ubuntu or CentOS on VMM(4) or remote), and manage the hosts with docker-machine commands. For details on docker-machine: https://docs.docker.com/machine/overview/ --- Note: docker-machine is a different command than "docker," which many people know, provided by the Docker CLI project. The docker cli uses environment settings configurable by docker-machine (this port). I have a functioning build of docker cli and am currently working on the port. --- I've never created a port before, so I'm hoping I can get a few people to test and review. Please let me know what should be changed as I'm confident I missed something! For more details on some of the changes I've made to accomodate OpenBSD, please see my: - docker-machine fork: https://github.com/voutilad/machine/tree/openbsd - docker-cli fork: https://github.com/voutilad/cli/tree/openbsd (For those curious, you should be able to clone those and build them following the respective projects's build procedure, assuming you've installed lang/go.) Some things to note in the currently proposed version of the port: - "make test" should run the equivalent of the docker-machine project's test suite including linters, yet currenly it cannot perform integration tests - there is currently no manpage...the upstream project doesn't have one I've begun trying to upstream some changes and have PR's open with Docker, which I'm sure will be met with requests to further upstream to dependent Go packages. This will be a process. In the mean time, I'll be working on hacking together the port of docker cli. -Dave docker-machine.tar.gz Description: GNU Zip compressed data
