Re: [new] lang/mlton
Hi ports@, Please help to review and test the port. Maybe someone is ready to import it into CVS? There is also a new port for Ur/Web language and framework, [1], which depends on MLton. [1]: http://marc.info/?t=14657986342&r=1&w=2 On Fri, 17 Jun 2016 18:00:13 +1200 m...@extensibl.com wrote: <..> > I have fixed Makefile patch, so the installer does not gzip man pages > anymore. Updated port archive is attached. > > All changes could be tracked at [1]. > > [1]: https://github.com/extensibl/ports > > Best, > Alex mlton.tar.gz Description: application/gzip
Re: Cant unlock the screen with slock
On Tue, Jul 05, 2016 at 11:53:50PM +0200, Nils Reuße wrote: > Hi, > > i'm using slock to lock my screen. However, since i updated to the latest > snap, slock won't let me unlock the screen. When started from a terminal, > for each failed try it outputs > > slock: invalid script: /usr/libexec/auth/login_passwd > > (the password i enter is correct, obviously). > > Here are the file permissions, slock has sgid set, login_passwd suid: > > $ ls -l /usr/local/bin/slock > -rwxr-sr-x 1 root auth 12432 Jul 2 16:08 /usr/local/bin/slock > > $ doas ls -l /usr/libexec/auth/login_passwd > -r-sr-xr-x 1 root auth 8736 Jul 5 04:33 /usr/libexec/auth/login_passwd > > /usr/local ist mounted with wxallowed. Any hints? > Check ownership and permissions of '/' '/usr' '/usr/libexec' and '/usr/libexec/auth' as well. The error is caused by securepath(3) failing. -- Matthieu Herrb signature.asc Description: PGP signature
Re: Update Samba 4.4.4
ping Ian McWilliam From: owner-po...@openbsd.org [owner-po...@openbsd.org] on behalf of Ian Mcwilliam [i.mcwill...@westernsydney.edu.au] Sent: Thursday, 23 June 2016 9:44 AM To: ports@openbsd.org Subject: Update Samba 4.4.4 Here's an update for Samba 4.4.4. Seems to be a bug fix update no CVE's seen. https://www.samba.org/samba/history/samba-4.4.4.html Tests welcome. Ian McWilliam
Re: UPDATE: mail/p5-Mail-DMARC
On 2016/07/06 00:05, Giovanni Bechis wrote: > On Tue, Jul 05, 2016 at 10:29:53PM +0100, Stuart Henderson wrote: > > On 2016/07/05 18:00, Giovanni Bechis wrote: > > > +++ pkg/PLIST 5 Jul 2016 15:09:22 - > > > @@ -7,6 +7,7 @@ bin/dmarc_send_reports > > > bin/dmarc_update_public_suffix_list > > > bin/dmarc_view_reports > > > @comment bin/install_deps.pl > > > +${P5SITE}/Mail/ > > > ${P5SITE}/Mail/DMARC/ > > > ${P5SITE}/Mail/DMARC.pm > > > ${P5SITE}/Mail/DMARC/Base.pm > > > @@ -40,6 +41,9 @@ ${P5SITE}/Mail/DMARC/Report/URI.pm > > > ${P5SITE}/Mail/DMARC/Result/ > > > ${P5SITE}/Mail/DMARC/Result.pm > > > ${P5SITE}/Mail/DMARC/Result/Reason.pm > > > +${P5SITE}/auto/ > > > +${P5SITE}/auto/share/ > > > +${P5SITE}/auto/share/dist/ > > > ${P5SITE}/auto/share/dist/Mail-DMARC/ > > > ${P5SITE}/auto/share/dist/Mail-DMARC/dmarc_whitelist > > > ${P5SITE}/auto/share/dist/Mail-DMARC/html/ > > > > I'm not sure why update-plist added these directories, they come > > from dependencies already? > > > > devel/p5-File-ShareDir > > /usr/local/libdata/perl5/site_perl/auto/share/dist/ > > > > mail/p5-Mail-Tools via p5-Mail-DKIM > > /usr/local/libdata/perl5/site_perl/Mail/ > > > I do not know the reason, but running update-plist on shells/zoidberg gives > the same "problem". > Building the same port on 5.9 make update-plist does not add those entries. > Could it be perl related (I am on perl 5.20.3 atm) ? It doesn't add them on -current for me (I am on 5.20.3 as well), P5SITE doesn't use the version number so it shouldn't be due to this. OK sthen without the PLIST change.
Re: UPDATE: mail/p5-Mail-DMARC
On Tue, Jul 05, 2016 at 10:29:53PM +0100, Stuart Henderson wrote: > On 2016/07/05 18:00, Giovanni Bechis wrote: > > +++ pkg/PLIST 5 Jul 2016 15:09:22 - > > @@ -7,6 +7,7 @@ bin/dmarc_send_reports > > bin/dmarc_update_public_suffix_list > > bin/dmarc_view_reports > > @comment bin/install_deps.pl > > +${P5SITE}/Mail/ > > ${P5SITE}/Mail/DMARC/ > > ${P5SITE}/Mail/DMARC.pm > > ${P5SITE}/Mail/DMARC/Base.pm > > @@ -40,6 +41,9 @@ ${P5SITE}/Mail/DMARC/Report/URI.pm > > ${P5SITE}/Mail/DMARC/Result/ > > ${P5SITE}/Mail/DMARC/Result.pm > > ${P5SITE}/Mail/DMARC/Result/Reason.pm > > +${P5SITE}/auto/ > > +${P5SITE}/auto/share/ > > +${P5SITE}/auto/share/dist/ > > ${P5SITE}/auto/share/dist/Mail-DMARC/ > > ${P5SITE}/auto/share/dist/Mail-DMARC/dmarc_whitelist > > ${P5SITE}/auto/share/dist/Mail-DMARC/html/ > > I'm not sure why update-plist added these directories, they come > from dependencies already? > > devel/p5-File-ShareDir > /usr/local/libdata/perl5/site_perl/auto/share/dist/ > > mail/p5-Mail-Tools via p5-Mail-DKIM > /usr/local/libdata/perl5/site_perl/Mail/ > I do not know the reason, but running update-plist on shells/zoidberg gives the same "problem". Building the same port on 5.9 make update-plist does not add those entries. Could it be perl related (I am on perl 5.20.3 atm) ? Cheers Giovanni
Cant unlock the screen with slock
Hi, i'm using slock to lock my screen. However, since i updated to the latest snap, slock won't let me unlock the screen. When started from a terminal, for each failed try it outputs slock: invalid script: /usr/libexec/auth/login_passwd (the password i enter is correct, obviously). Here are the file permissions, slock has sgid set, login_passwd suid: $ ls -l /usr/local/bin/slock -rwxr-sr-x 1 root auth 12432 Jul 2 16:08 /usr/local/bin/slock $ doas ls -l /usr/libexec/auth/login_passwd -r-sr-xr-x 1 root auth 8736 Jul 5 04:33 /usr/libexec/auth/login_passwd /usr/local ist mounted with wxallowed. Any hints? - Nils
Re: UPDATE: mail/p5-Mail-DMARC
On 2016/07/05 18:00, Giovanni Bechis wrote: > +++ pkg/PLIST 5 Jul 2016 15:09:22 - > @@ -7,6 +7,7 @@ bin/dmarc_send_reports > bin/dmarc_update_public_suffix_list > bin/dmarc_view_reports > @comment bin/install_deps.pl > +${P5SITE}/Mail/ > ${P5SITE}/Mail/DMARC/ > ${P5SITE}/Mail/DMARC.pm > ${P5SITE}/Mail/DMARC/Base.pm > @@ -40,6 +41,9 @@ ${P5SITE}/Mail/DMARC/Report/URI.pm > ${P5SITE}/Mail/DMARC/Result/ > ${P5SITE}/Mail/DMARC/Result.pm > ${P5SITE}/Mail/DMARC/Result/Reason.pm > +${P5SITE}/auto/ > +${P5SITE}/auto/share/ > +${P5SITE}/auto/share/dist/ > ${P5SITE}/auto/share/dist/Mail-DMARC/ > ${P5SITE}/auto/share/dist/Mail-DMARC/dmarc_whitelist > ${P5SITE}/auto/share/dist/Mail-DMARC/html/ I'm not sure why update-plist added these directories, they come from dependencies already? devel/p5-File-ShareDir /usr/local/libdata/perl5/site_perl/auto/share/dist/ mail/p5-Mail-Tools via p5-Mail-DKIM /usr/local/libdata/perl5/site_perl/Mail/
Re: [NEW] emulators/virtualjaguar
On Mon, Jun 27, 2016, at 03:11 PM, Adam Wolk wrote: > On Sat, 18 Jun 2016 15:46:33 +0200 > Frederic Cambus wrote: > > > Hi ports@, > > > > Here is a new port, for Virtual Jaguar. > > > From DESCR: > > > > Virtual Jaguar is a portable Atari Jaguar emulator. The software was > > originally developed by David Raingeard of Potato Emulation. > > > > Currently all the major subsystems found in a real Jaguar are emulated > > to some degree. > > > > Tested on amd64 -current > Initially I wondered why the pre-configure step instead of devel/cmake > but I see the linking phase fails when using the module instead of the > pre-configure step. > > The port builds and installs cleanly. I did notice that upstream > provides a .desktop file that can be used for menu entries but I don't > see an icon that would be decent enough to use... I also check > archlinux packaging and netbsd - none of them ship the .desktop entry. > > I did try 3 roms with the port. > - Doom world (failed, most I got out of it was loading splash screen) > - Wolfestein 3D World (failed, black screen) > - Doubel dragon (fully working) > > The failed ports were failed emulation. Log shows illegal instructions > etc. I don't think it's caused by packaging. > > I am OK awolk@ to import this in the current state. > OK abieber@ (with same stipulation as hatari :D)
Re: [NEW] emulators/hatari
On Thu, Jun 23, 2016, at 02:33 PM, Adam Wolk wrote: > On Thu, 23 Jun 2016 22:23:25 +0200 > Frederic Cambus wrote: > > > On Wed, Jun 22, 2016 at 08:14:37PM +0200, Adam Wolk wrote: > > > > > > I think the CMakeLists in this port still need some work. It tries > > > to touch stuff outside the fake directory on `make fake` step. > > > > Indeed, you are right. New tarball attached : > > > > - Added a patch to fix the issue you mentioned > > - Added missing RUN_DEPENDS on mtools (required for zip2st additional > > tool) > > - Added a pre-configure target to replace an hardcoded /usr/share > > occurence in a man page > > > > Also, bundled tool atari-hd-image.sh is unusable on OpenBSD because it > > requires 'mkdosfs' and cannot be patched to use 'newfs_msdos' as a > > required option is missing, so avoid installing program + manpage. > > > > OK awolk@ on latest tarball. OK abieber@ (assuming we are still good to import stuff!) > > Regards, > Adam >
Re: [Update] Gnupg 2.1.13
Excellent! I will test on amd64 and macppc32 with a YubiKey in SmartCard mode. > On Jul 5, 2016, at 4:48 AM, David Coppa wrote: > > Here's my version. > > Works well for me, and I've also tested smartcard support with my > Gemalto Gemplus USB SmartCard Reader.
Re: NEW: audio/kid3
On 07/05/16 11:16, Adam Wolk wrote: > On Tue, 5 Jul 2016 11:10:46 -0500 > Aaron Poffenberger wrote: > >> On 06/30/16 11:23, Adam Wolk wrote: >>> On Tue, 28 Jun 2016 19:27:33 -0500 >>> Aaron Poffenberger wrote: >>> Hello ports@, Here is a new port : audio/kid3 Tested on: amd64. From DESCR: Kid3 is an application to edit the ID3v1 and ID3v2 tags in MP3 files in an efficient way. Also tags in Ogg/Vorbis, Opus, DSF, FLAC, MPC, APE, MP4/AAC, MP2, Speex, TrueAudio, WavPack, WMA, WAV, AIFF files and tracker modules (MOD, S3M, IT, XM) are supported. It is easy to set tags of multiple files to the same values (e.g. album, artist, year and genre in all files of the same album) and generate the tags from the file name or vice versa. --- Port Notes: The app compiles under qt4, qt5 and KDE. It also has a cli version. I ported it for qt4 and cli only. The description doesn't mention it, but the app can also playback many formats (ALAC being the notable exception). I ported it *with* the playback features enabled. Cheers, Aaron >>> >>> Tested on amd64. I had two issues: >>> >>> Error: Your GStreamer installation is missing a plug-in. >>> Error: GStreamer encountered a general stream error. >>> Error: GStreamer encountered a general stream error. >>> Error: GStreamer encountered a general stream error. >>> Error: Your GStreamer installation is missing a plug-in. >>> Error: GStreamer encountered a general stream error. >>> Error: Your GStreamer installation is missing a plug-in. >>> Error: GStreamer encountered a general stream error. >>> >>> When trying to use File -> Import from Musicbrainz Fingerprint... >>> >>> and a HUGE performance lock on my box (maxed CPU's, swapping) when >>> trying: >>> >>> File -> Automatic import... >>> >>> Everything else seem fine. >>> >>> Regards, >>> Adam >>> >> Hi Adam, >> Here's the new version we tested offline. >> >> Cheers, >> >> --Aaron >> > > That's OK awolk@ to import. > > No longer locks up my machine, I still get gstreamer warnings and can't > play back audio but the main functionality of tag editing and > auto importing works. Tested on a Jul 3 amd64 snapshot. > > Regards, > Adam > Thanks Adam! For anyone else who has time to test, Adam and I iterated over some ideas and known issue. I rebuilt the project multiple times trying to recreate the gstreamer issues. Assuming the project builds against gstreamer-0.10, then it always works for me. If someone else has time to try it, I'd appreciate the feedback. Two machine builds just aren't enough to determine whether it's an issue with the port. That said, if we can't sort out the gstreamer issues I can always disable playback altogether. Editing id3 tags is the key feature I'm after. --Aaron
Re: NEW: audio/kid3
On Tue, 5 Jul 2016 11:10:46 -0500 Aaron Poffenberger wrote: > On 06/30/16 11:23, Adam Wolk wrote: > > On Tue, 28 Jun 2016 19:27:33 -0500 > > Aaron Poffenberger wrote: > > > >> Hello ports@, > >> > >> Here is a new port : audio/kid3 > >> > >> Tested on: amd64. > >> > >> From DESCR: > >> > >> Kid3 is an application to edit the ID3v1 and ID3v2 tags in MP3 > >> files in an efficient way. Also tags in Ogg/Vorbis, Opus, DSF, > >> FLAC, MPC, APE, MP4/AAC, MP2, Speex, TrueAudio, WavPack, WMA, WAV, > >> AIFF files and tracker modules (MOD, S3M, IT, XM) are supported. > >> It is easy to set tags of multiple files to the same values (e.g. > >> album, artist, year and genre in all files of the same album) and > >> generate the tags from the file name or vice versa. > >> > >> --- > >> Port Notes: > >> > >> The app compiles under qt4, qt5 and KDE. It also has a cli > >> version. I ported it for qt4 and cli only. > >> > >> The description doesn't mention it, but the app can also playback > >> many formats (ALAC being the notable exception). I ported it > >> *with* the playback features enabled. > >> > >> Cheers, > >> Aaron > >> > > > > Tested on amd64. I had two issues: > > > > Error: Your GStreamer installation is missing a plug-in. > > Error: GStreamer encountered a general stream error. > > Error: GStreamer encountered a general stream error. > > Error: GStreamer encountered a general stream error. > > Error: Your GStreamer installation is missing a plug-in. > > Error: GStreamer encountered a general stream error. > > Error: Your GStreamer installation is missing a plug-in. > > Error: GStreamer encountered a general stream error. > > > > When trying to use File -> Import from Musicbrainz Fingerprint... > > > > and a HUGE performance lock on my box (maxed CPU's, swapping) when > > trying: > > > > File -> Automatic import... > > > > Everything else seem fine. > > > > Regards, > > Adam > > > Hi Adam, > Here's the new version we tested offline. > > Cheers, > > --Aaron > That's OK awolk@ to import. No longer locks up my machine, I still get gstreamer warnings and can't play back audio but the main functionality of tag editing and auto importing works. Tested on a Jul 3 amd64 snapshot. Regards, Adam
Re: NEW: audio/kid3
On 06/30/16 11:23, Adam Wolk wrote: > On Tue, 28 Jun 2016 19:27:33 -0500 > Aaron Poffenberger wrote: > >> Hello ports@, >> >> Here is a new port : audio/kid3 >> >> Tested on: amd64. >> >> From DESCR: >> >> Kid3 is an application to edit the ID3v1 and ID3v2 tags in MP3 files >> in an efficient way. Also tags in Ogg/Vorbis, Opus, DSF, FLAC, MPC, >> APE, MP4/AAC, MP2, Speex, TrueAudio, WavPack, WMA, WAV, AIFF files and >> tracker modules (MOD, S3M, IT, XM) are supported. It is easy to set >> tags of multiple files to the same values (e.g. album, artist, year >> and genre in all files of the same album) and generate the tags from >> the file name or vice versa. >> >> --- >> Port Notes: >> >> The app compiles under qt4, qt5 and KDE. It also has a cli version. I >> ported it for qt4 and cli only. >> >> The description doesn't mention it, but the app can also playback many >> formats (ALAC being the notable exception). I ported it *with* the >> playback features enabled. >> >> Cheers, >> Aaron >> > > Tested on amd64. I had two issues: > > Error: Your GStreamer installation is missing a plug-in. > Error: GStreamer encountered a general stream error. > Error: GStreamer encountered a general stream error. > Error: GStreamer encountered a general stream error. > Error: Your GStreamer installation is missing a plug-in. > Error: GStreamer encountered a general stream error. > Error: Your GStreamer installation is missing a plug-in. > Error: GStreamer encountered a general stream error. > > When trying to use File -> Import from Musicbrainz Fingerprint... > > and a HUGE performance lock on my box (maxed CPU's, swapping) when > trying: > > File -> Automatic import... > > Everything else seem fine. > > Regards, > Adam > Hi Adam, Here's the new version we tested offline. Cheers, --Aaron kid3-3.4.1.tgz Description: Binary data
UPDATE: mail/p5-Mail-DMARC
Update to latest version and take maintainership, ok ? Cheers Giovanni Index: Makefile === RCS file: /var/cvs/ports/mail/p5-Mail-DMARC/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- Makefile 29 Apr 2016 12:54:02 - 1.6 +++ Makefile 5 Jul 2016 15:11:34 - @@ -2,8 +2,8 @@ COMMENT= Perl implementation of DMARC -DISTNAME= Mail-DMARC-1.20150908 -REVISION= 0 +DISTNAME= Mail-DMARC-1.20160612 +MAINTAINER= Giovanni Bechis CATEGORIES= mail Index: distinfo === RCS file: /var/cvs/ports/mail/p5-Mail-DMARC/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo 26 Jan 2016 22:10:48 - 1.2 +++ distinfo 5 Jul 2016 15:08:56 - @@ -1,2 +1,2 @@ -SHA256 (Mail-DMARC-1.20150908.tar.gz) = FtzOUMxTUIVwt3eJ0S+pcsow/pA/OVk7tQ84SPKyDk8= -SIZE (Mail-DMARC-1.20150908.tar.gz) = 720935 +SHA256 (Mail-DMARC-1.20160612.tar.gz) = hZpb7AHZupQdb/6hhfPaHKqBFtMtI8++VRFGLXsUtRs= +SIZE (Mail-DMARC-1.20160612.tar.gz) = 721573 Index: pkg/PLIST === RCS file: /var/cvs/ports/mail/p5-Mail-DMARC/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 26 Jan 2016 22:10:48 - 1.2 +++ pkg/PLIST 5 Jul 2016 15:09:22 - @@ -7,6 +7,7 @@ bin/dmarc_send_reports bin/dmarc_update_public_suffix_list bin/dmarc_view_reports @comment bin/install_deps.pl +${P5SITE}/Mail/ ${P5SITE}/Mail/DMARC/ ${P5SITE}/Mail/DMARC.pm ${P5SITE}/Mail/DMARC/Base.pm @@ -40,6 +41,9 @@ ${P5SITE}/Mail/DMARC/Report/URI.pm ${P5SITE}/Mail/DMARC/Result/ ${P5SITE}/Mail/DMARC/Result.pm ${P5SITE}/Mail/DMARC/Result/Reason.pm +${P5SITE}/auto/ +${P5SITE}/auto/share/ +${P5SITE}/auto/share/dist/ ${P5SITE}/auto/share/dist/Mail-DMARC/ ${P5SITE}/auto/share/dist/Mail-DMARC/dmarc_whitelist ${P5SITE}/auto/share/dist/Mail-DMARC/html/
Re: Update ocaml-cmdliner to 0.9.8
On 2016-07-05 Anil Madhavapeddy wrote: > ok avsm, but doesn't this require bumping the REVISIONs of everything > that depends on cmdliner as well? according to $ sqlite3 /usr/local/share/sqlports 'select * from Depends where DEPENDSPATH = "devel/ocaml-cmdliner"' sysutils/opam,-main|devel/ocaml-cmdliner|||devel/ocaml-cmdliner|B sysutils/opam,-lib|devel/ocaml-cmdliner|||devel/ocaml-cmdliner|B only opam (build!) depends on ocaml-cmdliner. So ok chrisz@ > Anil > > > On 5 Jul 2016, at 14:29, Kenneth R Westerback > > wrote: > > > > Trivial (?) update to latest ocaml-cmdliner, an opam dependency. > > > > This brings cmdliner up to the version that opam itself installs, > > if you use opam to install cmdliner. > > > > ok? > > > > Ken > > > > Index: Makefile > > === > > RCS file: /cvs/ports/devel/ocaml-cmdliner/Makefile,v > > retrieving revision 1.3 > > diff -u -p -r1.3 Makefile > > --- Makefile23 Jun 2016 19:23:53 - 1.3 > > +++ Makefile3 Jul 2016 12:22:02 - > > @@ -3,13 +3,12 @@ > > COMMENT = declarative definition of command line interfaces > > CATEGORIES =devel > > > > -V =0.9.7 > > +V =0.9.8 > > NAME = cmdliner > > DISTNAME = ${NAME}-${V} > > EXTRACT_SUFX = .tbz > > PKGNAME = ocaml-${DISTNAME} > > MASTER_SITES = http://erratique.ch/software/${NAME}/releases/ > > -REVISION = 0 > > > > HOMEPAGE = http://erratique.ch/software/${NAME} > > > > Index: distinfo > > === > > RCS file: /cvs/ports/devel/ocaml-cmdliner/distinfo,v > > retrieving revision 1.2 > > diff -u -p -r1.2 distinfo > > --- distinfo30 Aug 2015 15:57:25 - 1.2 > > +++ distinfo2 Jul 2016 19:08:24 - > > @@ -1,2 +1,2 @@ > > -SHA256 (cmdliner-0.9.7.tbz) = > > nBmJPP+108NGnuDM6F4+7roX0wmzO5rOMaugb2jwv3o= -SIZE > > (cmdliner-0.9.7.tbz) = 50343 +SHA256 (cmdliner-0.9.8.tbz) = > > ffqv3YjsnZar+N7UwOpxEZSBlEACIKVuS7RKHt+kvUE= +SIZE > > (cmdliner-0.9.8.tbz) = 53249 Index: pkg/PLIST > > === > > RCS file: /cvs/ports/devel/ocaml-cmdliner/pkg/PLIST,v > > retrieving revision 1.1.1.1 > > diff -u -p -r1.1.1.1 PLIST > > --- pkg/PLIST 25 Oct 2014 16:50:30 - 1.1.1.1 > > +++ pkg/PLIST 2 Jul 2016 19:08:42 - > > @@ -19,6 +19,7 @@ share/doc/ocaml-cmdliner/api/index_attri > > share/doc/ocaml-cmdliner/api/index_class_types.html > > share/doc/ocaml-cmdliner/api/index_classes.html > > share/doc/ocaml-cmdliner/api/index_exceptions.html > > +share/doc/ocaml-cmdliner/api/index_extensions.html > > share/doc/ocaml-cmdliner/api/index_methods.html > > share/doc/ocaml-cmdliner/api/index_module_types.html > > share/doc/ocaml-cmdliner/api/index_modules.html > > > -- http://gmerlin.de OpenPGP: http://gmerlin.de/christopher.pub 2779 7F73 44FD 0736 B67A C410 69EC 7922 34B4 2566 pgp0vaZb_kTEX.pgp Description: OpenPGP digital signature
Re: Update ocaml-cmdliner to 0.9.8
ok avsm, but doesn't this require bumping the REVISIONs of everything that depends on cmdliner as well? Anil > On 5 Jul 2016, at 14:29, Kenneth R Westerback wrote: > > Trivial (?) update to latest ocaml-cmdliner, an opam dependency. > > This brings cmdliner up to the version that opam itself installs, if you > use opam to install cmdliner. > > ok? > > Ken > > Index: Makefile > === > RCS file: /cvs/ports/devel/ocaml-cmdliner/Makefile,v > retrieving revision 1.3 > diff -u -p -r1.3 Makefile > --- Makefile 23 Jun 2016 19:23:53 - 1.3 > +++ Makefile 3 Jul 2016 12:22:02 - > @@ -3,13 +3,12 @@ > COMMENT = declarative definition of command line interfaces > CATEGORIES = devel > > -V = 0.9.7 > +V = 0.9.8 > NAME =cmdliner > DISTNAME =${NAME}-${V} > EXTRACT_SUFX =.tbz > PKGNAME = ocaml-${DISTNAME} > MASTER_SITES =http://erratique.ch/software/${NAME}/releases/ > -REVISION = 0 > > HOMEPAGE =http://erratique.ch/software/${NAME} > > Index: distinfo > === > RCS file: /cvs/ports/devel/ocaml-cmdliner/distinfo,v > retrieving revision 1.2 > diff -u -p -r1.2 distinfo > --- distinfo 30 Aug 2015 15:57:25 - 1.2 > +++ distinfo 2 Jul 2016 19:08:24 - > @@ -1,2 +1,2 @@ > -SHA256 (cmdliner-0.9.7.tbz) = nBmJPP+108NGnuDM6F4+7roX0wmzO5rOMaugb2jwv3o= > -SIZE (cmdliner-0.9.7.tbz) = 50343 > +SHA256 (cmdliner-0.9.8.tbz) = ffqv3YjsnZar+N7UwOpxEZSBlEACIKVuS7RKHt+kvUE= > +SIZE (cmdliner-0.9.8.tbz) = 53249 > Index: pkg/PLIST > === > RCS file: /cvs/ports/devel/ocaml-cmdliner/pkg/PLIST,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 PLIST > --- pkg/PLIST 25 Oct 2014 16:50:30 - 1.1.1.1 > +++ pkg/PLIST 2 Jul 2016 19:08:42 - > @@ -19,6 +19,7 @@ share/doc/ocaml-cmdliner/api/index_attri > share/doc/ocaml-cmdliner/api/index_class_types.html > share/doc/ocaml-cmdliner/api/index_classes.html > share/doc/ocaml-cmdliner/api/index_exceptions.html > +share/doc/ocaml-cmdliner/api/index_extensions.html > share/doc/ocaml-cmdliner/api/index_methods.html > share/doc/ocaml-cmdliner/api/index_module_types.html > share/doc/ocaml-cmdliner/api/index_modules.html >
Re: [NEW] sysutils/sysmon
On 06/26/16 22:09, George Rosamond wrote: > On 06/21/16 05:34, Stuart Henderson wrote: >> Could you either fix the net-snmp detection or explicitly disable >> it like this please? >> >> CONFIGURE_ENV = ac_cv_header_net_snmp_version_h=no >> >> A few things about share/examples/sysmon/sysmon.conf.dist, >> >> - should probably be @sample'd into ${SYSCONFDIR}/sysmon.conf, >> if not then at least it wants an @extra ${SYSCONFDIR}/sysmon.conf >> in PLIST. >> >> - patch to replace /usr/local/htdocs/index.html with something >> better, calling it index.html is probably bad so maybe >> /var/www/htdocs/sysmon.html > > Fixed as per above. > > Updated version attached. > ping. g sysmon.tgz Description: Binary data
apache-httpd update (2.4.23)
Lots of fixes, mostly for mod_http2, but a few others. http://www.apache.org/dist/httpd/CHANGES_2.4.23 Any test reports / OKs? Index: Makefile === RCS file: /cvs/ports/www/apache-httpd/Makefile,v retrieving revision 1.79 diff -u -p -r1.79 Makefile --- Makefile22 Jun 2016 18:52:16 - 1.79 +++ Makefile5 Jul 2016 13:35:59 - @@ -3,7 +3,7 @@ COMMENT-main= apache HTTP server COMMENT-common=/var/www files for Apache HTTPd -V= 2.4.20 +V= 2.4.23 DISTNAME= httpd-${V} PKGNAME= apache-httpd-${V} @@ -11,9 +11,6 @@ PKGNAME-main= ${PKGNAME} FULLPKGNAME-common=apache-httpd-common-${V} FULLPKGPATH-common=www/apache-httpd,-common -REVISION-main= 2 -REVISION-common= 1 - CATEGORIES=www net HOMEPAGE= http://httpd.apache.org/ @@ -62,6 +59,7 @@ CONFIGURE_ARGS= --enable-layout=OpenBSD --enable-disk-cache \ --enable-http2 \ --enable-proxy=shared \ + --enable-proxy-fdpass \ --enable-mods-shared=all \ --enable-cgi \ --enable-suexec \ Index: distinfo === RCS file: /cvs/ports/www/apache-httpd/distinfo,v retrieving revision 1.22 diff -u -p -r1.22 distinfo --- distinfo28 Apr 2016 08:40:42 - 1.22 +++ distinfo5 Jul 2016 13:35:59 - @@ -1,2 +1,2 @@ -SHA256 (httpd-2.4.20.tar.gz) = 53SCpG5baXG6YYG3GjwO0dvz+oOBC/dnxjIPDGISYeQ= -SIZE (httpd-2.4.20.tar.gz) = 8299011 +SHA256 (httpd-2.4.23.tar.gz) = txoT9WuAYca0CG/cyf/d3ZBESXNerewPDilH4z7skdc= +SIZE (httpd-2.4.23.tar.gz) = 8406575 Index: pkg/PLIST-main === RCS file: /cvs/ports/www/apache-httpd/pkg/PLIST-main,v retrieving revision 1.14 diff -u -p -r1.14 PLIST-main --- pkg/PLIST-main 28 Apr 2016 18:22:17 - 1.14 +++ pkg/PLIST-main 5 Jul 2016 13:35:59 - @@ -147,6 +147,7 @@ lib/apache2/mod_proxy_express.so lib/apache2/mod_proxy_fcgi.so lib/apache2/mod_proxy_fdpass.so lib/apache2/mod_proxy_ftp.so +lib/apache2/mod_proxy_hcheck.so lib/apache2/mod_proxy_html.so lib/apache2/mod_proxy_http.so lib/apache2/mod_proxy_scgi.so @@ -304,6 +305,7 @@ share/doc/apache2/expr.html.fr share/doc/apache2/faq/ share/doc/apache2/faq/index.html share/doc/apache2/faq/index.html.en +share/doc/apache2/faq/index.html.es share/doc/apache2/faq/index.html.fr share/doc/apache2/faq/index.html.tr.utf8 share/doc/apache2/faq/index.html.zh-cn.utf8 @@ -354,6 +356,8 @@ share/doc/apache2/howto/htaccess.html.fr share/doc/apache2/howto/htaccess.html.ja.utf8 share/doc/apache2/howto/htaccess.html.ko.euc-kr share/doc/apache2/howto/htaccess.html.pt-br +share/doc/apache2/howto/http2.html +share/doc/apache2/howto/http2.html.en share/doc/apache2/howto/index.html share/doc/apache2/howto/index.html.en share/doc/apache2/howto/index.html.fr @@ -837,12 +841,16 @@ share/doc/apache2/mod/mod_proxy_fdpass.h share/doc/apache2/mod/mod_proxy_ftp.html share/doc/apache2/mod/mod_proxy_ftp.html.en share/doc/apache2/mod/mod_proxy_ftp.html.fr +share/doc/apache2/mod/mod_proxy_hcheck.html +share/doc/apache2/mod/mod_proxy_hcheck.html.en share/doc/apache2/mod/mod_proxy_html.html share/doc/apache2/mod/mod_proxy_html.html.en share/doc/apache2/mod/mod_proxy_html.html.fr share/doc/apache2/mod/mod_proxy_http.html share/doc/apache2/mod/mod_proxy_http.html.en share/doc/apache2/mod/mod_proxy_http.html.fr +share/doc/apache2/mod/mod_proxy_http2.html +share/doc/apache2/mod/mod_proxy_http2.html.en share/doc/apache2/mod/mod_proxy_scgi.html share/doc/apache2/mod/mod_proxy_scgi.html.en share/doc/apache2/mod/mod_proxy_scgi.html.fr
Re: patch for net/netatalk and net/netatalk3
Thanks for looking into this. On Tue, Jul 05, 2016 at 02:19:34PM +0100, Stuart Henderson wrote: [...] > > + memset(ibuf, 0, 255); > > +-if ( strcmp( p, dhxpwd->pw_passwd ) == 0 ) { > > ++if ( (p != NULL) && (strcmp( p, dhxpwd->pw_passwd ) == 0) ) { > > ++memset(dhxpwd->pw_passwd, 0, strlen(dhxpwd->pw_passwd)); > > + *uam_pwd = dhxpwd; > > + ret = AFP_OK; > > + } > > ++memset(dhxpwd->pw_passwd, 0, strlen(dhxpwd->pw_passwd)); > > I think only the second memset makes sense here. [...] > > + memset(rbuf, 0, PASSWDLEN); > > +-if ( strcmp( p, dhxpwd->pw_passwd ) == 0 ) { > > ++if ( (p != NULL) && (strcmp( p, dhxpwd->pw_passwd ) == 0) ) { > > ++ memset(dhxpwd->pw_passwd, 0, strlen(dhxpwd->pw_passwd)); > > + *uam_pwd = dhxpwd; > > + err = AFP_OK; > > + } > > ++memset(dhxpwd->pw_passwd, 0, strlen(dhxpwd->pw_passwd)); > > and here. [...] Yes, you're right. Updated patch: diff -ruN net/netatalk3.orig/Makefile net/netatalk3/Makefile --- net/netatalk3.orig/Makefile Tue Jul 5 14:47:24 2016 +++ net/netatalk3/Makefile Tue Jul 5 14:47:05 2016 @@ -3,7 +3,7 @@ COMMENT= AFP file and print services for IP networks V= 3.1.8 -REVISION= 1 +REVISION= 2 DISTNAME= netatalk-${V} EXTRACT_SUFX= .tar.bz2 PKGSPEC = netatalk->=3,<4 diff -ruN net/netatalk3.orig/patches/patch-etc_uams_uams_dhx2_passwd_c net/netatalk3/patches/patch-etc_uams_uams_dhx2_passwd_c --- net/netatalk3.orig/patches/patch-etc_uams_uams_dhx2_passwd_cThu Jan 1 01:00:00 1970 +++ net/netatalk3/patches/patch-etc_uams_uams_dhx2_passwd_c Tue Jul 5 15:27:50 2016 @@ -0,0 +1,25 @@ +$OpenBSD$ +--- etc/uams/uams_dhx2_passwd.c.orig Thu Dec 11 12:27:44 2014 etc/uams/uams_dhx2_passwd.cTue Jul 5 15:27:04 2016 +@@ -545,12 +545,20 @@ static int logincont2(void *obj _U_, struct passwd **u + /* Start authentication --- */ + ret = AFPERR_NOTAUTH; + ++if ((dhxpwd = getpwnam_shadow(dhxpwd->pw_name)) == NULL) { ++LOG(log_info, logtype_uams, ++ "could not get shadow passwd for %s", dhxpwd->pw_name); ++ret = AFPERR_NOTAUTH; ++goto exit; ++} ++ + p = crypt( ibuf, dhxpwd->pw_passwd ); + memset(ibuf, 0, 255); +-if ( strcmp( p, dhxpwd->pw_passwd ) == 0 ) { ++if ( (p != NULL) && (strcmp( p, dhxpwd->pw_passwd ) == 0) ) { + *uam_pwd = dhxpwd; + ret = AFP_OK; + } ++memset(dhxpwd->pw_passwd, 0, strlen(dhxpwd->pw_passwd)); + + #ifdef SHADOWPW + if (( sp = getspnam( dhxpwd->pw_name )) == NULL ) { diff -ruN net/netatalk3.orig/patches/patch-etc_uams_uams_dhx2_passwd_c.orig net/netatalk3/patches/patch-etc_uams_uams_dhx2_passwd_c.orig --- net/netatalk3.orig/patches/patch-etc_uams_uams_dhx2_passwd_c.orig Thu Jan 1 01:00:00 1970 +++ net/netatalk3/patches/patch-etc_uams_uams_dhx2_passwd_c.origThu Jun 9 16:08:04 2016 @@ -0,0 +1,26 @@ +$OpenBSD$ +--- etc/uams/uams_dhx2_passwd.c.orig Thu Jun 9 15:55:58 2016 etc/uams/uams_dhx2_passwd.cThu Jun 9 15:59:50 2016 +@@ -545,12 +545,21 @@ static int logincont2(void *obj _U_, struct passwd **u + /* Start authentication --- */ + ret = AFPERR_NOTAUTH; + ++if ((dhxpwd = getpwnam_shadow(dhxpwd->pw_name)) == NULL) { ++LOG(log_info, logtype_uams, ++ "could not get shadow passwd for %s", dhxpwd->pw_name); ++ret = AFPERR_NOTAUTH; ++goto exit; ++} ++ + p = crypt( ibuf, dhxpwd->pw_passwd ); + memset(ibuf, 0, 255); +-if ( strcmp( p, dhxpwd->pw_passwd ) == 0 ) { ++if ( (p != NULL) && (strcmp( p, dhxpwd->pw_passwd ) == 0) ) { ++memset(dhxpwd->pw_passwd, 0, strlen(dhxpwd->pw_passwd)); + *uam_pwd = dhxpwd; + ret = AFP_OK; + } ++memset(dhxpwd->pw_passwd, 0, strlen(dhxpwd->pw_passwd)); + + #ifdef SHADOWPW + if (( sp = getspnam( dhxpwd->pw_name )) == NULL ) { diff -ruN net/netatalk3.orig/patches/patch-etc_uams_uams_dhx_passwd_c net/netatalk3/patches/patch-etc_uams_uams_dhx_passwd_c --- net/netatalk3.orig/patches/patch-etc_uams_uams_dhx_passwd_c Thu Jan 1 01:00:00 1970 +++ net/netatalk3/patches/patch-etc_uams_uams_dhx_passwd_c Tue Jul 5 15:27:50 2016 @@ -0,0 +1,24 @@ +$OpenBSD$ +--- etc/uams/uams_dhx_passwd.c.origThu Dec 11 12:27:44 2014 etc/uams/uams_dhx_passwd.c Tue Jul 5 15:27:45 2016 +@@ -342,12 +342,19 @@ static int passwd_logincont(void *obj, struct passwd * + return AFP_OK; + } + #else /* TRU64 */ ++if ((dhxpwd = getpwnam_shadow(dhxpwd->pw_name)) == NULL) { ++LOG(log_info, logtype_uams, ++ "could not get shadow passwd for %s", dhxpwd->pw_name); ++ return (AFPERR_NOTAUTH); ++} ++ + p = crypt( rbuf, dhxpwd->pw_passwd ); + memset(rbuf, 0, PASSWDLEN); +-if ( strcmp( p, dhxpwd->pw_passwd ) == 0 ) { ++if ( (p != NULL) && (strcmp( p, dhxpwd->pw_passwd ) ==
Update ocaml-cmdliner to 0.9.8
Trivial (?) update to latest ocaml-cmdliner, an opam dependency. This brings cmdliner up to the version that opam itself installs, if you use opam to install cmdliner. ok? Ken Index: Makefile === RCS file: /cvs/ports/devel/ocaml-cmdliner/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- Makefile23 Jun 2016 19:23:53 - 1.3 +++ Makefile3 Jul 2016 12:22:02 - @@ -3,13 +3,12 @@ COMMENT = declarative definition of command line interfaces CATEGORIES = devel -V =0.9.7 +V =0.9.8 NAME = cmdliner DISTNAME = ${NAME}-${V} EXTRACT_SUFX = .tbz PKGNAME = ocaml-${DISTNAME} MASTER_SITES = http://erratique.ch/software/${NAME}/releases/ -REVISION = 0 HOMEPAGE = http://erratique.ch/software/${NAME} Index: distinfo === RCS file: /cvs/ports/devel/ocaml-cmdliner/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo30 Aug 2015 15:57:25 - 1.2 +++ distinfo2 Jul 2016 19:08:24 - @@ -1,2 +1,2 @@ -SHA256 (cmdliner-0.9.7.tbz) = nBmJPP+108NGnuDM6F4+7roX0wmzO5rOMaugb2jwv3o= -SIZE (cmdliner-0.9.7.tbz) = 50343 +SHA256 (cmdliner-0.9.8.tbz) = ffqv3YjsnZar+N7UwOpxEZSBlEACIKVuS7RKHt+kvUE= +SIZE (cmdliner-0.9.8.tbz) = 53249 Index: pkg/PLIST === RCS file: /cvs/ports/devel/ocaml-cmdliner/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 25 Oct 2014 16:50:30 - 1.1.1.1 +++ pkg/PLIST 2 Jul 2016 19:08:42 - @@ -19,6 +19,7 @@ share/doc/ocaml-cmdliner/api/index_attri share/doc/ocaml-cmdliner/api/index_class_types.html share/doc/ocaml-cmdliner/api/index_classes.html share/doc/ocaml-cmdliner/api/index_exceptions.html +share/doc/ocaml-cmdliner/api/index_extensions.html share/doc/ocaml-cmdliner/api/index_methods.html share/doc/ocaml-cmdliner/api/index_module_types.html share/doc/ocaml-cmdliner/api/index_modules.html
Re: patch for net/netatalk and net/netatalk3
On 2016/07/05 15:07, Nils Frohberg wrote: > Ping. Updated patch for net/netatalk3 below (REVISION=2). > > (cc maintainter (ajacoutot@)) > > > I had another look at the netatalk3 port and came up with the > > following patch. It works for me but that's not a thorough test > > (and only for dhx2). It's a more invasive patch than my previous > > one, but if this is better I can apply the same to net/netatalk. > > > > I looked for the SHADOWPW ifdefs and added an additional > > getpwnam_shadow(3) call in front of the crypt(3) calls (and one > > additional one to the clear text pw check). I also memset the > > pw_passwd fields to 0 and added check for crypt(3) returning NULL. > > > > FWIW, here's the patch: > > diff -ruN net/netatalk3.orig/Makefile net/netatalk3/Makefile > --- net/netatalk3.orig/Makefile Tue Jul 5 14:47:24 2016 > +++ net/netatalk3/MakefileTue Jul 5 14:47:05 2016 > @@ -3,7 +3,7 @@ > COMMENT= AFP file and print services for IP networks > > V= 3.1.8 > -REVISION=1 > +REVISION=2 > DISTNAME=netatalk-${V} > EXTRACT_SUFX=.tar.bz2 > PKGSPEC = netatalk->=3,<4 > diff -ruN net/netatalk3.orig/patches/patch-etc_uams_uams_dhx2_passwd_c > net/netatalk3/patches/patch-etc_uams_uams_dhx2_passwd_c > --- net/netatalk3.orig/patches/patch-etc_uams_uams_dhx2_passwd_c Thu Jan > 1 01:00:00 1970 > +++ net/netatalk3/patches/patch-etc_uams_uams_dhx2_passwd_c Thu Jun 9 > 16:08:04 2016 > @@ -0,0 +1,26 @@ > +$OpenBSD$ > +--- etc/uams/uams_dhx2_passwd.c.orig Thu Jun 9 15:55:58 2016 > etc/uams/uams_dhx2_passwd.c Thu Jun 9 15:59:50 2016 > +@@ -545,12 +545,21 @@ static int logincont2(void *obj _U_, struct passwd **u > + /* Start authentication --- */ > + ret = AFPERR_NOTAUTH; > + > ++if ((dhxpwd = getpwnam_shadow(dhxpwd->pw_name)) == NULL) { > ++LOG(log_info, logtype_uams, > ++ "could not get shadow passwd for %s", dhxpwd->pw_name); > ++ret = AFPERR_NOTAUTH; > ++goto exit; > ++} > ++ > + p = crypt( ibuf, dhxpwd->pw_passwd ); > + memset(ibuf, 0, 255); > +-if ( strcmp( p, dhxpwd->pw_passwd ) == 0 ) { > ++if ( (p != NULL) && (strcmp( p, dhxpwd->pw_passwd ) == 0) ) { > ++memset(dhxpwd->pw_passwd, 0, strlen(dhxpwd->pw_passwd)); > + *uam_pwd = dhxpwd; > + ret = AFP_OK; > + } > ++memset(dhxpwd->pw_passwd, 0, strlen(dhxpwd->pw_passwd)); I think only the second memset makes sense here. > + > + #ifdef SHADOWPW > + if (( sp = getspnam( dhxpwd->pw_name )) == NULL ) { > diff -ruN net/netatalk3.orig/patches/patch-etc_uams_uams_dhx_passwd_c > net/netatalk3/patches/patch-etc_uams_uams_dhx_passwd_c > --- net/netatalk3.orig/patches/patch-etc_uams_uams_dhx_passwd_c Thu Jan > 1 01:00:00 1970 > +++ net/netatalk3/patches/patch-etc_uams_uams_dhx_passwd_cThu Jun 9 > 16:11:20 2016 > @@ -0,0 +1,25 @@ > +$OpenBSD$ > +--- etc/uams/uams_dhx_passwd.c.orig Thu Jun 9 15:59:59 2016 > etc/uams/uams_dhx_passwd.c Thu Jun 9 16:11:14 2016 > +@@ -342,12 +342,20 @@ static int passwd_logincont(void *obj, struct passwd * > + return AFP_OK; > + } > + #else /* TRU64 */ > ++if ((dhxpwd = getpwnam_shadow(dhxpwd->pw_name)) == NULL) { > ++LOG(log_info, logtype_uams, > ++ "could not get shadow passwd for %s", dhxpwd->pw_name); > ++return (AFPERR_NOTAUTH); > ++} > ++ > + p = crypt( rbuf, dhxpwd->pw_passwd ); > + memset(rbuf, 0, PASSWDLEN); > +-if ( strcmp( p, dhxpwd->pw_passwd ) == 0 ) { > ++if ( (p != NULL) && (strcmp( p, dhxpwd->pw_passwd ) == 0) ) { > ++ memset(dhxpwd->pw_passwd, 0, strlen(dhxpwd->pw_passwd)); > + *uam_pwd = dhxpwd; > + err = AFP_OK; > + } > ++memset(dhxpwd->pw_passwd, 0, strlen(dhxpwd->pw_passwd)); and here. > + #ifdef SHADOWPW > + if (( sp = getspnam( dhxpwd->pw_name )) == NULL ) { > + LOG(log_info, logtype_uams, "no shadow passwd entry for %s", > dhxpwd->pw_name); > diff -ruN net/netatalk3.orig/patches/patch-etc_uams_uams_passwd_c > net/netatalk3/patches/patch-etc_uams_uams_passwd_c > --- net/netatalk3.orig/patches/patch-etc_uams_uams_passwd_c Thu Jan 1 > 01:00:00 1970 > +++ net/netatalk3/patches/patch-etc_uams_uams_passwd_cThu Jun 9 > 17:36:08 2016 > @@ -0,0 +1,37 @@ > +$OpenBSD$ > +--- etc/uams/uams_passwd.c.orig Thu Dec 11 12:27:44 2014 > etc/uams/uams_passwd.c Thu Jun 9 17:34:40 2016 > +@@ -229,11 +229,19 @@ static int passwd_changepw(void *obj, char *username, > + pwd->pw_passwd = sp->sp_pwdp; > + #endif /* SHADOWPW */ > + > ++if ((pwd = getpwnam_shadow(pwd->pw_name)) == NULL) { > ++LOG(log_info, logtype_uams, > ++ "could not get shadow passwd for %s", pwd->pw_name); > ++ret = AFPERR_NOTAUTH; > ++goto exit; > ++} > ++ > + p = crypt(pw, pwd->pw_passwd ); > +-if (strcmp( p, pwd->pw_passwd )) { > ++if
Re: patch for net/netatalk and net/netatalk3
Ping. Updated patch for net/netatalk3 below (REVISION=2). (cc maintainter (ajacoutot@)) > I had another look at the netatalk3 port and came up with the > following patch. It works for me but that's not a thorough test > (and only for dhx2). It's a more invasive patch than my previous > one, but if this is better I can apply the same to net/netatalk. > > I looked for the SHADOWPW ifdefs and added an additional > getpwnam_shadow(3) call in front of the crypt(3) calls (and one > additional one to the clear text pw check). I also memset the > pw_passwd fields to 0 and added check for crypt(3) returning NULL. > > FWIW, here's the patch: diff -ruN net/netatalk3.orig/Makefile net/netatalk3/Makefile --- net/netatalk3.orig/Makefile Tue Jul 5 14:47:24 2016 +++ net/netatalk3/Makefile Tue Jul 5 14:47:05 2016 @@ -3,7 +3,7 @@ COMMENT= AFP file and print services for IP networks V= 3.1.8 -REVISION= 1 +REVISION= 2 DISTNAME= netatalk-${V} EXTRACT_SUFX= .tar.bz2 PKGSPEC = netatalk->=3,<4 diff -ruN net/netatalk3.orig/patches/patch-etc_uams_uams_dhx2_passwd_c net/netatalk3/patches/patch-etc_uams_uams_dhx2_passwd_c --- net/netatalk3.orig/patches/patch-etc_uams_uams_dhx2_passwd_cThu Jan 1 01:00:00 1970 +++ net/netatalk3/patches/patch-etc_uams_uams_dhx2_passwd_c Thu Jun 9 16:08:04 2016 @@ -0,0 +1,26 @@ +$OpenBSD$ +--- etc/uams/uams_dhx2_passwd.c.orig Thu Jun 9 15:55:58 2016 etc/uams/uams_dhx2_passwd.cThu Jun 9 15:59:50 2016 +@@ -545,12 +545,21 @@ static int logincont2(void *obj _U_, struct passwd **u + /* Start authentication --- */ + ret = AFPERR_NOTAUTH; + ++if ((dhxpwd = getpwnam_shadow(dhxpwd->pw_name)) == NULL) { ++LOG(log_info, logtype_uams, ++ "could not get shadow passwd for %s", dhxpwd->pw_name); ++ret = AFPERR_NOTAUTH; ++goto exit; ++} ++ + p = crypt( ibuf, dhxpwd->pw_passwd ); + memset(ibuf, 0, 255); +-if ( strcmp( p, dhxpwd->pw_passwd ) == 0 ) { ++if ( (p != NULL) && (strcmp( p, dhxpwd->pw_passwd ) == 0) ) { ++memset(dhxpwd->pw_passwd, 0, strlen(dhxpwd->pw_passwd)); + *uam_pwd = dhxpwd; + ret = AFP_OK; + } ++memset(dhxpwd->pw_passwd, 0, strlen(dhxpwd->pw_passwd)); + + #ifdef SHADOWPW + if (( sp = getspnam( dhxpwd->pw_name )) == NULL ) { diff -ruN net/netatalk3.orig/patches/patch-etc_uams_uams_dhx_passwd_c net/netatalk3/patches/patch-etc_uams_uams_dhx_passwd_c --- net/netatalk3.orig/patches/patch-etc_uams_uams_dhx_passwd_c Thu Jan 1 01:00:00 1970 +++ net/netatalk3/patches/patch-etc_uams_uams_dhx_passwd_c Thu Jun 9 16:11:20 2016 @@ -0,0 +1,25 @@ +$OpenBSD$ +--- etc/uams/uams_dhx_passwd.c.origThu Jun 9 15:59:59 2016 etc/uams/uams_dhx_passwd.c Thu Jun 9 16:11:14 2016 +@@ -342,12 +342,20 @@ static int passwd_logincont(void *obj, struct passwd * + return AFP_OK; + } + #else /* TRU64 */ ++if ((dhxpwd = getpwnam_shadow(dhxpwd->pw_name)) == NULL) { ++LOG(log_info, logtype_uams, ++ "could not get shadow passwd for %s", dhxpwd->pw_name); ++ return (AFPERR_NOTAUTH); ++} ++ + p = crypt( rbuf, dhxpwd->pw_passwd ); + memset(rbuf, 0, PASSWDLEN); +-if ( strcmp( p, dhxpwd->pw_passwd ) == 0 ) { ++if ( (p != NULL) && (strcmp( p, dhxpwd->pw_passwd ) == 0) ) { ++ memset(dhxpwd->pw_passwd, 0, strlen(dhxpwd->pw_passwd)); + *uam_pwd = dhxpwd; + err = AFP_OK; + } ++memset(dhxpwd->pw_passwd, 0, strlen(dhxpwd->pw_passwd)); + #ifdef SHADOWPW + if (( sp = getspnam( dhxpwd->pw_name )) == NULL ) { + LOG(log_info, logtype_uams, "no shadow passwd entry for %s", dhxpwd->pw_name); diff -ruN net/netatalk3.orig/patches/patch-etc_uams_uams_passwd_c net/netatalk3/patches/patch-etc_uams_uams_passwd_c --- net/netatalk3.orig/patches/patch-etc_uams_uams_passwd_c Thu Jan 1 01:00:00 1970 +++ net/netatalk3/patches/patch-etc_uams_uams_passwd_c Thu Jun 9 17:36:08 2016 @@ -0,0 +1,37 @@ +$OpenBSD$ +--- etc/uams/uams_passwd.c.origThu Dec 11 12:27:44 2014 etc/uams/uams_passwd.c Thu Jun 9 17:34:40 2016 +@@ -229,11 +229,19 @@ static int passwd_changepw(void *obj, char *username, + pwd->pw_passwd = sp->sp_pwdp; + #endif /* SHADOWPW */ + ++if ((pwd = getpwnam_shadow(pwd->pw_name)) == NULL) { ++LOG(log_info, logtype_uams, ++ "could not get shadow passwd for %s", pwd->pw_name); ++ret = AFPERR_NOTAUTH; ++goto exit; ++} ++ + p = crypt(pw, pwd->pw_passwd ); +-if (strcmp( p, pwd->pw_passwd )) { ++if ((p == NULL) || strcmp( p, pwd->pw_passwd ))) { + memset(pw, 0, sizeof(pw)); + return AFPERR_NOTAUTH; + } ++memset(pwd->pw_passwd, 0, strlen(pwd->pw_passwd)); + + /* new password */ + ibuf += PASSWDLEN; +@@ -329,6 +337,12 @@ static int passwd_printer(char*start, char *stop, cha + } + + #endif /
Re: [Update] Gnupg 2.1.13
On Mon, 04 Jul 2016, Boyd Waters wrote: > Will clean this up and post again after some testing here. No worries re 6.0 > timing. Thanks! > > > On Jul 4, 2016, at 5:35 PM, Stuart Henderson wrote: > > > > I think it's probably a bit late to get enough testing of this before > > 6.0 lock, if it doesn't make it then please mention it again on ports@ > > if it gets forgotten later :) Here's my version. Works well for me, and I've also tested smartcard support with my Gemalto Gemplus USB SmartCard Reader. Ciao! David Index: gnupg2/Makefile === RCS file: /cvs/ports/security/gnupg2/Makefile,v retrieving revision 1.42 diff -u -p -u -p -r1.42 Makefile --- gnupg2/Makefile 29 Jun 2016 16:14:44 - 1.42 +++ gnupg2/Makefile 5 Jul 2016 10:43:25 - @@ -2,9 +2,8 @@ COMMENT = GNU privacy guard - a free PGP replacement -DISTNAME = gnupg-2.1.9 +DISTNAME = gnupg-2.1.13 CATEGORIES = security -REVISION = 0 MASTER_SITES = ${MASTER_SITES_GNUPG:=gnupg/} @@ -15,9 +14,9 @@ MAINTAINER = Pierre-Emmanuel Andre =1.2 bz2 c gcrypt gnutls gpg-error +WANTLIB += ksba npth pthread readline sqlite3 +WANTLIB += termcap usb-1.0 z EXTRACT_SUFX = .tar.bz2 @@ -27,10 +26,10 @@ FLAVORS = ldap FLAVOR ?= LIB_DEPENDS = archivers/bzip2 \ - devel/libusb-compat \ + devel/libusb1 \ devel/npth \ security/gnutls \ - security/libassuan \ + security/libassuan>=2.4.2 \ security/libgcrypt \ security/libksba @@ -53,12 +52,12 @@ CONFIGURE_STYLE = gnu CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS += docdir=${LOCALBASE}/share/doc/gnupg2 \ + --enable-g13 \ --enable-gpgtar \ --with-adns=no # Avoid conflict with gnupg-1.x post-install: - @mv ${PREFIX}/man/man1/gpg-zip.1 ${PREFIX}/man/man1/gpg2-zip.1 @mv ${PREFIX}/man/man7/gnupg.7 ${PREFIX}/man/man7/gnupg2.7 .include Index: gnupg2/distinfo === RCS file: /cvs/ports/security/gnupg2/distinfo,v retrieving revision 1.18 diff -u -p -u -p -r1.18 distinfo --- gnupg2/distinfo 20 Oct 2015 09:20:50 - 1.18 +++ gnupg2/distinfo 5 Jul 2016 10:43:25 - @@ -1,2 +1,2 @@ -SHA256 (gnupg-2.1.9.tar.bz2) = HLdjOlcZC+tm+SSct0RmAyKbJz1NiTMbdcZS+kop97Y= -SIZE (gnupg-2.1.9.tar.bz2) = 4925167 +SHA256 (gnupg-2.1.13.tar.bz2) = T52DpiIdqmATD6efCx031sIP/90DILZAx6WXxbYhlnU= +SIZE (gnupg-2.1.13.tar.bz2) = 5545361 Index: gnupg2/patches/patch-doc_Makefile_in === RCS file: gnupg2/patches/patch-doc_Makefile_in diff -N gnupg2/patches/patch-doc_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 - +++ gnupg2/patches/patch-doc_Makefile_in5 Jul 2016 10:43:25 - @@ -0,0 +1,12 @@ +$OpenBSD$ +--- doc/Makefile.in.orig Tue Jul 5 08:34:21 2016 doc/Makefile.inTue Jul 5 08:34:39 2016 +@@ -514,7 +514,7 @@ CLEANFILES = yat2m mkdefsinc defs.inc + DISTCLEANFILES = gnupg.tmp gnupg.ops yat2m-stamp.tmp yat2m-stamp \ + gnupg-card-architecture.eps \ + gnupg-module-overview.eps \ +- $(myman_pages) gpg-zip.1 gnupg.7 ++ $(myman_pages) gnupg.7 + + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am Index: gnupg2/pkg/PLIST === RCS file: /cvs/ports/security/gnupg2/pkg/PLIST,v retrieving revision 1.14 diff -u -p -u -p -r1.14 PLIST --- gnupg2/pkg/PLIST29 Jun 2016 16:14:44 - 1.14 +++ gnupg2/pkg/PLIST5 Jul 2016 10:43:25 - @@ -9,7 +9,6 @@ @bin bin/gpg-connect-agent @bin bin/gpg2 @bin bin/gpgconf -@bin bin/gpgkey2ssh @bin bin/gpgparsemail @bin bin/gpgsm @bin bin/gpgtar @@ -25,7 +24,6 @@ @man man/man1/gpg-agent.1 @man man/man1/gpg-connect-agent.1 @man man/man1/gpg-preset-passphrase.1 -@man man/man1/gpg2-zip.1 @man man/man1/gpg2.1 @man man/man1/gpgconf.1 @man man/man1/gpgparsemail.1 @@ -40,6 +38,7 @@ @man man/man8/dirmngr.8 sbin/addgnupghome sbin/applygnupgdefaults +@bin sbin/g13-syshelp share/doc/gnupg2/ share/doc/gnupg2/DCO share/doc/gnupg2/DETAILS @@ -90,6 +89,7 @@ share/gnupg/help.txt share/gnupg/help.zh_CN.txt share/gnupg/help.zh_TW.txt share/gnupg/qualified.txt +share/gnupg/sks-keyservers.netCA.pem share/locale/ca/LC_MESSAGES/gnupg2.mo share/locale/cs/LC_MESSAGES/gnupg2.mo share/locale/da/LC_MESSAGES/gnupg2.mo Index: libassuan/Makefile === RCS file: /cvs/ports/security/libassuan/Makefile,v retrieving revision 1.14 diff -u -p -u