Re: [UPDATE]: security/kc - enable YubiKey support, add -yubikey flavor
Ping? Original Message On 27/03/2024 16:33, Lévai, Dániel wrote: > > Hi all, > > > > This is a patch to enable YubiKey support with a new -yubikey flavor. > > I invite anyone to test it; it works for me(tm), but requires some > fiddling with the USB device files - hence the package message. > > > > Any ideas, suggestions are welcome, > > Daniel > > Barring any objections, issues, what do you think about committing? > > Daniel signature.asc Description: OpenPGP digital signature
Re: [UPDATE]: security/kc - enable YubiKey support, add -yubikey flavor
> Hi all,
>
> This is a patch to enable YubiKey support with a new -yubikey flavor.
> I invite anyone to test it; it works for me(tm), but requires some fiddling
> with the USB device files - hence the package message.
>
> Any ideas, suggestions are welcome,
> Daniel
Barring any objections, issues, what do you think about committing?
Danieldiff --git a/security/kc/Makefile b/security/kc/Makefile
index ac9e76e7e60..f1fdbbd2676 100644
--- a/security/kc/Makefile
+++ b/security/kc/Makefile
@@ -11,6 +11,9 @@ MAINTAINER = LEVAI Daniel
# BSD
PERMIT_PACKAGE = Yes
+FLAVORS= yubikey
+FLAVOR?=
+
WANTLIB += c crypto curses edit scrypt util xml2
LIB_DEPENDS = textproc/libxml \
@@ -18,6 +21,15 @@ LIB_DEPENDS = textproc/libxml \
MAKE_ENV += OS_OPENBSD=yes HAVE_LIBSCRYPT=yes
+.if ${FLAVOR:Myubikey}
+WANTLIB += ykpers-1 yubikey
+
+LIB_DEPENDS += security/yubico/yubikey-personalization \
+ security/yubico/yubico-c
+
+MAKE_ENV += HAVE_YUBIKEY=yes
+.endif
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/kc
${INSTALL} ${WRKBUILD}/Changelog.md ${PREFIX}/share/doc/kc/
diff --git a/security/kc/pkg/MESSAGE b/security/kc/pkg/MESSAGE
index 345fc451266..303ac67cddb 100644
--- a/security/kc/pkg/MESSAGE
+++ b/security/kc/pkg/MESSAGE
@@ -1 +1,3 @@
Please read ${PREFIX}/share/doc/kc/Changelog.md to see why you might not be able to open your database anymore.
+
+Using YubiKey support with the -yubikey flavor requires read/write access to the /dev/usb? and /dev/ugen?.?? devices.
[UPDATE]: security/kc - enable YubiKey support, add -yubikey flavor
Hi all,
This is a patch to enable YubiKey support with a new -yubikey flavor.
I invite anyone to test it; it works for me(tm), but requires some fiddling
with the USB device files - hence the package message.
Any ideas, suggestions are welcome,
Danieldiff --git a/security/kc/Makefile b/security/kc/Makefile
index ac9e76e7e60..f1fdbbd2676 100644
--- a/security/kc/Makefile
+++ b/security/kc/Makefile
@@ -11,6 +11,9 @@ MAINTAINER = LEVAI Daniel
# BSD
PERMIT_PACKAGE = Yes
+FLAVORS= yubikey
+FLAVOR?=
+
WANTLIB += c crypto curses edit scrypt util xml2
LIB_DEPENDS = textproc/libxml \
@@ -18,6 +21,15 @@ LIB_DEPENDS = textproc/libxml \
MAKE_ENV += OS_OPENBSD=yes HAVE_LIBSCRYPT=yes
+.if ${FLAVOR:Myubikey}
+WANTLIB += ykpers-1 yubikey
+
+LIB_DEPENDS += security/yubico/yubikey-personalization \
+ security/yubico/yubico-c
+
+MAKE_ENV += HAVE_YUBIKEY=yes
+.endif
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/kc
${INSTALL} ${WRKBUILD}/Changelog.md ${PREFIX}/share/doc/kc/
diff --git a/security/kc/pkg/MESSAGE b/security/kc/pkg/MESSAGE
index 345fc451266..303ac67cddb 100644
--- a/security/kc/pkg/MESSAGE
+++ b/security/kc/pkg/MESSAGE
@@ -1 +1,3 @@
Please read ${PREFIX}/share/doc/kc/Changelog.md to see why you might not be able to open your database anymore.
+
+Using YubiKey support with the -yubikey flavor requires read/write access to the /dev/usb? and /dev/ugen?.?? devices.
[UPDATE]: security/kc
Hi all, Update kc to 2.5.3 Pretty straightforward diff, tests ran fine. Danieldiff --git a/security/kc/Makefile b/security/kc/Makefile index 9581e04cd2c..ac9e76e7e60 100644 --- a/security/kc/Makefile +++ b/security/kc/Makefile @@ -2,7 +2,7 @@ COMMENT = console based password storing application GH_ACCOUNT = levaidaniel GH_PROJECT = kc -GH_TAGNAME = 2.5.1 +GH_TAGNAME = 2.5.3 CATEGORIES = security diff --git a/security/kc/distinfo b/security/kc/distinfo index a77c2f56933..eb3f0afe9cf 100644 --- a/security/kc/distinfo +++ b/security/kc/distinfo @@ -1,2 +1,2 @@ -SHA256 (kc-2.5.1.tar.gz) = 0CZdohmGwmG9FQKzE1QL/pka+Ll+RKcpbYIv4OLgpjI= -SIZE (kc-2.5.1.tar.gz) = 100143 +SHA256 (kc-2.5.3.tar.gz) = WT2zS/U62Rl8OsH/w3Qt/AOnhIYvCl+t7aa20q0odTk= +SIZE (kc-2.5.3.tar.gz) = 101980
UPDATE: fonts/terminus-font
Hi all, Attached is an update to the terminus font. Seems trivial enough, but couldn't test the raw fonts, though. Danieldiff --git a/fonts/terminus-font/Makefile b/fonts/terminus-font/Makefile index 85f77379aa2..02b0d9c905c 100644 --- a/fonts/terminus-font/Makefile +++ b/fonts/terminus-font/Makefile @@ -1,8 +1,7 @@ COMMENT = fixed width fonts especially for long hacking sessions -DISTNAME = terminus-font-4.47 +DISTNAME = terminus-font-4.49.1 CATEGORIES = fonts x11 -REVISION = 2 HOMEPAGE = http://terminus-font.sourceforge.net/ diff --git a/fonts/terminus-font/distinfo b/fonts/terminus-font/distinfo index bd5cd476f23..9f3fec6d0ad 100644 --- a/fonts/terminus-font/distinfo +++ b/fonts/terminus-font/distinfo @@ -1,2 +1,2 @@ -SHA256 (terminus-font-4.47.tar.gz) = DxsgWIjk4mqUh490a4Vmplw+N0KzPPmk5lF2RtVlEpc= -SIZE (terminus-font-4.47.tar.gz) = 620344 +SHA256 (terminus-font-4.49.1.tar.gz) = 2WHBt4Fie/QX+bNAaT1k/CGeAROtOjrxo0JMeqNz73k= +SIZE (terminus-font-4.49.1.tar.gz) = 648345 diff --git a/fonts/terminus-font/patches/patch-Makefile b/fonts/terminus-font/patches/patch-Makefile index 9a6b5879053..1ba6dbd7e2a 100644 --- a/fonts/terminus-font/patches/patch-Makefile +++ b/fonts/terminus-font/patches/patch-Makefile @@ -8,12 +8,12 @@ Index: Makefile UCS2ANY = $(INT) $(BIN)/ucstoany.$(EXT) BDF2PSF = $(INT) $(BIN)/bdftopsf.$(EXT) +BDF2RAW = $(INT) $(BIN)/bdftopsf.$(EXT) -r - UCS2X11 = $(INT) $(BIN)/ucstoany.$(EXT) -f - BDF2PCF = bdftopcf - -@@ -56,6 +57,11 @@ PSF_VGAW_KOI8_UV = ter-u14v.psf ter-u16v.psf + UCS2X11 = $(INT) $(BIN)/ucstoany.$(EXT) -f + BDF2PCF = bdftopcf + #BDF2OTB = fontforge -lang=ff -c 'Open($$3); ScaleToEm(1024); Generate($$2)' +@@ -61,6 +62,11 @@ PSF_VGAW_KOI8_UV = ter-u14v.psf ter-u16v.psf PSF_VGAW_XOS4_2 = ter-v14v.psf ter-v16v.psf - PSF_VGAW = $(PSF_VGAW_8859_1) $(PSF_VGAW_8859_2) $(PSF_VGAW_8859_7) $(PSF_VGAW_8859_9) $(PSF_VGAW_MS_1251) $(PSF_VGAW_8859_13) $(PSF_VGAW_8859_16) $(PSF_VGAW_IBM_437) $(PSF_VGAW_KOI8_RV) $(PSF_VGAW_BG_MIK) $(PSF_VGAW_PT_154) $(PSF_VGAW_KOI8_UV) $(PSF_VGAW_XOS4_2) + PSF_VGAW = $(PSF_VGAW_8859_1) $(PSF_VGAW_8859_2) $(PSF_VGAW_8859_7) $(PSF_VGAW_8859_9) $(PSF_VGAW_MS_1251) $(PSF_VGAW_8859_13) $(PSF_VGAW_8859_16) $(PSF_VGAW_MS_1255) $(PSF_VGAW_IBM_437) $(PSF_VGAW_KOI8_RV) $(PSF_VGAW_BG_MIK) $(PSF_VGAW_PT_154) $(PSF_VGAW_KOI8_UV) $(PSF_VGAW_XOS4_2) +RAW_8859_1 = $(subst .psf,.raw,$(PSF_8859_1)) +RAW_VGAW_8859_1 = $(subst .psf,.raw,$(PSF_VGAW_8859_1)) @@ -23,7 +23,7 @@ Index: Makefile PCF_8859_1 = ter-112n.pcf ter-112b.pcf ter-114n.pcf ter-114b.pcf ter-116n.pcf ter-116b.pcf ter-118n.pcf ter-118b.pcf ter-120n.pcf ter-120b.pcf ter-122n.pcf ter-122b.pcf ter-124n.pcf ter-124b.pcf ter-128n.pcf ter-128b.pcf ter-132n.pcf ter-132b.pcf PCF_8859_2 = ter-212n.pcf ter-212b.pcf ter-214n.pcf ter-214b.pcf ter-216n.pcf ter-216b.pcf ter-218n.pcf ter-218b.pcf ter-220n.pcf ter-220b.pcf ter-222n.pcf ter-222b.pcf ter-224n.pcf ter-224b.pcf ter-228n.pcf ter-228b.pcf ter-232n.pcf ter-232b.pcf PCF_8859_5 = ter-512n.pcf ter-512b.pcf ter-514n.pcf ter-514b.pcf ter-516n.pcf ter-516b.pcf ter-518n.pcf ter-518b.pcf ter-520n.pcf ter-520b.pcf ter-522n.pcf ter-522b.pcf ter-524n.pcf ter-524b.pcf ter-528n.pcf ter-528b.pcf ter-532n.pcf ter-532b.pcf -@@ -131,6 +137,9 @@ DUP_KOI8_UV = dup/cntrl.dup dup/ascii-h.dup dup/koi8.d +@@ -141,6 +147,9 @@ DUP_KOI8_UV = dup/cntrl.dup dup/ascii-h.dup dup/koi8.d DUP_KOI8_U = dup/cntrl.dup dup/ascii-h.dup dup/koi8.dup DUP_XOS4_2 = dup/vgagr.dup dup/xos4-2.dup @@ -33,7 +33,7 @@ Index: Makefile $(PSF_8859_1) $(PSF_VGAW_8859_1): ter-1%.psf : ter-u%.bdf $(VGA_8859_1) $(DUP_8859_1) $(UCS2ANY) $< $(REG_8859_1) $(VGA_8859_1) | $(BDF2PSF) -o $@ $(DUP_8859_1) -@@ -202,6 +211,8 @@ install-psf-ref: README +@@ -215,6 +224,8 @@ install-psf-ref: README uninstall-psf-ref: rm -f $(DESTDIR)$(psfref)
[UPDATE]: security/kc
Hi! Update to kc 2.5.1. This fixes compilation warnings and subsequent erroneous parameter parsing on arm and powerpc (thanks to tb@ for noticing and providing the fix too!). Daniel diff --git a/security/kc/Makefile b/security/kc/Makefile index bb73e24a451..9581e04cd2c 100644 --- a/security/kc/Makefile +++ b/security/kc/Makefile @@ -2,7 +2,7 @@ COMMENT = console based password storing application GH_ACCOUNT = levaidaniel GH_PROJECT = kc -GH_TAGNAME = 2.5.0 +GH_TAGNAME = 2.5.1 CATEGORIES = security diff --git a/security/kc/distinfo b/security/kc/distinfo index 70dbd7a942e..a77c2f56933 100644 --- a/security/kc/distinfo +++ b/security/kc/distinfo @@ -1,2 +1,2 @@ -SHA256 (kc-2.5.0.tar.gz) = e2qyCIwulrcTVvVUz9XSZNE7NouPtnGXLPAxDZRvv64= -SIZE (kc-2.5.0.tar.gz) = 99969 +SHA256 (kc-2.5.1.tar.gz) = 0CZdohmGwmG9FQKzE1QL/pka+Ll+RKcpbYIv4OLgpjI= +SIZE (kc-2.5.1.tar.gz) = 100143
[UPDATE]: security/kc
Hi!
This updates kc to 2.5.0.
Please read the Changelog.md file to see what has changed and why you might not
be able to open your older database.
I removed an unmaintained script (and the README on it), switched to GH_*
variables (easier this way), removed pcre dependency (and thus support), and
removed @ask-update.
Daniel
diff --git a/security/kc/Makefile b/security/kc/Makefile
index 71ee5b3a0ae..b8d2523c90a 100644
--- a/security/kc/Makefile
+++ b/security/kc/Makefile
@@ -1,10 +1,8 @@
COMMENT = console based password storing application
-V =2.4.2
-DISTNAME = kc-$V
-EXTRACT_SUFX = .tar.bz2
-MASTER_SITES = https://github.com/levaidaniel/kc/releases/download/${V}/
-REVISION = 0
+GH_ACCOUNT = levaidaniel
+GH_PROJECT = kc
+GH_TAGNAME = 2.5.0
CATEGORIES = security
@@ -15,19 +13,16 @@ MAINTAINER =LEVAI Daniel
# BSD
PERMIT_PACKAGE = Yes
-WANTLIB += c crypto curses edit pcre scrypt util xml2
+WANTLIB += c crypto curses edit scrypt util xml2
LIB_DEPENDS = textproc/libxml \
- devel/pcre \
security/libscrypt
-MAKE_ENV +=HAVE_PCRE=yes OS_OPENBSD=yes HAVE_LIBSCRYPT=yes
+MAKE_ENV +=OS_OPENBSD=yes HAVE_LIBSCRYPT=yes
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/kc
- ${INSTALL} ${WRKBUILD}/pwsafe_to_kc.pl ${PREFIX}/share/kc/
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/kc
- ${INSTALL} ${WRKBUILD}/Changelog ${PREFIX}/share/doc/kc/
+ ${INSTALL} ${WRKBUILD}/Changelog.md ${PREFIX}/share/doc/kc/
.include
diff --git a/security/kc/distinfo b/security/kc/distinfo
index 5a85a457900..70dbd7a942e 100644
--- a/security/kc/distinfo
+++ b/security/kc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kc-2.4.2.tar.bz2) = PpFoQR8OHwOQE8OwsSXolGt7D+fpLRVvBpyMu0ovimE=
-SIZE (kc-2.4.2.tar.bz2) = 65011
+SHA256 (kc-2.5.0.tar.gz) = e2qyCIwulrcTVvVUz9XSZNE7NouPtnGXLPAxDZRvv64=
+SIZE (kc-2.5.0.tar.gz) = 99969
diff --git a/security/kc/pkg/MESSAGE b/security/kc/pkg/MESSAGE
new file mode 100644
index 000..345fc451266
--- /dev/null
+++ b/security/kc/pkg/MESSAGE
@@ -0,0 +1 @@
+Please read ${PREFIX}/share/doc/kc/Changelog.md to see why you might not be
able to open your database anymore.
diff --git a/security/kc/pkg/PLIST b/security/kc/pkg/PLIST
index 94a73f3dc5a..95289a05e28 100644
--- a/security/kc/pkg/PLIST
+++ b/security/kc/pkg/PLIST
@@ -1,8 +1,4 @@
-@ask-update kc-<2.4 Make sure all your existing kc databases are safely
*dumped* ('dump' command) then read the Changelog in ${PREFIX}/share/doc/kc
after installation
@bin bin/kc
@man man/man1/kc.1
share/doc/kc/
-share/doc/kc/Changelog
-share/doc/pkg-readmes/${PKGSTEM}
-share/kc/
-share/kc/pwsafe_to_kc.pl
+share/doc/kc/Changelog.md
diff --git a/security/kc/pkg/README b/security/kc/pkg/README
deleted file mode 100644
index 46825795305..000
--- a/security/kc/pkg/README
+++ /dev/null
@@ -1,8 +0,0 @@
-+---
-| Running ${PKGSTEM} on OpenBSD
-+---
-
-kc comes with a tiny and simple utility which can convert an exported
-pwsafe database to a kc compatible XML database (that can be imported to
-it later). It is installed under ${PREFIX}/share/kc/. Note that this
-script requires Perl modules provided by the p5-HTML-Parser package.
miniupnpd not starting after upgrade to 7.1
Hey list! Thought it's worth an ask: I've upgraded one of my routers here to 7.1 that runs miniupnpd (now at 2.3.0p0). Now it seems it doesn't recognize the friendly_name configuration option anymore: invalid option in file /etc/miniupnpd.conf line 60 : friendly_name=myfriendlyrouter Error reading configuration file /etc/miniupnpd.conf (mind you it runs and works fine if I omit the option) I'll admit, it's been using the same configuration for ages and I didn't follow miniupnpd's development that close to know if anything has changed, however, I couldn't find anything related in its git log or changelog. There's a suspicious conditional in miniupnpd/options.h that only defines the friendly name option (and others) if ENABLE_MANUFACTURER_INFO_CONFIGURATION is set - there's also the same conditional for the -z option in miniupnpd.c. I see there's no maintainer listed for the package so I'm just going to ask around here if anyone knows if anything changed in the build process maybe? Thanks for any hints, Dani
Re: terminus-font: add OpenType .otb to support pango
Awesome, thanks Christopher! I can't get my hands on a box to test this on today, but looks good! Dani ‐‐‐ Original Message ‐‐‐ On Friday, July 10, 2020 10:05 PM, Christopher Zimmermann wrote: > Hi, > > since pango dropped support for .pcf fonts we need to start shipping > .otb fonts for pango/harfbuzz. > > OK? > > Christopher > > > > > http://gmerlin.de > OpenPGP: http://gmerlin.de/christopher.pub > CB07 DA40 B0B6 571D 35E2 0DEF 87E2 92A7 13E5 DEE1
Re: erminus-font: update and build raw fonts for wscons(4)
Stuart Henderson @ 2019-03-15T22:33:31 +0100: [...] > What do you think Daniel, is this ok with you? Yes, thank you for taking care of this! Daniel
Re: UPDATE: security/kc
Stuart Henderson @ 2018-04-19T23:04:02 +0200:
Thanks, Stuart,
> On 2018/04/18 18:10, LÉVAI Dániel wrote:
> > Hi!
> >
> > Update to kc, that breaks compatibility with <2.4 kc databases.
> > Please check how I handled it here, I tried to mimic postgresql's way
> > with @ask-update.
[...]
> Since you're upstream would you mind uploading a tar.gz as a
> "release asset" and switching to that please? There's a drag-and-drop
> or file selection box on the releases page (or there are some gists
> floating around if you want to automate it).
>
> That way we aren't at risk of broken auto-generated distfiles
> when github update their software stack.
>
> Ports-wise that involves traditional DISTNAME and MASTER_SITES lines
> instead of GH_*.
I uploaded a new archive (repackaged Github's release tar.gz as tar.bz2)
and I point to that from the Makefile. Is this what you had in mind?
[...]
> > +FLAVORS = scrypt
> > +FLAVOR ?=
> > +
> > +.if ${FLAVOR:Mscrypt}
> > +LIB_DEPENDS += security/libscrypt
> > +MAKE_ENV +=HAVE_LIBSCRYPT=yes
> > +.endif
> > +
>
> It's only a small dep, is there a real advantage to making it optional?
There's no real reason for the FLAVOR other than I didn't want to impose
this on everyone. But you're right, it's a small dep., if it's okay, I
just removed the flavor.
Attached the amended diff (also removed the patch because I've
incorporated it in the new release while there).
Daniel
Index: Makefile
===
RCS file: /cvs/ports/security/kc/Makefile,v
retrieving revision 1.14
diff -u -p -p -u -r1.14 Makefile
--- Makefile29 Dec 2015 19:49:41 - 1.14
+++ Makefile20 Apr 2018 08:52:07 -
@@ -2,29 +2,33 @@
COMMENT = console based password storing application
-GH_ACCOUNT = levaidaniel
-GH_PROJECT = kc
-GH_TAGNAME = 2.3.2
-REVISION = 1
+V =2.4.2
+DISTNAME = kc-$V
+EXTRACT_SUFX = .tar.bz2
+MASTER_SITES = https://github.com/levaidaniel/kc/releases/download/${V}/
CATEGORIES = security
-HOMEPAGE = http://github.com/levaidaniel/${GH_PROJECT}
+HOMEPAGE = http://github.com/levaidaniel/kc/
MAINTAINER = LEVAI Daniel <l...@ecentrum.hu>
# BSD
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += c crypto edit ncursesw pcre pthread xml2
+WANTLIB += c crypto edit ncursesw pcre pthread xml2 scrypt
LIB_DEPENDS = textproc/libxml \
- devel/pcre
+ devel/pcre \
+ security/libscrypt
+
+MAKE_ENV +=HAVE_PCRE=yes OS_OPENBSD=yes HAVE_LIBSCRYPT=yes
-MAKE_ENV +=HAVE_PCRE=yes
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/kc
${INSTALL} ${WRKBUILD}/pwsafe_to_kc.pl ${PREFIX}/share/kc/
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/kc
+ ${INSTALL} ${WRKBUILD}/Changelog ${PREFIX}/share/doc/kc/
.include
Index: distinfo
===
RCS file: /cvs/ports/security/kc/distinfo,v
retrieving revision 1.5
diff -u -p -p -u -r1.5 distinfo
--- distinfo24 Dec 2013 12:56:19 - 1.5
+++ distinfo20 Apr 2018 08:52:07 -
@@ -1,2 +1,2 @@
-SHA256 (kc-2.3.2.tar.gz) = 1Ap74wB55M/EI+GqK127Dm8LNInx0OCQzWZyi8Mo/Ng=
-SIZE (kc-2.3.2.tar.gz) = 44779
+SHA256 (kc-2.4.2.tar.bz2) = PpFoQR8OHwOQE8OwsSXolGt7D+fpLRVvBpyMu0ovimE=
+SIZE (kc-2.4.2.tar.bz2) = 65011
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/kc/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -p -u -r1.3 PLIST
--- pkg/PLIST 21 Mar 2013 09:48:45 - 1.3
+++ pkg/PLIST 20 Apr 2018 08:52:07 -
@@ -1,6 +1,9 @@
@comment $OpenBSD: PLIST,v 1.3 2013/03/21 09:48:45 jasper Exp $
+@ask-update kc-<2.4 Make sure all your existing kc databases are safely
*dumped* ('dump' command) then read the Changelog in ${PREFIX}/share/doc/kc
after installation
@bin bin/kc
@man man/man1/kc.1
+share/doc/kc/
+share/doc/kc/Changelog
share/doc/pkg-readmes/${FULLPKGNAME}
share/kc/
share/kc/pwsafe_to_kc.pl
--
LÉVAI Dániel
PGP key ID = 0x83B63A8F
Key fingerprint = DBEC C66B A47A DFA2 792D 650C C69B BE4C 83B6 3A8F
UPDATE: security/kc
Hi!
Update to kc, that breaks compatibility with <2.4 kc databases.
Please check how I handled it here, I tried to mimic postgresql's way
with @ask-update.
Index: Makefile
===
RCS file: /cvs/ports/security/kc/Makefile,v
retrieving revision 1.14
diff -u -p -p -u -r1.14 Makefile
--- Makefile29 Dec 2015 19:49:41 - 1.14
+++ Makefile18 Apr 2018 16:06:29 -
@@ -4,8 +4,7 @@ COMMENT = console based password storing
GH_ACCOUNT = levaidaniel
GH_PROJECT = kc
-GH_TAGNAME = 2.3.2
-REVISION = 1
+GH_TAGNAME = 2.4.1
CATEGORIES = security
@@ -21,10 +20,21 @@ WANTLIB += c crypto edit ncursesw pcre p
LIB_DEPENDS = textproc/libxml \
devel/pcre
-MAKE_ENV +=HAVE_PCRE=yes
+MAKE_ENV +=HAVE_PCRE=yes OS_OPENBSD=yes
+
+FLAVORS = scrypt
+FLAVOR ?=
+
+.if ${FLAVOR:Mscrypt}
+LIB_DEPENDS += security/libscrypt
+MAKE_ENV +=HAVE_LIBSCRYPT=yes
+.endif
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/kc
${INSTALL} ${WRKBUILD}/pwsafe_to_kc.pl ${PREFIX}/share/kc/
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/kc
+ ${INSTALL} ${WRKBUILD}/Changelog ${PREFIX}/share/doc/kc/
.include
Index: distinfo
===
RCS file: /cvs/ports/security/kc/distinfo,v
retrieving revision 1.5
diff -u -p -p -u -r1.5 distinfo
--- distinfo24 Dec 2013 12:56:19 - 1.5
+++ distinfo18 Apr 2018 16:06:29 -
@@ -1,2 +1,2 @@
-SHA256 (kc-2.3.2.tar.gz) = 1Ap74wB55M/EI+GqK127Dm8LNInx0OCQzWZyi8Mo/Ng=
-SIZE (kc-2.3.2.tar.gz) = 44779
+SHA256 (kc-2.4.1.tar.gz) = /+rP1koXzdF1nXsXkwl7CwA9J15klgyYKCepxf2W6Nk=
+SIZE (kc-2.4.1.tar.gz) = 75169
Index: patches/patch-Changelog
===
RCS file: patches/patch-Changelog
diff -N patches/patch-Changelog
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Changelog 18 Apr 2018 16:06:29 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: Changelog
+--- Changelog.orig
Changelog
+@@ -43,7 +43,7 @@ Creating '/home/user/.kc/default.kcd'
+ Using '/home/user/.kc/default.kcd' database.
+ New password (empty to cancel):
+ New password again (empty to cancel):
+-<default% > importxml kcdump.xml
++<default% > importxml -k kcdump.xml
+ Import OK
+ <example_chain% > write
+ Save OK
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/kc/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -p -u -r1.3 PLIST
--- pkg/PLIST 21 Mar 2013 09:48:45 - 1.3
+++ pkg/PLIST 18 Apr 2018 16:06:29 -
@@ -1,6 +1,9 @@
@comment $OpenBSD: PLIST,v 1.3 2013/03/21 09:48:45 jasper Exp $
+@ask-update kc-<2.4 Make sure all your existing kc databases are safely
*dumped* ('dump' command) then read the Changelog in ${PREFIX}/share/doc/kc
after installation
@bin bin/kc
@man man/man1/kc.1
+share/doc/kc/
+share/doc/kc/Changelog
share/doc/pkg-readmes/${FULLPKGNAME}
share/kc/
share/kc/pwsafe_to_kc.pl
--
LÉVAI Dániel
PGP key ID = 0x83B63A8F
Key fingerprint = DBEC C66B A47A DFA2 792D 650C C69B BE4C 83B6 3A8F
UPDATE: security/libscrypt
Hi!
Update to libscrypt (internal checks were successful on amd64):
Index: Makefile
===
RCS file: /cvs/ports/security/libscrypt/Makefile,v
retrieving revision 1.5
diff -u -p -p -u -r1.5 Makefile
--- Makefile16 Mar 2016 16:46:33 - 1.5
+++ Makefile18 Apr 2018 15:07:51 -
@@ -2,7 +2,7 @@
COMMENT = shared library that implements scrypt() functionality
-V =1.19
+V =1.21
GH_ACCOUNT = technion
GH_PROJECT = libscrypt
GH_TAGNAME = v$V
Index: distinfo
===
RCS file: /cvs/ports/security/libscrypt/distinfo,v
retrieving revision 1.2
diff -u -p -p -u -r1.2 distinfo
--- distinfo8 May 2014 20:49:41 - 1.2
+++ distinfo18 Apr 2018 15:07:51 -
@@ -1,2 +1,2 @@
-SHA256 (libscrypt-1.19.tar.gz) = jzmGd7K0PiFCO4ABVrM3nzyw0xTnDuwusug6ASvOhU8=
-SIZE (libscrypt-1.19.tar.gz) = 18208
+SHA256 (libscrypt-1.21.tar.gz) = aON355dFwQ1Im3Wblw5S2BnbuA3YymH4yXUYXfP0V9M=
+SIZE (libscrypt-1.21.tar.gz) = 19425
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/security/libscrypt/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -p -u -r1.2 patch-Makefile
--- patches/patch-Makefile 8 May 2014 20:49:41 - 1.2
+++ patches/patch-Makefile 18 Apr 2018 15:07:51 -
@@ -4,8 +4,9 @@ $OpenBSD: patch-Makefile,v 1.2 2014/05/0
- sys.mk defines CFLAGS and LDFLAGS so don't use conditional value assignments
for those.
- we don't patch the install-osx target, because we don't use it
Makefile.orig Tue May 6 11:42:07 2014
-+++ Makefile Thu May 8 21:41:43 2014
+Index: Makefile
+--- Makefile.orig
Makefile
@@ -5,20 +5,19 @@ MAKE_DIR ?= install -d
INSTALL_DATA ?= install
@@ -18,7 +19,7 @@ $OpenBSD: patch-Makefile,v 1.2 2014/05/0
all: reference
- OBJS= crypto_scrypt-nosse.o sha256.o crypto_scrypt-hexconvert.o crypto-mcf.o
b64.o crypto-scrypt-saltgen.o crypto_scrypt-check.o crypto_scrypt-hash.o
slowequals.o
+ OBJS= crypto_scrypt-nosse.o sha256.o crypto-mcf.o b64.o
crypto-scrypt-saltgen.o crypto_scrypt-check.o crypto_scrypt-hash.o slowequals.o
-libscrypt.so.0: $(OBJS)
- $(CC) $(LDFLAGS) -shared -o libscrypt.so.0 $(OBJS) -lm -lc
@@ -26,15 +27,15 @@ $OpenBSD: patch-Makefile,v 1.2 2014/05/0
+ $(CC) $(LDFLAGS) -shared -o libscrypt.so.${LIBscrypt_VERSION} $(OBJS)
-lm -lc
ar rcs libscrypt.a $(OBJS)
--reference: libscrypt.so.0 main.o b64.o crypto_scrypt-hexconvert.o
+-reference: libscrypt.so.0 main.o crypto_scrypt-hexconvert.o
- ln -s -f libscrypt.so.0 libscrypt.so
-+reference: libscrypt.so.${LIBscrypt_VERSION} main.o b64.o
crypto_scrypt-hexconvert.o
++reference: libscrypt.so.${LIBscrypt_VERSION} main.o crypto_scrypt-hexconvert.o
$(CC) -Wall -o reference main.o b64.o crypto_scrypt-hexconvert.o
$(CFLAGS_EXTRA) -L. -lscrypt
clean:
-@@ -33,11 +32,10 @@ devtest:
- splint crypto-scrypt-saltgen.c +posixlib -compdef
- valgrind ./reference
+@@ -40,11 +39,10 @@ asan: main.c
+ ./asantest
+ rm -f asantest
-install: libscrypt.so.0
- $(MAKE_DIR) $(DESTDIR) $(DESTDIR)$(PREFIX) $(DESTDIR)$(LIBDIR)
$(DESTDIR)$(INCLUDEDIR)
@@ -48,7 +49,7 @@ $OpenBSD: patch-Makefile,v 1.2 2014/05/0
install-osx: libscrypt.so.0
$(MAKE_DIR) $(DESTDIR) $(DESTDIR)$(PREFIX) $(DESTDIR)$(LIBDIR)
$(DESTDIR)$(INCLUDEDIR)
-@@ -46,4 +44,4 @@ install-osx: libscrypt.so.0
+@@ -54,4 +52,4 @@ install-osx: libscrypt.so.0
$(INSTALL_DATA) -pm 0644 libscrypt.h $(DESTDIR)$(INCLUDEDIR)
install-static: libscrypt.a
Index: patches/patch-main_c
===
RCS file: /cvs/ports/security/libscrypt/patches/patch-main_c,v
retrieving revision 1.2
diff -u -p -p -u -r1.2 patch-main_c
--- patches/patch-main_c8 May 2014 20:49:41 - 1.2
+++ patches/patch-main_c18 Apr 2018 15:07:51 -
@@ -2,9 +2,10 @@ $OpenBSD: patch-main_c,v 1.2 2014/05/08
Trivial change of strcpy() to strlcpy().
Size of stack variable mcf and mcf2 is well known.
`make check` runs fine with it.
main.c.origTue May 6 11:42:07 2014
-+++ main.c Thu May 8 21:29:01 2014
-@@ -148,7 +148,7 @@ int main()
+Index: main.c
+--- main.c.orig
main.c
+@@ -161,7 +161,7 @@ int main()
printf("TEST EIGHT: SUCCESSFUL, calculated mcf\n%s\n", mcf);
/* Since later calls to scrypt_check() butcher mcf, make a second */
--
LÉVAI Dániel
PGP key ID = 0x83B63A8F
Key fingerprint = DBEC C66B A47A DFA2 792D 650C C69B BE4C 83B6 3A8F
Re: UPDATE: fonts/terminus-font to 4.46
Stuart Henderson @ 2017-08-04T14:05:18 +0200:
> On 2017/07/31 14:28, Kaashif Hymabaccus wrote:
> > On Mon, Jul 31, 2017 at 10:14:39AM +0100, Stuart Henderson wrote:
> > > MODULES +=lang/python
> > > MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
> > > MODPY_RUNDEP =No
> > > MAKE_FLAGS = INT=${MODPY_BIN}
> > >
> > > > -@comment share/fonts/terminus/ter-x12b.pcf.gz
> > > > +share/fonts/terminus/ter-x12b.pcf.gz
> > >
> > > This @comment was intentional, nothing changed regarding this font
> > > (6x12 bold - see r1.2 of the ports Makefile).
> >
> > Thanks for the improvements. See below for the improved diff.
> >
> > > The other question is whether anyone needs the X11 8-bit fonts that
> > > weren't removed but stopped being installed by default with this
> > > update.
> >
> > I don't know about this. If anyone uses them, they can reply to this
> > mail, I suppose.
>
> Turns out I *was* using ter-112n which was removed by this. It took me
> a few days to reboot and notice that xstatbar wasn't displaying, then
> a bit longer to figure out why... I'm sure I'm not the only one, so
> here's a modified diff which re-adds them.
>
> Is this ok with you Daniel?
Yes, and thanks guys so much for taking care of this, while I was
slacking!
Daniel
Re: fonts/terminus-font: Add `centered_tilde' flavor
Stuart Henderson @ 2016-04-24T02:57:12 +0200:
> On 2016/04/23 16:34, patrick keshishian wrote:
> > + symquotes- Build with symmetric single quotes.
> > + centered_tilde - Build with centered ASCII tilde.
> > + symquotes-centered_tilde - Build with both modifications.
>
> I think this last line is a little confusing, it suggests there's
> something unusual about this port - and if you're building it from
> ports it won't work like that anyway - you would specify it like
> `env FLAVOR="symquotes centered_tilde" make'.
>
> Looking at the post-patch target, we don't actually need it at
> all, see the diff below. I also included upstream's patch names in
> DESCR in case somebody is looking for a variant by that name, and
> tweaked the text above a little.
>
> Although I am still in two minds about this strange spelling of
> the word that most English-speakers in the world know as "centred".
>
> OK with you Daniel? (and I guess, as maintainer, you get final
> choice on spelling ;-)
I'm okay with whatever makes this comfortable for users.
But I'm not a native speaker, and I don't want to step on anyone's toes,
so please decide on the spelling :)
Daniel
> Index: Makefile
> ===
> RCS file: /cvs/ports/fonts/Makefile,v
> retrieving revision 1.31
> diff -u -p -r1.31 Makefile
> --- Makefile 10 Mar 2016 07:22:46 - 1.31
> +++ Makefile 24 Apr 2016 00:48:51 -
> @@ -56,6 +56,9 @@
> SUBDIR += spranq-ecofont-ttf
> SUBDIR += symbola-ttf
> SUBDIR += terminus-font
> + SUBDIR += terminus-font,symquotes
> + SUBDIR += terminus-font,symquotes,centered_tilde
> + SUBDIR += terminus-font,centered_tilde
> SUBDIR += ubuntu-fonts
> SUBDIR += un-fonts
> SUBDIR += zh-arphicttf
> Index: terminus-font/Makefile
> ===
> RCS file: /cvs/ports/fonts/terminus-font/Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile
> --- terminus-font/Makefile13 Nov 2015 20:18:25 - 1.10
> +++ terminus-font/Makefile24 Apr 2016 00:48:51 -
> @@ -3,6 +3,7 @@
> COMMENT =fixed width fonts especially for long hacking sessions
>
> DISTNAME = terminus-font-4.40
> +REVISION = 0
> CATEGORIES = fonts x11
>
> HOMEPAGE = http://terminus-font.sourceforge.net/
> @@ -24,13 +25,18 @@ FONTDIR = ${PREFIX}/share/fonts/terminu
>
> USE_GMAKE = Yes
>
> -FLAVORS =symquotes
> +FLAVORS =symquotes centered_tilde
> FLAVOR ?=
>
> +.if ${FLAVOR:Mcentered_tilde}
> +FLAVOR_PATCHES += ${WRKSRC}/alt/td1.diff
> +.endif
> +
> .if ${FLAVOR:Msymquotes}
> -post-patch:
> - ${PATCH} -d ${WRKSRC} < ${WRKSRC}/alt/gq2.diff
> +FLAVOR_PATCHES += ${WRKSRC}/alt/gq2.diff
> .endif
> +
> +PATCH_LIST = patch-* ${FLAVOR_PATCHES}
>
> do-install:
> ${GZIP_CMD} ${WRKSRC}/*.pcf
> Index: terminus-font/pkg/DESCR
> ===
> RCS file: /cvs/ports/fonts/terminus-font/pkg/DESCR,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 DESCR
> --- terminus-font/pkg/DESCR 19 Jul 2011 09:16:08 - 1.1.1.1
> +++ terminus-font/pkg/DESCR 24 Apr 2016 00:48:51 -
> @@ -1,5 +1,6 @@
> The Terminus font is a complete set of fixed-size fonts designed
> -especially for the usage in terms.
> +especially for use in terminals.
>
> Flavors:
> - symquotes - Build with symmetric single quotes.
> + symquotes - Build with symmetric single quotes (gq2)
> + centered_tilde - Build with centered ASCII tilde (td1)
>
--
LÉVAI Dániel
PGP key ID = 0x83B63A8F
Key fingerprint = DBEC C66B A47A DFA2 792D 650C C69B BE4C 83B6 3A8F
UPDATE: fonts/terminus
Hi! Update to terminus font: Index: Makefile === RCS file: /cvs/ports/fonts/terminus-font/Makefile,v retrieving revision 1.9 diff -u -p -p -u -r1.9 Makefile --- Makefile31 Mar 2015 09:45:11 - 1.9 +++ Makefile13 Nov 2015 09:18:02 - @@ -2,7 +2,7 @@ COMMENT = fixed width fonts especially for long hacking sessions -DISTNAME = terminus-font-4.39 +DISTNAME = terminus-font-4.40 CATEGORIES = fonts x11 REVISION = 0 Index: distinfo === RCS file: /cvs/ports/fonts/terminus-font/distinfo,v retrieving revision 1.4 diff -u -p -p -u -r1.4 distinfo --- distinfo8 May 2014 22:18:39 - 1.4 +++ distinfo13 Nov 2015 09:18:02 - @@ -1,2 +1,2 @@ -SHA256 (terminus-font-4.39.tar.gz) = MQg4OYazZaS5zAjDGkGVGW9t6XTSc1139sbvqf6x9b8= -SIZE (terminus-font-4.39.tar.gz) = 324890 +SHA256 (terminus-font-4.40.tar.gz) = ZPUsJNPxweOfIebEMHepvj4h1DhPF29XZsAFWLpnBxE= +SIZE (terminus-font-4.40.tar.gz) = 558440 Daniel -- LÉVAI Dániel PGP key ID = 0x83B63A8F Key fingerprint = DBEC C66B A47A DFA2 792D 650C C69B BE4C 83B6 3A8F
Re: UPDATE: fonts/terminus
Gleydson Soares @ 2015-11-13T12:23:30 +0100: > Hi, > > > REVISION = 0 > > remove that line, since you are updating to a new version. > apart from that, it looks right, though I haven't tested... > Gotcha Index: Makefile === RCS file: /cvs/ports/fonts/terminus-font/Makefile,v retrieving revision 1.9 diff -u -p -p -u -r1.9 Makefile --- Makefile31 Mar 2015 09:45:11 - 1.9 +++ Makefile13 Nov 2015 12:13:32 - @@ -2,9 +2,8 @@ COMMENT = fixed width fonts especially for long hacking sessions -DISTNAME = terminus-font-4.39 +DISTNAME = terminus-font-4.40 CATEGORIES = fonts x11 -REVISION = 0 HOMEPAGE = http://terminus-font.sourceforge.net/ Index: distinfo === RCS file: /cvs/ports/fonts/terminus-font/distinfo,v retrieving revision 1.4 diff -u -p -p -u -r1.4 distinfo --- distinfo8 May 2014 22:18:39 - 1.4 +++ distinfo13 Nov 2015 12:13:32 - @@ -1,2 +1,2 @@ -SHA256 (terminus-font-4.39.tar.gz) = MQg4OYazZaS5zAjDGkGVGW9t6XTSc1139sbvqf6x9b8= -SIZE (terminus-font-4.39.tar.gz) = 324890 +SHA256 (terminus-font-4.40.tar.gz) = ZPUsJNPxweOfIebEMHepvj4h1DhPF29XZsAFWLpnBxE= +SIZE (terminus-font-4.40.tar.gz) = 558440
Re: minidlna not working with minissdpd
On h, júl 13, 2015 at 14:22:06 +0200, LÉVAI Dániel wrote: [...] (run it with debug mode enabled, and you'll see), but somehow they get lost between the software and the hardware. Ehm, sorry for this BS. The problem actually lies inside minidlna: http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=4413 sthen@, would you like for me to cook up a diff for the port to include this tiny patch to fix it? Daniel -- LÉVAI Dániel PGP key ID = 0x83B63A8F Key fingerprint = DBEC C66B A47A DFA2 792D 650C C69B BE4C 83B6 3A8F
Re: minidlna not working with minissdpd
On h, júl 13, 2015 at 11:14:19 +0300, kasak wrote: Hello everyone! I'm in trouble with minidlna, installed from pkgs in OpenBSD 5.7 I have installed miniupnpd, minidlna, and minissdpd from packages, added minissdpd_flags=-i em1 in my /etc/rc.conf.local, next i uncommented minissdpdsocket=/var/run/minissdpd.sock in files /etc/miniupnpd.conf and /etc/minidlna.conf and started all daemons in next order: minissdpd - miniupnpd - minidlna and it seems that miniupnpd works and minidlna not :( In other words, it is starting and i can open http://192.168.0.1:8200 but it does not appear on dlna clients Otherwise, if I disable all minissdpd, miniupnpd and start minidlna alone, it works well! If I try to start only minissdpd and minidlna it doesn't work. I have the same exact issue with the mini* trio. My setup is a bit more complicated, it involves three network interfaces and a bridge. What is interesting however, is that it seems this is somehow related to the bridge or one of the NIC's drivers, because with bge(4) minissdpd+minidlna works, but with fxp(4)+bridge(4) minissdpd+minidlna does not. The discoveries (multicast) are received from upnp clients, and the advertisements get sent out from minissdpd (run it with debug mode enabled, and you'll see), but somehow they get lost between the software and the hardware. Shame on me, because I didn't debug it further and reported it, but this is an older OBSD 5.5, with an old hardware, and I thought I upgrade both first, and try it out with different NICs and a -current OBSD. However, seeing that someone else already feels the same pain, I thought I'll just chime in... Here is some log when starting minidlna: [2015/07/12 23:51:16] minidlna.c:1026: warn: Starting MiniDLNA version 1.1.4. [2015/07/12 23:51:16] minissdp.c:114: error: bind(udp): Address already in use [2015/07/12 23:51:16] minidlna.c:1065: warn: HTTP listening on port 8200 [2015/07/12 23:51:16] minissdp.c:80: error: setsockopt(udp, IP_ADD_MEMBERSHIP): Bad file descriptor [2015/07/12 23:51:16] minissdp.c:180: warn: Failed to add multicast membership for address 192.168.0.1 Maybe I'm doing something wrong? Or is it a bug? The first error (minissdpd.c:114: error: ...) is actually from minidlna, and if minissdpd is already running, it just confirms that minissdpd already binds to the required address, and minidlna should fall back to the socket that is configured in minidlna.conf to communicate with minissdpd. Running minissdpd with the -d option, and minidlna with -d and -v tells you more information during client discoveries and replies; maybe it will be useful to post those to the list also (at least for just the archives), and I'll try to do the same sometime. Daniel -- LÉVAI Dániel PGP key ID = 0x83B63A8F Key fingerprint = DBEC C66B A47A DFA2 792D 650C C69B BE4C 83B6 3A8F
Re: minidlna media db. refresh
On h, jan 19, 2015 at 17:16:06 +0100, Antoine Jacoutot wrote:
On Mon, Jan 19, 2015 at 05:13:09PM +0100, David Coppa wrote:
On Mon, Jan 19, 2015 at 12:06 AM, LÉVAI Dániel l...@ecentrum.hu wrote:
It might be better to look at the kqueue patch that FreeBSD are using.
Now this seems to work for me on i386, at least. It applied almost
clean, but I've taken the liberty and removed the whitespace-only
changes from FreeBSD's diff(s). I'll be honest, it got a bit slower, but
this could very well be because of my rusty hard drives.
Here is my diff:
I do not use MiniDLNA, but your diff below looks good and, if it
works, then it's ok with me if Stuart wants to commit it.
There seems to be a missing bdep on the autostuffs.
Thanks! New diff with BUILD_DEPENDS, and some notes/concerns.
While I'm browsing a directory on my tv with pictures in it, during some
(not all) of the thumbnail generations I get these errors in
minidlna.log:
inotify.c:856: warn: kevent polling failure: Interrupted system call
I get like couple of hundreds with more than 500+ pictures in the dir.
I only found this in connection with this error:
http://lists.freebsd.org/pipermail/freebsd-ports/2014-June/093524.html
Which could be suspicious, but it really can't seem to hurt anything
(except the growing log file).
Anyway, one of the most annoying things while I was testing was the
(duplicate) re-appearance of the network server in the tv's network
browser menu, after every minidlnad restart. Turns out, it generates a
random uuid on every startup if one is not defined in the configuration
file. So I inserted an example uuid= line into the minidlna.conf config
file with a short comment.
Given that I also experienced a general slowness when using kevents,
this update seems a bit shaky to me; nevertheless, it seems to be
working.
Maybe by default, we could disable inotify in the config, and just
write a notice after package install that the user has the option to
turn this on, with some fair warnings?
Index: Makefile
===
RCS file: /cvs/ports/multimedia/minidlna/Makefile,v
retrieving revision 1.10
diff -p -u -r1.10 Makefile
--- Makefile3 Sep 2014 21:15:43 - 1.10
+++ Makefile25 Jan 2015 10:00:53 -
@@ -3,6 +3,7 @@
COMMENT= lightweight DLNA/UPnP-AV media server
V= 1.1.4
+REVISION= 0
DISTNAME= minidlna-$V
PKGNAME= minidlna-$V
@@ -28,15 +29,25 @@ CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/
LDFLAGS=-L${LOCALBASE}/lib
MODULES= devel/gettext
+
+BUILD_DEPENDS= devel/autoconf/2.69 \
+ devel/automake/1.14
+
LIB_DEPENDS= audio/flac \
audio/libid3tag \
graphics/ffmpeg \
graphics/jpeg \
graphics/libexif
+AUTOCONF_VERSION= 2.69
+AUTOMAKE_VERSION= 1.14
+
NO_TEST= Yes
E= ${PREFIX}/share/examples/minidlna
+post-patch:
+ @cd ${WRKSRC} env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
post-install:
${INSTALL_DATA_DIR} $E
${INSTALL_DATA} ${WRKSRC}/minidlna.conf $E
Index: patches/patch-configure_ac
===
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-configure_ac 25 Jan 2015 10:00:53 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.ac.orig Tue Aug 26 23:09:22 2014
configure.ac Sun Jan 18 22:45:07 2015
+@@ -481,7 +481,7 @@ AC_CHECK_LIB(vorbisfile, vorbis_comment_query,
+
+ ### Header checks
+
+-AC_CHECK_HEADERS([arpa/inet.h asm/unistd.h endian.h machine/endian.h fcntl.h
libintl.h locale.h netdb.h netinet/in.h stddef.h stdlib.h string.h sys/file.h
sys/inotify.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h])
++AC_CHECK_HEADERS([arpa/inet.h asm/unistd.h endian.h machine/endian.h fcntl.h
libintl.h locale.h netdb.h netinet/in.h stddef.h stdlib.h string.h sys/file.h
sys/inotify.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h
sys/event.h])
+
+ AC_CHECK_FUNCS(inotify_init, AC_DEFINE(HAVE_INOTIFY,1,[Whether kernel has
inotify support]), [
+ AC_MSG_CHECKING([for __NR_inotify_init syscall])
Index: patches/patch-inotify_c
===
RCS file: patches/patch-inotify_c
diff -N patches/patch-inotify_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-inotify_c 25 Jan 2015 10:00:53 -
@@ -0,0 +1,469 @@
+$OpenBSD$
+--- inotify.c.orig Tue Aug 26 23:09:22 2014
inotify.c Sun Jan 18 23:53:30 2015
+@@ -17,7 +17,7 @@
+ */
+ #include config.h
+
+-#ifdef HAVE_INOTIFY
++#if defined(HAVE_INOTIFY) || defined(HAVE_SYS_EVENT_H)
+ #include
Re: minidlna media db. refresh
On h, jan 19, 2015 at 18:53:48 +0100, Martijn van Duren wrote: On 01/19/15 17:13, David Coppa wrote: On Mon, Jan 19, 2015 at 12:06 AM, LÉVAI Dániel l...@ecentrum.hu wrote: It might be better to look at the kqueue patch that FreeBSD are using. Now this seems to work for me on i386, at least. It applied almost clean, but I've taken the liberty and removed the whitespace-only changes from FreeBSD's diff(s). I'll be honest, it got a bit slower, but this could very well be because of my rusty hard drives. Here is my diff: I do not use MiniDLNA, but your diff below looks good and, if it works, then it's ok with me if Stuart wants to commit it. How will this patch affect libraries with more then 512 directories, since kqueue is restricted by the limit of open file descriptors? martijn@donar:/home/multimedia/Video's$ ulimit -n 512 martijn@donar:/home/multimedia/Video's$ find . -type d | wc -l 2345 martijn@donar:/home/multimedia/Video's$ find . -type f | wc -l 57640 [...] I think that's why we need testing :) Daniel Comments, tests? Daniel -- LÉVAI Dániel PGP key ID = 0x83B63A8F Key fingerprint = DBEC C66B A47A DFA2 792D 650C C69B BE4C 83B6 3A8F -- LÉVAI Dániel PGP key ID = 0x83B63A8F Key fingerprint = DBEC C66B A47A DFA2 792D 650C C69B BE4C 83B6 3A8F
minidlna media db. refresh
Hi! Has anyone ever had a problem with minidlna not refreshing its media library automatically (on -current)? Does this only work on Linux w/ inotify? Daniel -- LÉVAI Dániel PGP key ID = 0x83B63A8F Key fingerprint = DBEC C66B A47A DFA2 792D 650C C69B BE4C 83B6 3A8F
Re: minidlna media db. refresh
On v, jan 18, 2015 at 19:57:44 +, Stuart Henderson wrote:
On 2015/01/18 19:10, David Coppa wrote:
On Sun, Jan 18, 2015 at 6:38 PM, Stuart Henderson st...@openbsd.org wrote:
On 2015/01/18 17:42, LÉVAI Dániel wrote:
Hi!
Has anyone ever had a problem with minidlna not refreshing its media
library automatically (on -current)?
That's expected.
Does this only work on Linux w/ inotify?
yep.
Daniel, maybe you could investigate if devel/libinotify is good enough for
it.
Yeah, I got it compiled, but the first thing was a segfault, and I
didn't even bother to dig deeper after I read sthen@'s mail about a
patch to support kqueue/kevent in FreeBSD's ports tree :-) Also, it
seems with libinotify's lib installed in an unusual place (lib/inotify),
one would had to start minidlnad with LD_LIBRARY_FLAGS set -- but of
course, I may be incorrect.
It might be better to look at the kqueue patch that FreeBSD are using.
Now this seems to work for me on i386, at least. It applied almost
clean, but I've taken the liberty and removed the whitespace-only
changes from FreeBSD's diff(s). I'll be honest, it got a bit slower, but
this could very well be because of my rusty hard drives.
Here is my diff:
Index: Makefile
===
RCS file: /cvs/ports/multimedia/minidlna/Makefile,v
retrieving revision 1.10
diff -p -u -r1.10 Makefile
--- Makefile3 Sep 2014 21:15:43 - 1.10
+++ Makefile18 Jan 2015 22:45:10 -
@@ -3,6 +3,7 @@
COMMENT= lightweight DLNA/UPnP-AV media server
V= 1.1.4
+REVISION= 0
DISTNAME= minidlna-$V
PKGNAME= minidlna-$V
@@ -34,9 +35,15 @@ LIB_DEPENDS= audio/flac \
graphics/jpeg \
graphics/libexif
+AUTOCONF_VERSION= 2.69
+AUTOMAKE_VERSION= 1.14
+
NO_TEST= Yes
E= ${PREFIX}/share/examples/minidlna
+post-patch:
+ @cd ${WRKSRC} env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
post-install:
${INSTALL_DATA_DIR} $E
${INSTALL_DATA} ${WRKSRC}/minidlna.conf $E
Index: patches/patch-configure_ac
===
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-configure_ac 18 Jan 2015 22:45:10 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.ac.orig Tue Aug 26 23:09:22 2014
configure.ac Sun Jan 18 22:45:07 2015
+@@ -481,7 +481,7 @@ AC_CHECK_LIB(vorbisfile, vorbis_comment_query,
+
+ ### Header checks
+
+-AC_CHECK_HEADERS([arpa/inet.h asm/unistd.h endian.h machine/endian.h fcntl.h
libintl.h locale.h netdb.h netinet/in.h stddef.h stdlib.h string.h sys/file.h
sys/inotify.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h])
++AC_CHECK_HEADERS([arpa/inet.h asm/unistd.h endian.h machine/endian.h fcntl.h
libintl.h locale.h netdb.h netinet/in.h stddef.h stdlib.h string.h sys/file.h
sys/inotify.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h
sys/event.h])
+
+ AC_CHECK_FUNCS(inotify_init, AC_DEFINE(HAVE_INOTIFY,1,[Whether kernel has
inotify support]), [
+ AC_MSG_CHECKING([for __NR_inotify_init syscall])
Index: patches/patch-inotify_c
===
RCS file: patches/patch-inotify_c
diff -N patches/patch-inotify_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-inotify_c 18 Jan 2015 22:45:10 -
@@ -0,0 +1,569 @@
+$OpenBSD$
+--- inotify.c.orig Sun Jan 18 22:45:24 2015
inotify.c Sun Jan 18 22:45:27 2015
+@@ -15,9 +15,9 @@
+ * You should have received a copy of the GNU General Public License
+ * along with MiniDLNA. If not, see http://www.gnu.org/licenses/.
+ */
+ #include config.h
+
+-#ifdef HAVE_INOTIFY
++#if defined(HAVE_INOTIFY) || defined(HAVE_SYS_EVENT_H)
+ #include stdio.h
+ #include string.h
+ #include stdlib.h
+@@ -31,11 +31,16 @@
+ #include sys/time.h
+ #include sys/resource.h
+ #include poll.h
++#ifdef HAVE_INOTIFY
+ #ifdef HAVE_SYS_INOTIFY_H
+ #include sys/inotify.h
+-#else
++#else /*HAVE_SYS_INOTIFY_H*/
+ #include linux/inotify.h
+ #include linux/inotify-syscalls.h
++#endif /*HAVE_SYS_INOTIFY_H*/
++#else
++#include sys/event.h
++#include fcntl.h
+ #endif
+ #include libav.h
+
+@@ -49,11 +54,13 @@
+ #include playlist.h
+ #include log.h
+
++#ifdef HAVE_INOTIFY
+ #define EVENT_SIZE ( sizeof (struct inotify_event) )
+ #define BUF_LEN ( 1024 * ( EVENT_SIZE + 16 ) )
+ #define DESIRED_WATCH_LIMIT 65536
+
+ #define PATH_BUF_SIZE PATH_MAX
++#endif
+
+ struct watch
+ {
+@@ -86,13 +93,35 @@ add_watch(int fd, const char * path)
+ struct watch *nw;
+ int wd;
+
++#ifdef HAVE_INOTIFY
+ wd = inotify_add_watch(fd, path,
IN_CREATE|IN_CLOSE_WRITE|IN_DELETE
UPDATE: libscrypt - 1.20
Hi! Here is an update to libscrypt: Index: Makefile === RCS file: /cvs/ports/security/libscrypt/Makefile,v retrieving revision 1.3 diff -u -p -p -u -r1.3 Makefile --- Makefile10 Jul 2014 11:06:37 - 1.3 +++ Makefile3 Jan 2015 12:29:06 - @@ -5,7 +5,7 @@ SHARED_ONLY = Yes COMMENT = shared library that implements scrypt() functionality -V =1.19 +V =1.20 GH_ACCOUNT = technion GH_PROJECT = libscrypt GH_TAGNAME = v$V Index: distinfo === RCS file: /cvs/ports/security/libscrypt/distinfo,v retrieving revision 1.2 diff -u -p -p -u -r1.2 distinfo --- distinfo8 May 2014 20:49:41 - 1.2 +++ distinfo3 Jan 2015 12:29:06 - @@ -1,2 +1,2 @@ -SHA256 (libscrypt-1.19.tar.gz) = jzmGd7K0PiFCO4ABVrM3nzyw0xTnDuwusug6ASvOhU8= -SIZE (libscrypt-1.19.tar.gz) = 18208 +SHA256 (libscrypt-1.20.tar.gz) = YHSt0hcLfQDggP46WNPex2hQpPJy1Ij16Mw8SsttjiE= +SIZE (libscrypt-1.20.tar.gz) = 18451 Index: patches/patch-Makefile === RCS file: /cvs/ports/security/libscrypt/patches/patch-Makefile,v retrieving revision 1.2 diff -u -p -p -u -r1.2 patch-Makefile --- patches/patch-Makefile 8 May 2014 20:49:41 - 1.2 +++ patches/patch-Makefile 3 Jan 2015 12:29:06 - @@ -4,8 +4,8 @@ $OpenBSD: patch-Makefile,v 1.2 2014/05/0 - sys.mk defines CFLAGS and LDFLAGS so don't use conditional value assignments for those. - we don't patch the install-osx target, because we don't use it Makefile.orig Tue May 6 11:42:07 2014 -+++ Makefile Thu May 8 21:41:43 2014 +--- Makefile.orig Mon Dec 1 11:39:02 2014 Makefile Sat Jan 3 13:21:10 2015 @@ -5,20 +5,19 @@ MAKE_DIR ?= install -d INSTALL_DATA ?= install @@ -18,7 +18,7 @@ $OpenBSD: patch-Makefile,v 1.2 2014/05/0 all: reference - OBJS= crypto_scrypt-nosse.o sha256.o crypto_scrypt-hexconvert.o crypto-mcf.o b64.o crypto-scrypt-saltgen.o crypto_scrypt-check.o crypto_scrypt-hash.o slowequals.o + OBJS= crypto_scrypt-nosse.o sha256.o crypto-mcf.o b64.o crypto-scrypt-saltgen.o crypto_scrypt-check.o crypto_scrypt-hash.o slowequals.o -libscrypt.so.0: $(OBJS) - $(CC) $(LDFLAGS) -shared -o libscrypt.so.0 $(OBJS) -lm -lc @@ -48,7 +48,7 @@ $OpenBSD: patch-Makefile,v 1.2 2014/05/0 install-osx: libscrypt.so.0 $(MAKE_DIR) $(DESTDIR) $(DESTDIR)$(PREFIX) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(INCLUDEDIR) -@@ -46,4 +44,4 @@ install-osx: libscrypt.so.0 +@@ -47,4 +45,4 @@ install-osx: libscrypt.so.0 $(INSTALL_DATA) -pm 0644 libscrypt.h $(DESTDIR)$(INCLUDEDIR) install-static: libscrypt.a Index: patches/patch-main_c === RCS file: /cvs/ports/security/libscrypt/patches/patch-main_c,v retrieving revision 1.2 diff -u -p -p -u -r1.2 patch-main_c --- patches/patch-main_c8 May 2014 20:49:41 - 1.2 +++ patches/patch-main_c3 Jan 2015 12:29:06 - @@ -2,9 +2,9 @@ $OpenBSD: patch-main_c,v 1.2 2014/05/08 Trivial change of strcpy() to strlcpy(). Size of stack variable mcf and mcf2 is well known. `make check` runs fine with it. main.c.origTue May 6 11:42:07 2014 -+++ main.c Thu May 8 21:29:01 2014 -@@ -148,7 +148,7 @@ int main() +--- main.c.origMon Dec 1 11:39:02 2014 main.c Sat Jan 3 13:16:29 2015 +@@ -149,7 +149,7 @@ int main() printf(TEST EIGHT: SUCCESSFUL, calculated mcf\n%s\n, mcf); /* Since later calls to scrypt_check() butcher mcf, make a second */ Daniel -- LÉVAI Dániel PGP key ID = 0x83B63A8F Key fingerprint = DBEC C66B A47A DFA2 792D 650C C69B BE4C 83B6 3A8F
Horde IMP folder encoding - help needed
Hi! I'm using PHP and Horde(3.3.2)/IMP(4.3.2) from ports (-current). I have a problem with the folder name displaying. I've installed and tried the same configuration on my desktop (Linux) machine, and it worked there, that's why I have the courage to write to the list. I've also filed a ticket to the Horde/IMP tracker, but they can not reproduce it (it is http://bugs.horde.org/ticket/7781 if anybody is interested. One can see there a screenshot too, about the problem). So... after login, the left-side folder list comes up, and it has some folders, which contains localized characters. This is only displayed correctly when I select the English (American or Canadian or British) language on the IMP login page from the drop-down menu. When I choose any other locale (but let's say now I choose my own locale, which is Magyar (Hungarian)), the folder list won't display the correct characters in the folders' names. It's like this: Folder name with English (*) locale: Ügyfél Folder name with Magyar locale: ANw-gyfAOk-l The latter is the same UTF-7 displaying as the folder's name on the filesystem: # ls -1 user/Maildir/ [...] .ANw-gyfAOk-l/ [...] Other supposedly useful information: $ php -i |fgrep mbstring mbstring.detect_order = no value = no value mbstring.encoding_translation = Off = Off mbstring.func_overload = 0 = 0 mbstring.http_input = pass = pass mbstring.http_output = pass = pass mbstring.internal_encoding = ISO-8859-1 = ISO-8859-1 mbstring.language = neutral = neutral mbstring.strict_detection = Off = Off mbstring.substitute_character = no value = no value $ php -i |fgrep iconv Registered Stream Filters = string.rot13, string.toupper, string.tolower, string.strip_tags, convert.*, consumed, convert.iconv.*, zlib.* iconv iconv support = enabled iconv implementation = libiconv iconv library version = 1.11 iconv.input_encoding = ISO-8859-1 = ISO-8859-1 iconv.internal_encoding = ISO-8859-1 = ISO-8859-1 iconv.output_encoding = ISO-8859-1 = ISO-8859-1 It's like that IMP doesn't even try to convert the folder names, because it is displayed in the native way, exactly the same as on the filesystem. BTW, this is with a dovecot IMAP server. Thanks for any help! Daniel -- LEVAI Daniel PGP key ID = 0x4AC0A4B1 Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
can not build dovecot with an altered --sysconfdir configure parameter
Hi! Why can't I specify --sysconfdir=/etc/dovecot in dovecot's Makefile with the CONFIGURE_ARGS+= parameter? The build appends another --sysconfdir parameter to ./configure, which has a /etc value, and the latter gets recognized. Daniel -- LEVAI Daniel PGP key ID = 0x4AC0A4B1 Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
NEW: devel/pear-Console_Table (for horde translations)
Hi! This a port for the Console_Table package, which is needed for the horde/po/translation.php script. This script is useful for translators. Daniel -- LEVAI Daniel PGP key ID = 0x4AC0A4B1 Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1 pear-Console_Table.tar.gz Description: application/gzip
NEW: textproc/pear-File_Find (for horde translations)
Hi! This a port for the File_Find package, which is needed for the horde/po/translation.php script. This script is useful for translators. Daniel -- LEVAI Daniel PGP key ID = 0x4AC0A4B1 Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1 pear-File_Find.tar.gz Description: application/gzip
Re: UPDATE: graphics/GraphicsMagick
GraphicsMagick update to 1.3.3: http://www.demirmen.com/~okan/GraphicsMagick-1.3.3.diff Great work, thanks! koffice bit with kili's patch for GM 1.3.3: http://www.demirmen.com/~okan/koffice-GM-1.3.3.diff While we've found no regressions so far, neither of us are KDE/koffice users; please test and comment - Thanks. Daniel -- LEVAI Daniel PGP key ID = 0x4AC0A4B1 Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
NEW: pecl-lzf
Hi! This is a port of the lzf extension from pecl. Anyone to comment/test? Thanks! Daniel -- LEVAI Daniel PGP key ID = 0x4AC0A4B1 Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1 pecl-lzf.tar.gz Description: application/gzip
pecl port?
Hi! Has anyone succeeded in porting a php pecl extension? I'm just sweating over it right now... Daniel -- LEVAI Daniel PGP key ID = 0x4AC0A4B1 Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
Re: pecl port?
Stuart Henderson wrote: On 2008/12/15 10:59, LÉVAI Dániel wrote: Hi! Has anyone succeeded in porting a php pecl extension? I'm just sweating over it right now... locate pecl- shows two in-tree. OMG, I mistyped the find(1) command, sorry... Daniel -- LEVAI Daniel PGP key ID = 0x4AC0A4B1 Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
pear packages
Hi! What is the way of handling pear package upgrades? Is it safe to use pear upgrade-all, or should one stay with ports, and wait for an update there? Daniel -- LEVAI Daniel PGP key ID = 0x4AC0A4B1 Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
Re: pear packages
On Sunday 14 December 2008 19.11.50 you wrote: * LÉVAI Dániel wrote: Hi! What is the way of handling pear package upgrades? Is it safe to use pear upgrade-all, or should one stay with ports, and wait for an update there? I'd suggest to stay with packages. For which packages would you need an update, btw? I was just trying to use Fileinfo, which is not in ports, so I had to mess around with pecl (what is completely new for me), and noticed the upgrade parameter. I was just simply wondering... Daniel -- LEVAI Daniel PGP key ID = 0x4AC0A4B1 Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
UPDATE: net/rrdtool
Hi!
This updates rrdtool-1.2.23 to 1.2.28. Use patch -E, one new patch was
added, and one removed.
It's been running for a while on i386 here without problems.
Please test/comment.
Daniel
--
LEVAI Daniel
PGP key ID = 0x4AC0A4B1
Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
Index: Makefile
===
RCS file: /cvs/ports/net/rrdtool/Makefile,v
retrieving revision 1.43
diff -u -r1.43 Makefile
--- Makefile 7 Oct 2008 14:27:22 - 1.43
+++ Makefile 27 Nov 2008 09:16:38 -
@@ -6,11 +6,11 @@
COMMENT-perl= perl interface to librrd
COMMENT-python= python interface to librrd
-VERSION= 1.2.23
+VERSION= 1.2.28
DISTNAME= rrdtool-${VERSION}
PKGNAME-main= ${DISTNAME}p0
-PKGNAME-perl= p5-RRD-${VERSION}p1
-PKGNAME-python= py-rrd-${VERSION}p1
+PKGNAME-perl= p5-RRD-${VERSION}
+PKGNAME-python= py-rrd-${VERSION}p0
SHARED_LIBS+= rrd 3.0
SHARED_LIBS+= rrd_th 3.0
Index: distinfo
===
RCS file: /cvs/ports/net/rrdtool/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo 12 Sep 2007 14:34:36 - 1.9
+++ distinfo 27 Nov 2008 09:16:38 -
@@ -1,5 +1,5 @@
-MD5 (rrdtool-1.2.23.tar.gz) = 2voWG8nGHldjamCFyHwf6A==
-RMD160 (rrdtool-1.2.23.tar.gz) = DBFHJCrfR29ek/TVm1U+4+o3iyM=
-SHA1 (rrdtool-1.2.23.tar.gz) = XaYQ4ci8AbgKvCGrnpjgBDY7Qpw=
-SHA256 (rrdtool-1.2.23.tar.gz) = Sx3wCyOnShyBc03SdOcuANi7KbEeHz0pOP+HaR7OHw8=
-SIZE (rrdtool-1.2.23.tar.gz) = 1061530
+MD5 (rrdtool-1.2.28.tar.gz) = xniBHCqsyGWr9C1dIeyNdg==
+RMD160 (rrdtool-1.2.28.tar.gz) = EaTGQUA3s84OSdSbRY+fwT8+97o=
+SHA1 (rrdtool-1.2.28.tar.gz) = qMp1/PezLKlLBX+mY+X5iVIuLfk=
+SHA256 (rrdtool-1.2.28.tar.gz) = oAj+yYuzbQmnvogQr73Rv1HXNlIA0DoOlmopv4cbMEE=
+SIZE (rrdtool-1.2.28.tar.gz) = 1089006
Index: patches/patch-bindings_Makefile_in
===
RCS file: /cvs/ports/net/rrdtool/patches/patch-bindings_Makefile_in,v
retrieving revision 1.1
diff -u -r1.1 patch-bindings_Makefile_in
--- patches/patch-bindings_Makefile_in 12 Sep 2007 14:34:36 - 1.1
+++ patches/patch-bindings_Makefile_in 27 Nov 2008 09:16:38 -
@@ -1,12 +1,21 @@
-$OpenBSD: patch-bindings_Makefile_in,v 1.1 2007/09/12 14:34:36 msf Exp $
bindings/Makefile.in.orig Wed May 2 19:06:59 2007
-+++ bindings/Makefile.in Tue Sep 11 14:31:11 2007
-@@ -550,7 +550,7 @@ ruby:
+--- bindings/Makefile.in.orig Wed Jul 23 15:56:19 2008
bindings/Makefile.in Sat Nov 22 14:09:31 2008
+@@ -552,15 +552,15 @@ install-data-local:
+ test -f ruby/Makefile cd ruby $(MAKE) EPREFIX=$(DESTDIR)$(exec_prefix) $(RUBY_MAKE_OPTIONS) install || true
+ test -d python/build cd python env BUILDLIBDIR=../../src/.libs $(PYTHON) setup.py install --skip-build --prefix=$(DESTDIR)$(prefix) --exec-prefix=$(DESTDIR)$(exec_prefix) || true
- # rules for buildung the pyton module
+-# rules for buildung the ruby module
++# rules for building the ruby module
+ # RUBYARCHDIR= is to work around in a makefile quirk not sure
+ # it is is the right thing todo, but it makes rrdtool build on freebsd as well
+ ruby:
+ cd ruby $(RUBY) extconf.rb $(MAKE) EPREFIX=$(exec_prefix) $(RUBY_MAKE_OPTIONS) RUBYARCHDIR=
+
+-# rules for buildung the pyton module
++# rules for building the python module
python:
-- cd python env LIBDIR=../../src/.libs $(PYTHON) setup.py build
-+ cd python env LIBDIR=../../src/.libs INCDIR=../../src $(PYTHON) setup.py build
+- cd python env BUILDLIBDIR=../../src/.libs $(PYTHON) setup.py build_ext --rpath=$(libdir) env LIBDIR=../../src/.libs $(PYTHON) setup.py build
++ cd python env BUILDLIBDIR=../../src/.libs INCDIR=../../src $(PYTHON) setup.py build_ext --rpath=$(libdir) env LIBDIR=../../src/.libs $(PYTHON) setup.py build
# rules for building the perl module
perl_piped: perl-piped/Makefile
Index: patches/patch-doc_Makefile_in
===
RCS file: /cvs/ports/net/rrdtool/patches/patch-doc_Makefile_in,v
retrieving revision 1.6
diff -u -r1.6 patch-doc_Makefile_in
--- patches/patch-doc_Makefile_in 12 Sep 2007 14:34:36 - 1.6
+++ patches/patch-doc_Makefile_in 27 Nov 2008 09:16:38 -
@@ -1,7 +1,7 @@
-$OpenBSD: patch-doc_Makefile_in,v 1.6 2007/09/12 14:34:36 msf Exp $
doc/Makefile.in.orig Thu May 3 03:06:59 2007
-+++ doc/Makefile.in Wed Jun 20 08:48:25 2007
-@@ -147,7 +147,7 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
+$OpenBSD$
+--- doc/Makefile.in.orig Wed Jul 23 15:56:19 2008
doc/Makefile.in Sat Nov 22 14:09:31 2008
+@@ -150,7 +150,7 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
Index: patches/patch-examples_Makefile_in
===
RCS file: /cvs/ports/net/rrdtool/patches/patch-examples_Makefile_in,v
retrieving revision 1.6
diff -u -r1.6 patch-examples_Makefile_in
---
Re: UPDATE: net/rrdtool
Stuart Henderson wrote:
On 2008/12/11 10:44, LÉVAI Dániel wrote:
PKGNAME-main= ${DISTNAME}p0
this can go completely
-PKGNAME-python= py-rrd-${VERSION}p1
+PKGNAME-python= py-rrd-${VERSION}p0
and remove p0 here
SHARED_LIBS+= rrd 3.0
SHARED_LIBS+= rrd_th 3.0
diff doesn't show any API changes so that looks alright, but you should
always check (and if you did already check, please mention that :-)
I'll do that next time, sorry.
+-# rules for buildung the ruby module
++# rules for building the ruby module
+-# rules for buildung the pyton module
++# rules for building the python module
it's pointless to fix these in a ports diff, please just send them upstream
Alright.
+-#if defined(HAVE_SYS_MMAN_H)
+-#include sys/mman.h
+-#endif
+-
+ #ifdef HAVE_SYS_TYPES_H
+ # include sys/types.h
++#endif
++
++#if defined(HAVE_SYS_MMAN_H)
++#include sys/mman.h
+ #endif
I agree with doing that here for now but it also should go upstream.
Okay, I'll send them.
WANTLIB-perl needed an update, and the PLISTs needed changing.
I'll send an updated diff to the port's maintainer.
Thank you!
Daniel
--
LEVAI Daniel
PGP key ID = 0x4AC0A4B1
Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
Re: UPDATE: net/rrdtool
Stuart Henderson wrote: On 2008/12/12 01:46, Stuart Henderson wrote: On 2008/12/12 09:31, Dongsheng Song wrote: Is anyone work for RRDtool 1.3.4 ? i'll probably look at it in a day or two. ..or sooner. Really lightly tested in standalone use on amd64 only so far. Definitely needs much testing in other places and with the bindings. Those using it in a chrooted environment will have a couple more libraries to copy in... Index: Makefile [...] Hi! Do you plan to completely replace the 1.2 branch in the ports tree with the 1.3? Daniel -- LEVAI Daniel PGP key ID = 0x4AC0A4B1 Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
Re: UPDATE: graphics/GraphicsMagick
On Tuesday 02 December 2008 03.41.51 Okan Demirmen wrote: seems i've missed a bit here while away... 2 things: koffice 1.6 branch does not support newer GraphicsMagick versions. i still don't understand the no_gs thing. as kili pointed out, it can be pinned down to removing the run dependency of ghostscript, but why? for example, GraphicsMagick supports RAW images, hence a build dependency on dcraw - should we force the user to read the output of gm error messages to guess which additional package one needs to install to get the compiled-in functionality? i'm of the opinion 'no'. same goes with the gs binary being available if the package has been built to support it. What are you suggesting? in any case, i think we should at least update to the latest 1.1.14 release. i've kept the changes i made to make the port more like ImageMagick; additionally, this builds the perl module and brings in libwmf. True. at least we don't break the current koffice3, for now. Now I really think we should go down the road you have proposed earlier: Making a 1.1.x/ dir for mainting compatibility with koffice 1.6, and a 1.3.x for the latest stable. What do you think? Daniel -- LEVAI Daniel PGP key ID = 0x4AC0A4B1 Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
Re: UPDATE: graphics/GraphicsMagick
Matthias Kilian wrote: On Sun, Nov 30, 2008 at 09:10:16PM +0100, LÉVAI Dániel wrote: No. All you need is a global BUILD_DEPENDS= :ghostscript-*:print/ghostscript/gnu regardless of no_x11 or not. The whole purpose of this dependency is to always get the same delegates.mgk that uses pnmraw for gs-color. The difference between a GraphicsMagick package with FLAVOR=no_gs and without it would be nothing except the latter would have a run dependency on ghostscript. And since there's no need for a run dependency at all, there would be absolutely no difference. Got it. Thanks for your patience (of which I think I've used all :) http://leva.ecentrum.hu/patches/GraphicsMagick_1.2.6.diff Daniel -- LEVAI Daniel PGP key ID = 0x4AC0A4B1 Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
Re: UPDATE: graphics/GraphicsMagick
On Saturday 29 November 2008 22.36.56 Matthias Kilian wrote: On Sat, Nov 29, 2008 at 10:08:12AM -0500, Okan Demirmen wrote: Oh, and I see that GraphicsMagick doesn't recommend gslib, so maybe we should just disable that by default instead of making it a FLAVOR; FYI: only the gtk flavor of ghostscript contains libgs, so a GraphicsMagick flavor depending on libgs (i.e. --with-gslib) would have to explicitely depend on ghostscript's gtk flavor. So, please just keep the CONFIGURE_ARGS += --without-gslib in GraphicsMagick. Then the port now is broken, because no matter what, GraphicsMagick picks up ghostscript. So keeping CONFIGURE_ARGS += --without-gslib only matters if we also remove the BUILD_DEPENDS+= :ghostscript-*:print/ghostscript/gnu[,no_x11] RUN_DEPENDS+= :ghostscript-*:print/ghostscript/gnu[,no_x11] lines. Daniel -- LEVAI Daniel PGP key ID = 0x4AC0A4B1 Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
Re: UPDATE: graphics/GraphicsMagick
On Sunday 30 November 2008 11.08.25 Matthias Kilian wrote: On Sun, Nov 30, 2008 at 09:35:17AM +0100, LÉVAI Dániel wrote: FYI: only the gtk flavor of ghostscript contains libgs, so a GraphicsMagick flavor depending on libgs (i.e. --with-gslib) would have to explicitely depend on ghostscript's gtk flavor. So, please just keep the CONFIGURE_ARGS += --without-gslib in GraphicsMagick. Then the port now is broken, because no matter what, GraphicsMagick picks up ghostscript. So keeping CONFIGURE_ARGS += --without-gslib only matters if we also remove the BUILD_DEPENDS+= :ghostscript-*:print/ghostscript/gnu[,no_x11] RUN_DEPENDS+= :ghostscript-*:print/ghostscript/gnu[,no_x11] lines. No, --without-gslib just ensures that GraphicsMagick isn't linked against libgs, even if libgs is available. It does *not* stop GraphicsMagick from using the ghostscript binary at runtime (for whatever purpose; I didn't yet have the time to look at GraphicsMagick). Aha! I can see clearly now :) In the spirit of that, it's a new patch: http://leva.ecentrum.hu/patches/GraphicsMagick_1.2.6+no_gs.diff Daniel -- LEVAI Daniel PGP key ID = 0x4AC0A4B1 Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
Re: UPDATE: graphics/GraphicsMagick
On Sunday 30 November 2008 12.59.51 Matthias Kilian wrote: On Sun, Nov 30, 2008 at 11:30:06AM +0100, LÉVAI Dániel wrote: Then the port now is broken, because no matter what, GraphicsMagick picks up ghostscript. So keeping CONFIGURE_ARGS += --without-gslib only matters if we also remove the BUILD_DEPENDS+= :ghostscript-*:print/ghostscript/gnu[,no_x11] RUN_DEPENDS+= : :ghostscript-*:print/ghostscript/gnu[,no_x11] lines. No, --without-gslib just ensures that GraphicsMagick isn't linked against libgs, even if libgs is available. It does *not* stop GraphicsMagick from using the ghostscript binary at runtime (for whatever purpose; I didn't yet have the time to look at GraphicsMagick). Aha! I can see clearly now :) In the spirit of that, it's a new patch: http://leva.ecentrum.hu/patches/GraphicsMagick_1.2.6+no_gs.diff After a closer look at configure.ac and at the source trees after make configure (with ghostscript installed and uninstalled), I think you really don't need the no_gs flavor. The only relevant part that of GraphicsMagick that will be different is delegates.mgk, and it only differs in what ghostscript device will be used for the gs-color delegate (pnmraw vs. ppmraw). So you can omit the no_gs flavor and drop the RUN_DEPENDS on ghostscript (but not the BUILD_DEPENDS). You mean to leave the BUILD_DEPENDS only if we are not building a no_x11 FLAVOR, I presume? Daniel -- LEVAI Daniel PGP key ID = 0x4AC0A4B1 Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
Re: UPDATE: graphics/GraphicsMagick
On Sunday 30 November 2008 19.22.22 Matthias Kilian wrote: On Sun, Nov 30, 2008 at 02:18:26PM +0100, LÉVAI Dániel wrote: After a closer look at configure.ac and at the source trees after make configure (with ghostscript installed and uninstalled), I think you really don't need the no_gs flavor. The only relevant part that of GraphicsMagick that will be different is delegates.mgk, and it only differs in what ghostscript device will be used for the gs-color delegate (pnmraw vs. ppmraw). So you can omit the no_gs flavor and drop the RUN_DEPENDS on ghostscript (but not the BUILD_DEPENDS). You mean to leave the BUILD_DEPENDS only if we are not building a no_x11 FLAVOR, I presume? No. All you need is a global BUILD_DEPENDS= :ghostscript-*:print/ghostscript/gnu regardless of no_x11 or not. The whole purpose of this dependency is to always get the same delegates.mgk that uses pnmraw for gs-color. But the whole point of the no_gs FLAVOR was that if one doesn't need ghostscript, then don't install it with GM (ie. don't make gs mandatory for GM). With your proposal, gs would always get installed, no matter what... And it's no use either to put that BUILD_DEPENDS only outside FLAVOR:no_x11, because if one already has a no_x11 FLAVORed ghostscript installed, then building an x11 enabled GraphicsMagick would want to install an x11 enabled ghostscript, which is certainly not what the user wanted in the first place. So with the no_gs FLAVOR added, one could build an x11 enabled GM, and can also have a no_x11 FLAVORed ghostscript side-by-side. Besides, one could of course build an x11 and gs free GM too, with FLAVOR=no_gs no_x11. Hope I'm making sense, and please correct me if I'm wrong! Daniel -- LEVAI Daniel PGP key ID = 0x4AC0A4B1 Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
UPDATE: graphics/GraphicsMagick
Hi! It [1] is basically Okan's patch (sorry, but i only found your post recently); I've changed VERSION from 1.2.5 to 1.2.6, and added a no_gs FLAVOR. Also note, that now if one builds it with x11 (ie. not specifing FLAVOR=no_x11) it depends on graphics/libwmf, and will automatically pick up ghostscript (if FLAVOR=no_gs is not specified). Also, patches and PLISTs were regenerated. Tried it out on i386 with gallery2, it works fine. Note: one file was removed from patches/, and one was added, so please use `patch -E`. Please test/comment, thanks! Daniel [1] - http://leva.ecentrum.hu/patches/GraphicsMagick_1.2.6+no_gs.diff -- LEVAI Daniel PGP key ID = 0x4AC0A4B1 Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
Re: UPDATE: graphics/GraphicsMagick
On Saturday 29 November 2008 16.08.12 Okan Demirmen wrote: One major issue/reason for keeping the current GraphicsMagick is koffice3. I'm not sure we can simply drop the filter that is dependent on the old GraphicsMagick - I've looked into it some, but not enough; and koffice3 isn't going away anytime soon. What are the symptoms of koffice3 with newer GraphicsMagicks? Also note that GraphicsMagick 1.3.1 is out, the now current stable release. Yeah, I thought about it first, but then I thought there is a reason why you didn't make your patch for 1.3 (my best guess was because of the OpenMP support). I know of at least one existing port that would benefit from a new GraphicsMagick, but I'm sure there are others. For what reason do you need an update - new port or such? I needed the new version for gallery2 (which is not in ports, though). 1.2 has improved TIFF handling. Talking out loud, if there are many ports that would seriously benefit from switching to GraphicsMagick, from ImageMagick, I think every port can benefit from GraphicsMagick's stability and performance (over ImageMagick). maybe we could go down the route of splitting GraphicsMagick into 1.x/ and stable/, or something. Oh, and I see that GraphicsMagick doesn't recommend gslib, so maybe we should just disable that by default instead of making it a FLAVOR; I'm completely all right with that. Anyone using it, by the way? then again, I wonder if we need a FLAVOR over a SUBPACKAGE - I clearly haven't looked ;) There are a few things to consider, hence my lagging on this port. Thanks for your interest though - opinions welcome ;) [1] - http://leva.ecentrum.hu/patches/GraphicsMagick_1.2.6+no_gs.diff Daniel -- LEVAI Daniel PGP key ID = 0x4AC0A4B1 Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
UPDATE: GraphicsMagick (added no_gs FLAVOR)
Hi!
This an update to the Makefile. I've added a no_gs FLAVOR, so one can
compile it without the need to install ghostscript.
Please test/comment, thanks!
Daniel
--
LEVAI Daniel
PGP key ID = 0x4AC0A4B1
Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
Index: Makefile
===
RCS file: /cvs/ports/graphics/GraphicsMagick/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile 27 Feb 2008 08:04:51 - 1.7
+++ Makefile 27 Nov 2008 12:28:48 -
@@ -37,7 +37,7 @@
LDFLAGS=-L${WRKBUILD}/magick/.libs -L${WRKBUILD}/wand/.libs -L${LOCALBASE}/lib \
ac_cv_path_LaunchDelegate=no
-FLAVORS= no_x11
+FLAVORS= no_x11 no_gs
FLAVOR?=
CONFIGURE_STYLE= autoconf
@@ -55,17 +55,28 @@
.if ${FLAVOR:L:Mno_x11}
-BUILD_DEPENDS+= :ghostscript-*:print/ghostscript/gnu,no_x11
-RUN_DEPENDS+= :ghostscript-*:print/ghostscript/gnu,no_x11
CONFIGURE_ARGS+= --without-x --without-ttf
CONFIGURE_ENV+= ac_cv_path_FIGDecodeDelegate=no
.else
-BUILD_DEPENDS+= :ghostscript-*:print/ghostscript/gnu
-RUN_DEPENDS+= :ghostscript-*:print/ghostscript/gnu
+CONFIGURE_ARGS+= --with-x --with-ttf
USE_X11= Yes
RUN_DEPENDS+= :transfig-*:print/transfig
BUILD_DEPENDS+= :transfig-*:print/transfig
WANTLIB+= ICE SM X11 Xau Xdmcp Xext freetype
+.endif
+
+.if ${FLAVOR:L:Mno_gs}
+CONFIGURE_ARGS+= --without-gslib
+.else
+.if ${FLAVOR:L:Mno_x11}
+CONFIGURE_ARGS+= --with-gslib
+BUILD_DEPENDS+= :ghostscript-*:print/ghostscript/gnu
+RUN_DEPENDS+= :ghostscript-*:print/ghostscript/gnu
+.else
+CONFIGURE_ARGS+= --with-gslib
+BUILD_DEPENDS+= :ghostscript-*:print/ghostscript/gnu,no_x11
+RUN_DEPENDS+= :ghostscript-*:print/ghostscript/gnu,no_x11
+.endif
.endif
.include bsd.port.mk
Re: newer net-snmp ports are not working with mrtg anymore
Stuart Henderson wrote: On 2008/09/22 02:36, Stuart Henderson wrote: seems to work on sparc64, amd64, arm. any i386 testers around? Working really good on i386. Thanks! Daniel -- LEVAI Daniel PGP key ID = 0x4AC0A4B1 Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
newer net-snmp ports are not working with mrtg anymore
Hi!
I'm using mrtg with snmpv3 on my 4.3 OpenBSD system. The net-snmp port
is being used as my snmp daemon but since 5.4.1.1p1 it doesn't work
with mrtg. My usual mrtg command yields this:
$ /usr/local/bin/mrtg --user mrtg \
--group stats --lock-file /tmp/mrtg.lock /etc/mrtg.cfg
2008-09-21 22:05:28: WARNING: Expected a number but got 'noSuchInstance'
2008-09-21 22:05:28: WARNING: Expected a number but got 'noSuchInstance'
2008-09-21 22:05:28: ERROR: Target[janos_1][_IN_] ' $target-[0]
{$mode} ' did not eval into defined data
2008-09-21 22:05:28: ERROR: Target[janos_1][_OUT_] ' $target-[0]
{$mode} ' did not eval into defined data
With net-snmp 5.4.1.1p0 it works. Since then it doesn't.
My relevant lines from mrtg.cfg:
---
EnableIPv6: no
enablesnmpv3: yes
LogFormat: rrdtool
LoadMIBs: /usr/local/share/snmp/mibs/UCD-SNMP-MIB.txt
Target[janos_1]: 1:[EMAIL PROTECTED]:3
SnmpOptions[janos_1]:
authkey='myauthkey',authprotocol='sha',privprotocol='aescfb128',username='myusername',privkey='myprivacykey'
---
I'm kind of stuck here. Anyone else has the same config or problem, or
has any ideas?
Thanks in advance!
Daniel
--
LEVAI Daniel
PGP key ID = 0x4AC0A4B1
Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
Re: UPDATE: pflogsumm
Giovanni Bechis wrote:
LÉVAI Dániel wrote:
p.s.: There is a russian language patch in the patches directory, but
I couldn't make an udpate for that. Is that even in use anymore?
Russian version is not available anymore, ${PKGNAME} removed (so use
patch -E to apply the diff), the port works well.
p.s.: ask ${MAINTAINER} first
Giovanni
Hi!
Since jakob@ appearantly can not update the pflogsumm port for some
reason (I guess he has no time), anyone else can commit this? The
patch/ports is tested and working.
Thanks!
Daniel
--
LEVAI Daniel
PGP key ID = 0x4AC0A4B1
Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
UPDATE: pflogsumm
Hi! Here is an update to pflogsumm. 1.1.0 - 1.1.2 It contains some improvements, eg. better cooperation with postfix 2.3+. It has been tested for a week now, and no problems. p.s.: There is a russian language patch in the patches directory, but I couldn't make an udpate for that. Is that even in use anymore? Daniel -- LEVAI Daniel PGP key ID = 0x4AC0A4B1 Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
Re: UPDATE: pflogsumm
On Friday 12 September 2008 18.40.14 you wrote:
Hi!
Here is an update to pflogsumm. 1.1.0 - 1.1.2
It contains some improvements, eg. better cooperation with postfix
2.3+. It has been tested for a week now, and no problems.
p.s.: There is a russian language patch in the patches directory, but
I couldn't make an udpate for that. Is that even in use anymore?
Daniel
yeah...
--
LEVAI Daniel
PGP key ID = 0x4AC0A4B1
Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
--- Makefile.orig Sun Sep 7 08:25:50 2008
+++ Makefile Sun Sep 7 07:51:58 2008
@@ -2,8 +2,8 @@
COMMENT= Postfix log entry summarizer
-DISTNAME= pflogsumm-1.1.0
-PKGNAME= ${DISTNAME}p0
+DISTNAME= pflogsumm-1.1.2
+PKGNAME= ${DISTNAME}
CATEGORIES= mail
MASTER_SITES+= http://jimsun.linxnet.com/downloads/
--- distinfo.orig Sun Sep 7 08:26:20 2008
+++ distinfo Sun Sep 7 08:05:26 2008
@@ -1,5 +1,5 @@
-MD5 (pflogsumm-1.1.0.tar.gz) = H3j8ryo27DUg7P8oakUlGg==
-RMD160 (pflogsumm-1.1.0.tar.gz) = q0ryKju5k8o7jj0bWAUvTmmuiQw=
-SHA1 (pflogsumm-1.1.0.tar.gz) = jk768ZJXO7FLZP/cNLNUgCCkohg=
-SHA256 (pflogsumm-1.1.0.tar.gz) = 4609eYudv7M6+FmUC49Ggaj+3kXXRDNqpoJCteLEBBc=
-SIZE (pflogsumm-1.1.0.tar.gz) = 43588
+MD5 (pflogsumm-1.1.2.tar.gz) = xrtDNESoNWQQGqMCWcyEmw==
+RMD160 (pflogsumm-1.1.2.tar.gz) = cAWaov8R7xBNuqqI97TPRqEISOc=
+SHA1 (pflogsumm-1.1.2.tar.gz) = jbRWUyLVXSipH+QfGt1JXTn499Y=
+SHA256 (pflogsumm-1.1.2.tar.gz) = MvQT5r9D96YvSQnMgJ95KbDA0pof5eMTHdgFQSmCfbs=
+SIZE (pflogsumm-1.1.2.tar.gz) = 44865
--- patches/patch-pflogsumm_pl.orig Thu Jun 30 15:22:23 2005
+++ patches/patch-pflogsumm_pl Sun Sep 7 08:14:08 2008
@@ -1,14 +1,13 @@
-$OpenBSD: patch-pflogsumm_pl,v 1.4 2005/06/30 13:22:23 jakob Exp $
pflogsumm.pl.orig 2004-01-28 13:38:53.0 +1000
-+++ pflogsumm.pl 2004-01-28 13:39:29.0 +1000
-@@ -4,13 +4,13 @@ eval 'exec perl -S $0 $@'
+--- pflogsumm.pl.orig Sun Jun 29 15:46:01 2008
pflogsumm.pl Sun Sep 7 08:13:14 2008
+@@ -4,13 +4,13 @@
=head1 NAME
-pflogsumm.pl - Produce Postfix MTA logfile summary
+pflogsumm - Produce Postfix MTA logfile summary
- Copyright (C) 1998-2003 by James S. Seymour, Release 1.1.0.
+ Copyright (C) 1998-2007 by James S. Seymour, Release 1.1.2.
=head1 SYNOPSIS
@@ -17,7 +16,7 @@
[--verp_mung[=n]] [--verbose_msg_detail] [--iso_date_time]
[-m|--uucp_mung] [-i|--ignore_case] [--smtpd_stats] [--mailq]
[--problems_first] [--rej_add_from] [--no_bounce_detail]
-@@ -18,7 +18,7 @@ Copyright (C) 1998-2003 by James S. Seym
+@@ -18,7 +18,7 @@
[--no_smtpd_warnings] [--zero_fill] [--syslog_name=string]
[file1 [filen]]
@@ -26,7 +25,7 @@
If no file(s) specified, reads from stdin. Output is to stdout.
-@@ -119,7 +119,7 @@ Copyright (C) 1998-2003 by James S. Seym
+@@ -119,7 +119,7 @@
The message may be delivered long-enough after the
(last) qmgr log entry that the information is not in
the log(s) processed by a particular run of
@@ -35,7 +34,7 @@
size and the total for bytes delivered. These are
normally reported by pflogsumm as Messages with no
size data.
-@@ -216,15 +216,15 @@ Copyright (C) 1998-2003 by James S. Seym
+@@ -216,15 +216,15 @@
Produce a report of previous day's activities:
@@ -54,7 +53,7 @@
Crontab entry to generate a report of the previous day's activity
at 10 minutes after midnight.
-@@ -447,7 +447,7 @@ for (0 .. 23) {
+@@ -447,7 +447,7 @@
$smtpdPerHr[$_] = [0,0,0];
}
@@ -63,12 +62,3 @@
$usageMsg =
usage: $progName -[eq] [-d today|yesterday] [-h cnt] [-u cnt]
[--verp_mung[=n]] [--verbose_msg_detail] [--iso_date_time]
-@@ -696,7 +696,7 @@ while() {
- }
- }
- elsif((($addr, $relay, $delay, $status, $toRmdr) = $logRmdr =~
-- /to=([^]*), (?:orig_to=[^]*, )?relay=([^,]+), delay=([^,]+), status=(\S+)(.*)$/o) = 4)
-+ /to=([^]*), (?:orig_to=[^]*, )?relay=([^,]+), delay=([^,]+), (?:dsn=\d+\.\d+\.\d+, )?status=(\S+)(.*)$/o) = 4)
- {
-
- if($opts{'m'} $addr =~ /^(.*!)*([^!]+)!([EMAIL PROTECTED])@([^\.]+)$/o) {
Re: postfix port upgrade
On Wednesday 30 January 2008 23:07:58 you wrote:
On 30 jan 2008, at 19.58, LÉVAI Dániel wrote:
The install didn't create the newly introduced data_directory
(/var/lib/postfix default, with the ownership of the mail_owner
parameter) for me. Also, the post{queue,drop} commands were not
installed with the guid bit set, and the group of the files
became 'bin' instead of '_postdrop' after the install.
this is strange, I cannot see any of these issues here. are you sure
you applied the patch correctly?
everything is working here.
jakob
Yeah, I got it from that address that you've presented in your previous
mail. Then I did a simple FLAVOR=db4 sudo make package, and a sudo
pkg_add -vir /usr/ports/packages/[..]/postfix-2.5.0-db4.tgz. Don't know
what could've went wrong.
Daniel
--
LÉVAI Dániel
Public key ID = 4AC0A4B1
Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
Re: postfix port upgrade
On Wednesday 30 January 2008 13:34:29 you wrote:
patch also available as
http://www.schlyter.se/jakob/openbsd/postfix.diff.gz
jakob
The install didn't create the newly introduced data_directory
(/var/lib/postfix default, with the ownership of the mail_owner
parameter) for me. Also, the post{queue,drop} commands were not
installed with the guid bit set, and the group of the files
became 'bin' instead of '_postdrop' after the install.
Otherwise, it is working ok, thanks!
Daniel
--
LÉVAI Dániel
Public key ID = 4AC0A4B1
Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
