Re: [Update] Gnupg 2.1.13
On Tue, Jul 05, 2016 at 12:48:24PM +0200, David Coppa wrote:
> 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
>
Hi,
Works fine on @amd64. ok pea@
Thanks,
> 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 # GPLv3+
> PERMIT_PACKAGE_CDROM = Yes
>
> -WANTLIB += assuan bz2 c gcrypt gnutls gpg-error
> -WANTLIB += ksba npth pthread readline
> -WANTLIB += termcap usb z
> +WANTLIB += assuan>=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_in 5 Jul 2016 10:43:25 -
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- doc/Makefile.in.orig Tue Jul 5 08:34:21 2016
> doc/Makefile.in Tue 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/PLIST 29 Jun 2016 16:14:44 - 1.14
> +++ gnupg2/pkg/PLIST 5 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/applygnupgd
Re: Update Samba 4.4.4
Ian Mcwilliam writes:
> ping
ditto
6.0 is approaching, I'd prefer not to do a version jump on the -stable
branch, and I'm not in position to test this right now.
Diff below again, for convenience.
> 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
>
Index: Makefile
===
RCS file: /cvs/ports/net/samba/Makefile,v
retrieving revision 1.225
diff -u -p -u -p -r1.225 Makefile
--- Makefile15 May 2016 01:10:07 - 1.225
+++ Makefile22 Jun 2016 04:17:51 -
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.225 2016/05/15 01:10:07 jca Exp $
-VERSION = 4.4.3
+VERSION = 4.4.4
DISTNAME = samba-${VERSION}
COMMENT-main = SMB and CIFS client and server for UNIX
@@ -15,7 +15,6 @@ PKGNAME-tevent = tevent-${TEVENT_V}
PKGNAME-util = samba-util-${VERSION}
PKGNAME-docs = samba-docs-${VERSION}
-REVISION-main =0
REVISION-ldb = 0
REVISION-tevent = 0
Index: distinfo
===
RCS file: /cvs/ports/net/samba/distinfo,v
retrieving revision 1.51
diff -u -p -u -p -r1.51 distinfo
--- distinfo6 May 2016 11:34:42 - 1.51
+++ distinfo22 Jun 2016 04:17:51 -
@@ -1,2 +1,2 @@
-SHA256 (samba-4.4.3.tar.gz) = Ax5q2m0V3q5oUIRe7UFJevMiB/tnnWxsdPGazJnUN7o=
-SIZE (samba-4.4.3.tar.gz) = 20705861
+SHA256 (samba-4.4.4.tar.gz) = Ji+e2rvRwBEoGbUGNxhYjCKw7kwaL2SPefIz/fuiXIs=
+SIZE (samba-4.4.4.tar.gz) = 20711340
Index: patches/patch-source3_client_smbspool_krb5_wrapper_c
===
RCS file: patches/patch-source3_client_smbspool_krb5_wrapper_c
diff -N patches/patch-source3_client_smbspool_krb5_wrapper_c
--- patches/patch-source3_client_smbspool_krb5_wrapper_c25 Apr 2016
15:01:29 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-source3_client_smbspool_krb5_wrapper_c,v 1.2 2016/04/25
15:01:29 jca Exp $
-
-Workaround lack of clearenv(3).
-
source3/client/smbspool_krb5_wrapper.c.origMon Apr 25 10:31:47 2016
-+++ source3/client/smbspool_krb5_wrapper.c Mon Apr 25 16:55:21 2016
-@@ -195,7 +195,8 @@ int main(int argc, char *argv[])
-* Make sure we do not have LD_PRELOAD or other security relevant
-* environment variables set.
-*/
-- clearenv();
-+ extern char **environ;
-+ environ = calloc(1, sizeof(*environ));
-
- CUPS_SMB_DEBUG("Setting KRB5CCNAME to '%s'", gen_cc);
- setenv("KRB5CCNAME", gen_cc, 1);
--
jca | PGP: 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
www/otter-browser 0.9.11-dev128 => 0.9.11-dev131
Hi ports@
Trivial bump for otter-browser latest weekly.
OK's? feedback?
Index: Makefile
===
RCS file: /cvs/ports/www/otter-browser/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile21 Jun 2016 09:03:45 - 1.14
+++ Makefile6 Jul 2016 12:19:06 -
@@ -2,7 +2,7 @@
COMMENT = browser aiming to recreate classic Opera (12.x) UI
using Qt5
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=otter-browser/}
-DISTNAME = otter-browser-0.9.11-dev129
+DISTNAME = otter-browser-0.9.11-dev131
PKGNAME = ${DISTNAME:S/-dev/pre/}
EXTRACT_SUFX = .tar.bz2
Index: distinfo
===
RCS file: /cvs/ports/www/otter-browser/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo21 Jun 2016 09:03:45 - 1.11
+++ distinfo6 Jul 2016 12:19:06 -
@@ -1,2 +1,2 @@
-SHA256 (otter-browser-0.9.11-dev129.tar.bz2) =
mwfq2hjHHJgjT9Jrv2jCD6R1tJoSEFxp37DWQe2GluA=
-SIZE (otter-browser-0.9.11-dev129.tar.bz2) = 2310570
+SHA256 (otter-browser-0.9.11-dev131.tar.bz2) =
IieQbQNKkXo5R/dwZ9EXGpjeSSg3YzUq0STxtUJfx3g=
+SIZE (otter-browser-0.9.11-dev131.tar.bz2) = 2309831
Re: NEW: audio/kid3
On 07/05/16 11:10, 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 > Here's a new tar ball. The last one included git files. This one's clean. --Aaron kid3-3.4.1.tgz Description: Binary data
Re: devel/llvm: make clang build working static PIE programs
On Mon, Jul 04, 2016 at 06:00:38PM +0200, Stefan Kempf wrote:
> ping?
looking at gcc -dumpspecs, this makes sense. ok
i'm working on the same thing for gcc 4.9 now (sparc64 for a start)
>
> Stefan Kempf wrote:
> > clang currently links against /usr/lib/crt0.o when building
> > a binary with the -static -pie options. That makes such
> > programs segfault on startup (gcc 4.9 seems to have the same
> > problem).
> >
> > When building a static PIE program, we need to link against
> > /usr/lib/rcrt0.o, as shown below. Bitrig has this part also
> > in their local llvm tree. I'll try to get it into upstream for
> > clang 3.9 as well.
> >
> > --- tools/clang/lib/Driver/Tools.cpp.orig Fri Feb 12 23:51:41 2016
> > +++ tools/clang/lib/Driver/Tools.cppSun Jun 26 20:24:44 2016
> > @@ -7600,6 +7600,10 @@ void openbsd::Linker::ConstructJob(Compilation &C,
> > con
> >if (Args.hasArg(options::OPT_pg))
> > CmdArgs.push_back(
> > Args.MakeArgString(getToolChain().GetFilePath("gcrt0.o")));
> > + else if (Args.hasArg(options::OPT_static) &&
> > + !Args.hasArg(options::OPT_nopie))
> > +CmdArgs.push_back(
> > +Args.MakeArgString(getToolChain().GetFilePath("rcrt0.o")));
> >else
> > CmdArgs.push_back(
> > Args.MakeArgString(getToolChain().GetFilePath("crt0.o")));
> >
> > Full diff against the ports tree below.
> >
> > ok?
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/devel/llvm/Makefile,v
> > retrieving revision 1.114
> > diff -u -p -r1.114 Makefile
> > --- Makefile24 May 2016 07:53:23 - 1.114
> > +++ Makefile27 Jun 2016 17:24:32 -
> > @@ -11,7 +11,7 @@ COMMENT = modular, fast C/C++/ObjC compi
> > LLVM_V = 3.8.0
> > DISTNAME = llvm-${LLVM_V}.src
> > PKGNAME = llvm-${LLVM_V}
> > -REVISION = 1
> > +REVISION = 2
> > CATEGORIES = devel
> > DISTFILES =llvm-${LLVM_V}.src${EXTRACT_SUFX} \
> > cfe-${LLVM_V}.src${EXTRACT_SUFX}
> > Index: patches/patch-tools_clang_lib_Driver_Tools_cpp
> > ===
> > RCS file:
> > /cvs/ports/devel/llvm/patches/patch-tools_clang_lib_Driver_Tools_cpp,v
> > retrieving revision 1.30
> > diff -u -p -r1.30 patch-tools_clang_lib_Driver_Tools_cpp
> > --- patches/patch-tools_clang_lib_Driver_Tools_cpp 24 May 2016 07:53:23
> > - 1.30
> > +++ patches/patch-tools_clang_lib_Driver_Tools_cpp 27 Jun 2016 17:24:32
> > -
> > @@ -1,6 +1,5 @@
> > -$OpenBSD: patch-tools_clang_lib_Driver_Tools_cpp,v 1.30 2016/05/24
> > 07:53:23 ajacoutot Exp $
> > tools/clang/lib/Driver/Tools.cpp.orig Fri Feb 12 17:51:41 2016
> > -+++ tools/clang/lib/Driver/Tools.cpp Tue May 17 14:45:22 2016
> > +--- tools/clang/lib/Driver/Tools.cpp.orig Fri Feb 12 23:51:41 2016
> > tools/clang/lib/Driver/Tools.cpp Sun Jun 26 20:24:44 2016
> > @@ -78,7 +78,7 @@ static const char *getSparcAsmModeForCPU(StringRef Nam
> > .Case("niagara2", "-Av9b")
> > .Case("niagara3", "-Av9d")
> > @@ -10,7 +9,18 @@ $OpenBSD: patch-tools_clang_lib_Driver_T
> > } else {
> > return llvm::StringSwitch(Name)
> > .Case("v8", "-Av8")
> > -@@ -7611,15 +7611,17 @@ void openbsd::Linker::ConstructJob(Compilation &C,
> > con
> > +@@ -7600,6 +7600,10 @@ void openbsd::Linker::ConstructJob(Compilation &C,
> > con
> > + if (Args.hasArg(options::OPT_pg))
> > + CmdArgs.push_back(
> > + Args.MakeArgString(getToolChain().GetFilePath("gcrt0.o")));
> > ++ else if (Args.hasArg(options::OPT_static) &&
> > ++ !Args.hasArg(options::OPT_nopie))
> > ++CmdArgs.push_back(
> > ++Args.MakeArgString(getToolChain().GetFilePath("rcrt0.o")));
> > + else
> > + CmdArgs.push_back(
> > + Args.MakeArgString(getToolChain().GetFilePath("crt0.o")));
> > +@@ -7611,15 +7615,17 @@ void openbsd::Linker::ConstructJob(Compilation &C,
> > con
> > }
> > }
> >
>
Update net/tcpreplay 4.1.1
The port switches to github, the release download includes autoconf
generated files, default archive doesn't. Details of changes can be
found here...
https://github.com/appneta/tcpreplay/releases
This is just fixes, the new part only applies to Linux machines.
This has been tried on amd64 only. Looking for Ok's, and reports from
other arch's.
Index: Makefile
===
RCS file: /home/cvs/ports/net/tcpreplay/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- Makefile 6 Jul 2016 10:29:51 - 1.37
+++ Makefile 6 Jul 2016 14:21:18 -
@@ -2,18 +2,20 @@
COMMENT= resend network traffic saved by tcpdump
-DISTNAME= tcpreplay-4.0.5
CATEGORIES= net
-REVISION= 1
-HOMEPAGE= http://tcpreplay.appneta.com/
+GH_ACCOUNT = appneta
+GH_PROJECT = tcpreplay
+GH_TAGNAME = v4.1.1
+
+HOMEPAGE= http://tcpreplay.appneta.com/
MAINTAINER= Nigel Taylor
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcpreplay/}
+MASTER_SITES = https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${GH_TAGNAME}/
WANTLIB= c dnet>=1
Index: distinfo
===
RCS file: /home/cvs/ports/net/tcpreplay/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 16 Oct 2014 13:00:56 - 1.9
+++ distinfo 6 Jul 2016 13:08:53 -
@@ -1,2 +1,2 @@
-SHA256 (tcpreplay-4.0.5.tar.gz) = Y3mMityeW+eUZ+I1k4OM4OYXslk4z84xFv7aJjA0TYA=
-SIZE (tcpreplay-4.0.5.tar.gz) = 2059744
+SHA256 (tcpreplay-4.1.1.tar.gz) = YbkW75EEnK0qndyN5vXj48xdmZjbtkTckc86eYSX/+Q=
+SIZE (tcpreplay-4.1.1.tar.gz) = 2173781
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 16 Oct 2014 13:43:48 - 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,21 +0,0 @@
-$OpenBSD: patch-configure,v 1.4 2014/10/16 13:43:48 nigel Exp $
configure.orig Fri Sep 5 17:16:38 2014
-+++ configure Fri Oct 10 15:21:36 2014
-@@ -18765,7 +18765,7 @@ else
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--[
-+
- #include
- #include
- #include
-@@ -18793,7 +18793,7 @@ main(int argc, char *argv[]) {
-
- /* else suck, no good */
- exit(-1);
--}]
-+}
- _ACEOF
- if ac_fn_c_try_run "$LINENO"; then :
-
Re: Update Samba 4.4.4
j...@wxcvbn.org (Jeremie Courreges-Anglas) writes: > Ian Mcwilliam writes: > >> ping > > ditto > > 6.0 is approaching, I'd prefer not to do a version jump on the -stable > branch, and I'm not in position to test this right now. Committed, thanks! -- jca | PGP: 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Slowing down for the release
The next release, 6.0, is approaching fast. It's time to wind down the ports churn, focus on fixing problems and stop introducing them. Over the next few days, please stop importing new ports and regular updates. If you're in the middle of something, finish it, but by the weekend this should be done, and commits will be increasingly restricted from there. What's the situation with wxneeded annotations and getpwnam_shadow? If that work hasn't been completed, it's high time to get it done. -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: [Update] Gnupg 2.1.13
On my amd64, "make test" fails for me, as it tries to build the GNU makeinfo documentation before running tests. Uses makeinfo option "--css-ref" that was introduced in TexInfo 2006. Port for GNU TexInfo builds with no trouble, but is renamed to gmakeinfo to avoid shadowing the distribution's /usr/bin/makeinfo. You can specify MAKEINFO="/usr/local/bin/gmakeinfo" make test and it works. I'm working on this again today with a clean -current...
Re: [update] eduke32/5775
On Sun, Jun 26, 2016 at 01:35:44PM -0700, Ryan Freeman wrote:
> On Sat, Jun 18, 2016 at 11:50:55PM -0700, Ryan Freeman wrote:
> > On Sat, Jun 18, 2016 at 03:54:45PM -0400, Daniel Wilkins wrote:
> > > The old version was something like 3 years old and 2000 weeklies behind.
> > > I've talked to the dev and it now builds cleanly without patches(or
> > > rather,
> > > I made the changes needed and got it merged into the project.)
> > >
> > > Now it'll actually run the official expansions properly, as well as all
> > > the
> > > other additions since 2013.
> >
> > Here is a patch against current ports cvs triggered by Daniel's update.
> > WANTLIB and LIB_DEPENDS have been regenerated. the do-install paths have
> > been corrected, I removed the dos2unix stuff as I don't think it is that
> > big a deal in the end, and it matches upstream.
> >
> > The datafile path substitutions have been reduced to one file (yay), and
> > perl has been switched out in lieu of sed.
> >
> > Unfortunately the Makefile.common has some mean tricks to really break our
> > ability to feed CC/CXX, so I did some hack'n'slash patching of it. I am
> > not sure that this is best, I have employed their recommended
> > PACKAGE_REPOSITORY=1 setting to 'not completely gut all their
> > optimizations'..
> > but I'd love it if anyone can confirm its okay :-) looks to just use -O2.
> >
> > Turning on aggressive debugging things like DEBUGANYWAY kinda broke mouse
> > input making it really hard to play, so avoiding that path.
> >
> > Lastly I think we need to use ports gcc now.
> >
> > works good here on current amd64
>
> ping?
Anyone? I saw the mail go out about pending ports lock, this definitely
isn't something terribly important, but if there is opportunity to squeeze
it in before lock, why not?
> > Cheers!
> > -ryan
> >
> >
> > ? eduke32.diff
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/games/eduke32/Makefile,v
> > retrieving revision 1.7
> > diff -u -p -r1.7 Makefile
> > --- Makefile22 Oct 2014 13:55:07 - 1.7
> > +++ Makefile19 Jun 2016 06:43:09 -
> > @@ -1,12 +1,11 @@
> > # $OpenBSD: Makefile,v 1.7 2014/10/22 13:55:07 jasper Exp $
> >
> > COMMENT = Enhanced Duke Nukem 3D engine
> > -RDATE =20120301
> > -RTAG = 2394
> > +RDATE =20160610
> > +RTAG = 5775
> > DISTNAME = eduke32_src_${RDATE}-${RTAG}
> > PKGNAME = eduke32-2.0.0.${RTAG}
> > -REVISION = 2
> > -EXTRACT_SUFX = .tar.bz2
> > +EXTRACT_SUFX = .tar.xz
> > CATEGORIES = games x11
> >
> > HOMEPAGE = http://www.eduke32.com/
> > @@ -25,12 +24,15 @@ BUILD_DEPENDS = archivers/unzip \
> > BUILD_DEPENDS += devel/nasm
> > .endif
> >
> > -WANTLIB = SDL c m pthread stdc++ SDL_mixer>=3 vorbisfile vpx
> > +WANTLIB += c m ogg png pthread vorbis vorbisfile vpx z
> > +WANTLIB += SDL2 SDL2_mixer FLAC execinfo
> >
> > LIB_DEPENDS = audio/libvorbis \
> > - multimedia/libvpx \
> > - devel/sdl \
> > - devel/sdl-mixer
> > + audio/flac \
> > + devel/sdl2 \
> > + devel/sdl2-mixer \
> > + devel/libexecinfo \
> > + multimedia/libvpx
> >
> > # dlopen()'d; shows as Extra in check-lib-depends but it is used
> > LIB_DEPENDS += x11/gtk+2
> > @@ -38,31 +40,23 @@ WANTLIB += gtk-x11-2.0
> >
> > RUN_DEPENDS = games/duke3ddata
> >
> > -MASTER_SITES =
> > http://dukeworld.duke4.net/eduke32/synthesis/old/${RDATE}-${RTAG}/ \
> > - http://dukeworld.duke4.net/eduke32/synthesis/${RDATE}-${RTAG}/
> > +MASTER_SITES =
> > http://dukeworld.duke4.net/eduke32/synthesis/${RDATE}-${RTAG}/
> > +
> > +MODULES = gcc4
> > +MODGCC4_LANGS =c c++
> > +MODGCC4_ARCHS =*
> >
> > # make sure we can see compilation output, respect CC/CXX, don't strip!
> > -MAKE_FLAGS = PRETTY_OUTPUT=0 CC="${CC}" CXX="${CXX}" DEBUGANYWAY=1
> > +MAKE_ENV = CC="${CC}" CXX="${CXX}" PRETTY_OUTPUT=0 PACKAGE_REPOSITORY=1
> > USE_GMAKE =Yes
> > NO_TEST = Yes
> >
> > -WRKDIST = ${WRKDIR}/eduke32_${RDATE}-${RTAG}/
> > +WRKDIST = ${WRKDIR}/eduke32_${RDATE}-${RTAG}
> >
> > post-extract:
> > # check for data files in correct location
> > - @perl -pi -e "s,/usr/share/games/eduke32,${TRUEPREFIX}/share/duke3d," \
> > - ${WRKSRC}/source/astub.c
> > - @perl -pi -e "s,/usr/share/games/eduke32,${TRUEPREFIX}/share/duke3d," \
> > - ${WRKSRC}/source/game.c
> > - @perl -pi -e "s,./eduke32,eduke32," ${WRKSRC}/build/include/editor.h
> > - # make plaintext files less annoying to read...
> > - @perl -MExtUtils::Command -e dos2unix \
> > - ${WRKSRC}/tiles.cfg \
> > - ${WRKSRC}/names.h \
> > - ${WRKSRC}/GNU.TXT \
> > - ${WRKSRC}/buildlic.txt \
> > - ${WRKSRC}/samples/*.sample \
> > - ${WRKSRC}/samples/*.txt
> > + @sed -i "s,/usr/share/games/edu
Re: [NEW] audio/svmidi
On 06/27/16 17:41, Henrique N. Lengler wrote: > On Tue, Jun 28, 2016 at 01:26:10AM +0300, li...@wrant.com wrote: >> Mon, 27 Jun 2016 18:50:01 -0300 "Henrique N. Lengler" >> >>> On Tue, Jun 28, 2016 at 12:09:10AM +0300, li...@wrant.com wrote: Mon, 27 Jun 2016 17:10:21 -0300 "Henrique N. Lengler" > On Sun, Jun 26, 2016 at 09:45:23PM -0500, Edgar Pettijohn wrote: >> Sorry deleted the original email before I noticed this. >> >> svmidi needs fonts/terminus >> -- >> Edgar Pettijohn > > Changed to '-misc-fixed-medium-*-*-*-14-*-*-*-*-*-*-*', this font is on > base > right? Was this not 13 as seen here in file /usr/X11R6/share/X11/app-defaults/XTerm 141:*VT100.utf8Fonts.font: -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1 Try with this: '-misc-fixed-medium-r-semicondensed-*-13-*-*-*-*-*-iso10646-*' You could test around with xfontsel(1) xfontsel - point and click selection of X11 font names [http://man.openbsd.org/xfontsel] $ xfontsel NB: I may be completely wrong, please don't take it verbatim, verify. >>> >>> Why not 14? I got it from xfontsel >> >> It's up to you mostly, if you choose to follow that just for consistency >> given the following statements are not completely off the chart or wrong. >> >> While there may be very few reasons for the *-13-* I'll try to add some: >> >> + XTerm 'probably' uses *-13-* by default on a fresh install >> + 'maybe' some of the sizes cover more from the UTF-8 demo sample >> >> http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-demo.txt >> >> And then again, it's a matter of personal preferences, for my eyes, I >> just stick to fonts that draw the letter with 1 pixel line width only. >> >> Experiment a bit with various settings and pick the one you like best. > > Ok I got it, > > changed to '-misc-fixed-medium-r-semicondensed-*-13-*-*-*-*-*-iso10646-*' > > Attached updated archive. > > Regards; > > Henrique N. Lengler > I didn't find an attached archive to this message. Did I miss it? --Aaron
Re: [update] eduke32/5775
On 07/06/16 18:27, Ryan Freeman wrote:
> On Sun, Jun 26, 2016 at 01:35:44PM -0700, Ryan Freeman wrote:
>> On Sat, Jun 18, 2016 at 11:50:55PM -0700, Ryan Freeman wrote:
>>> On Sat, Jun 18, 2016 at 03:54:45PM -0400, Daniel Wilkins wrote:
The old version was something like 3 years old and 2000 weeklies behind.
I've talked to the dev and it now builds cleanly without patches(or rather,
I made the changes needed and got it merged into the project.)
Now it'll actually run the official expansions properly, as well as all the
other additions since 2013.
>>>
>>> Here is a patch against current ports cvs triggered by Daniel's update.
>>> WANTLIB and LIB_DEPENDS have been regenerated. the do-install paths have
>>> been corrected, I removed the dos2unix stuff as I don't think it is that
>>> big a deal in the end, and it matches upstream.
>>>
>>> The datafile path substitutions have been reduced to one file (yay), and
>>> perl has been switched out in lieu of sed.
>>>
>>> Unfortunately the Makefile.common has some mean tricks to really break our
>>> ability to feed CC/CXX, so I did some hack'n'slash patching of it. I am
>>> not sure that this is best, I have employed their recommended
>>> PACKAGE_REPOSITORY=1 setting to 'not completely gut all their
>>> optimizations'..
>>> but I'd love it if anyone can confirm its okay :-) looks to just use -O2.
>>>
>>> Turning on aggressive debugging things like DEBUGANYWAY kinda broke mouse
>>> input making it really hard to play, so avoiding that path.
>>>
>>> Lastly I think we need to use ports gcc now.
>>>
>>> works good here on current amd64
>>
>> ping?
>
> Anyone? I saw the mail go out about pending ports lock, this definitely
> isn't something terribly important, but if there is opportunity to squeeze
> it in before lock, why not?
>
>>> Cheers!
>>> -ryan
>>>
>>>
>>> ? eduke32.diff
>>> Index: Makefile
>>> ===
>>> RCS file: /cvs/ports/games/eduke32/Makefile,v
>>> retrieving revision 1.7
>>> diff -u -p -r1.7 Makefile
>>> --- Makefile22 Oct 2014 13:55:07 - 1.7
>>> +++ Makefile19 Jun 2016 06:43:09 -
>>> @@ -1,12 +1,11 @@
>>> # $OpenBSD: Makefile,v 1.7 2014/10/22 13:55:07 jasper Exp $
>>>
>>> COMMENT = Enhanced Duke Nukem 3D engine
>>> -RDATE =20120301
>>> -RTAG = 2394
>>> +RDATE =20160610
>>> +RTAG = 5775
>>> DISTNAME = eduke32_src_${RDATE}-${RTAG}
>>> PKGNAME = eduke32-2.0.0.${RTAG}
>>> -REVISION = 2
>>> -EXTRACT_SUFX = .tar.bz2
>>> +EXTRACT_SUFX = .tar.xz
>>> CATEGORIES = games x11
>>>
>>> HOMEPAGE = http://www.eduke32.com/
>>> @@ -25,12 +24,15 @@ BUILD_DEPENDS = archivers/unzip \
>>> BUILD_DEPENDS += devel/nasm
>>> .endif
>>>
>>> -WANTLIB = SDL c m pthread stdc++ SDL_mixer>=3 vorbisfile vpx
>>> +WANTLIB += c m ogg png pthread vorbis vorbisfile vpx z
>>> +WANTLIB += SDL2 SDL2_mixer FLAC execinfo
>>>
>>> LIB_DEPENDS = audio/libvorbis \
>>> - multimedia/libvpx \
>>> - devel/sdl \
>>> - devel/sdl-mixer
>>> + audio/flac \
>>> + devel/sdl2 \
>>> + devel/sdl2-mixer \
>>> + devel/libexecinfo \
>>> + multimedia/libvpx
>>>
>>> # dlopen()'d; shows as Extra in check-lib-depends but it is used
>>> LIB_DEPENDS += x11/gtk+2
>>> @@ -38,31 +40,23 @@ WANTLIB += gtk-x11-2.0
>>>
>>> RUN_DEPENDS = games/duke3ddata
>>>
>>> -MASTER_SITES =
>>> http://dukeworld.duke4.net/eduke32/synthesis/old/${RDATE}-${RTAG}/ \
>>> - http://dukeworld.duke4.net/eduke32/synthesis/${RDATE}-${RTAG}/
>>> +MASTER_SITES =
>>> http://dukeworld.duke4.net/eduke32/synthesis/${RDATE}-${RTAG}/
>>> +
>>> +MODULES = gcc4
>>> +MODGCC4_LANGS =c c++
>>> +MODGCC4_ARCHS =*
>>>
>>> # make sure we can see compilation output, respect CC/CXX, don't strip!
>>> -MAKE_FLAGS = PRETTY_OUTPUT=0 CC="${CC}" CXX="${CXX}" DEBUGANYWAY=1
>>> +MAKE_ENV = CC="${CC}" CXX="${CXX}" PRETTY_OUTPUT=0 PACKAGE_REPOSITORY=1
>>> USE_GMAKE =Yes
>>> NO_TEST = Yes
>>>
>>> -WRKDIST = ${WRKDIR}/eduke32_${RDATE}-${RTAG}/
>>> +WRKDIST = ${WRKDIR}/eduke32_${RDATE}-${RTAG}
>>>
>>> post-extract:
>>> # check for data files in correct location
>>> - @perl -pi -e "s,/usr/share/games/eduke32,${TRUEPREFIX}/share/duke3d," \
>>> - ${WRKSRC}/source/astub.c
>>> - @perl -pi -e "s,/usr/share/games/eduke32,${TRUEPREFIX}/share/duke3d," \
>>> - ${WRKSRC}/source/game.c
>>> - @perl -pi -e "s,./eduke32,eduke32," ${WRKSRC}/build/include/editor.h
>>> - # make plaintext files less annoying to read...
>>> - @perl -MExtUtils::Command -e dos2unix \
>>> - ${WRKSRC}/tiles.cfg \
>>> - ${WRKSRC}/names.h \
>>> - ${WRKSRC}/GNU.TXT \
>>> - ${WRKSRC}/buildlic.txt \
>>> - ${WRKSRC}/samples/*.sample \
>>> - ${WRKSRC}/samples/*.txt
>>> + @sed -i
Re: Cant unlock the screen with slock
> Matthieu Herrb hat am 6. Juli 2016 um 07:38 geschrieben:
>
>
> 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
Hi Matthieu,
thanks for your mail. Here are the permissions on my system:
$ ls -dl / /usr /usr/libexec /usr/libexec/auth
drwxr-xr-x 19 root wheel 512 Jul 5 19:08 /
drwxr-xr-x 19 root wheel 512 Jul 5 05:18 /usr
drwxr-xr-x 7 root wheel 1024 Jul 5 19:07 /usr/libexec
drwxr-x--- 2 root auth512 Jul 5 04:33 /usr/libexec/auth
Below is a little c program i made for testing, it failed with the same error,
so auth_userokay is really to blame here. After changing permissions to
drwxr-xr-x 2 root auth512 Jul 5 04:33 /usr/libexec/auth
it works. Have my permissions be wrong, or is there another problem hiding?
Nils
--
#include
#include
#include
#include
#include
int
main(int argc, char *argv[])
{
int running = 1;
running = !auth_userokay(getlogin(), NULL, "auth-xlock", NULL);
if (running) {
printf("running is %d, this is a failure\n", running);
} else {
printf("all ok\n");
}
}
