Re: UPDATE net/unison
On 04/19/18 11:41, Klemens Nanni wrote: > On Tue, Apr 03, 2018 at 08:28:12PM +0200, Björn Ketelaars wrote: >> unison received an update to 2.51.2. An overview on what has changed can >> be found at https://github.com/bcpierce00/unison/releases. Noticeable is >> that this version breaks compatibility with older versions. >> >> Tested OK on amd64, and make test runs successfully. >> >> Response MAINTAINER: 'fine, ok giovanni@'. >> >> Additional comments/OKs? > Sorry for the long delay, looks OK port- and build-wise on amd64. > Two things: > >> HOMEPAGE= http://www.cis.upenn.edu/~bcpierce/unison/ > This site has TLS. > >> # Avoid the nightmare of their Makefile install target. >> # Do not use INSTALL_PROGRAM, as the bytecode version must not be stripped! > Just unset INSTALL_STRIP and use INSTALL_PROGRAM as normal, that way > intentions are clear without this comment. > I would prefer to use INSTALL_STRIP but with the comment to remember why we do not strip binaries in this case. Otherwise ok. Giovanni
Re: NEW: x11/kde-applications/libkipi [3/4 digikam 5]
On Thu, Apr 19, 2018 at 10:54:58PM +0200, Rafael Sadowski wrote: > Part 3 of 4 to replace graphics/digikam-kde4 by graphics/digikam. > > $ x11/kde-applications/libkipi/pkg/DESCR > > Libkipi is an interface to use kipi-plugins from a KDE image management > program like digiKam. > > Ok? Comments? Will conflict with at least x11/kde4/libkipi,-icons for the icons..
Re: clang 6 deregister games/alephone/alephone
Hi,
Christian Weisgerber wrote on Wed, Apr 18, 2018 at 01:18:22PM +0200:
> Peter Hessler:
>> This patch set removes the "register" keyword, which is no longer
>> legal to use.
> Why bother? It doesn't cause errors, just warnings.
> Instead of patches, I would suggest defining it away by adding
> -Dregister= to CXXFLAGS.
My impression is that -Wno-deprecated-register might be even safer
because it doesn't blindly change the code but just hide the
warnings.
The following patch fixes the problems that must be fixed to build
with clang6. They are all related to the well-known clang6 effect
that NULL cannot be assigned to certain pointer types, in this
case function pointers.
The flag -Wno-c++11-narrowing is *really* required. There are
many dozen, maybe hundreds of violations scattered all over the
place. I suspect that some of them may actually be overflow bugs
and result in rendering errors (or worse), but auditing for that
is really a task for upstream, not for us (unless the MAINTAINER
is extremely bored :).
No, i'm not gonna get addicted to this game. Testing it feels like
brutal work. It runs for me, and so do i. But we want to get the
tree back in shape, right?
OK?
Ingo
Index: Makefile
===
RCS file: /cvs/ports/games/alephone/alephone/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile26 Jul 2017 22:45:20 - 1.23
+++ Makefile20 Apr 2018 00:46:12 -
@@ -6,7 +6,7 @@ COMMENT = open source game engine based
DATE = 20150620
DISTNAME = AlephOne-${DATE}
PKGNAME = alephone-1.2.1
-REVISION = 0
+REVISION = 1
EXTRACT_SUFX = .tar.bz2
CATEGORIES = games x11
@@ -48,5 +48,10 @@ AUTOMAKE_VER = 1.9
CONFIGURE_ENV =AUTOCONF_VERSION=${AUTOCONF_VER} \
AUTOMAKE_VERSION=${AUTOMAKE_VER} \
CPPFLAGS=-I${LOCALBASE}/include
+
+.include
+.if ${PROPERTIES:Mclang}
+CXXFLAGS +=-Wno-c++11-narrowing -Wno-deprecated-register
+.endif
.include
Index: patches/patch-Source_Files_Misc_sdl_dialogs_cpp
===
RCS file: patches/patch-Source_Files_Misc_sdl_dialogs_cpp
diff -N patches/patch-Source_Files_Misc_sdl_dialogs_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Source_Files_Misc_sdl_dialogs_cpp 20 Apr 2018 00:46:12
-
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: Source_Files/Misc/sdl_dialogs.cpp
+--- Source_Files/Misc/sdl_dialogs.cpp.orig
Source_Files/Misc/sdl_dialogs.cpp
+@@ -2018,7 +2018,7 @@ void tab_placer::visible(bool visible)
+
+ dialog::dialog() : active_widget(NULL), mouse_widget(0),
active_widget_num(UNONE), done(false),
+ cursor_was_visible(false), parent_dialog(NULL),
+- processing_function(NULL), placer(0), last_redraw(0)
++ processing_function(0), placer(0), last_redraw(0)
+ {
+ }
+
Index: patches/patch-Source_Files_Misc_sdl_widgets_cpp
===
RCS file: patches/patch-Source_Files_Misc_sdl_widgets_cpp
diff -N patches/patch-Source_Files_Misc_sdl_widgets_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Source_Files_Misc_sdl_widgets_cpp 20 Apr 2018 00:46:12
-
@@ -0,0 +1,32 @@
+$OpenBSD$
+
+Index: Source_Files/Misc/sdl_widgets.cpp
+--- Source_Files/Misc/sdl_widgets.cpp.orig
Source_Files/Misc/sdl_widgets.cpp
+@@ -719,7 +719,7 @@ void w_select_button::place(const SDL_Rect &r, placeme
+
+ static const char* sNoValidOptionsString = "(no valid options)"; // XXX
should be moved outside compiled code e.g. to MML
+
+-w_select::w_select(size_t s, const char **l) : widget(LABEL_WIDGET),
labels(l), we_own_labels(false), selection(s),
selection_changed_callback(NULL), utf8(false)
++w_select::w_select(size_t s, const char **l) : widget(LABEL_WIDGET),
labels(l), we_own_labels(false), selection(s), selection_changed_callback(0),
utf8(false)
+ {
+ num_labels = 0;
+ if(labels) {
+@@ -1113,7 +1113,7 @@ void w_color_picker::draw(SDL_Surface *s) const
+ */
+
+ w_text_entry::w_text_entry(size_t max_c, const char *initial_text)
+- : widget(TEXT_ENTRY_WIDGET), enter_pressed_callback(NULL),
value_changed_callback(NULL), max_chars(max_c), enable_mac_roman(false)
++ : widget(TEXT_ENTRY_WIDGET), enter_pressed_callback(0),
value_changed_callback(0), max_chars(max_c), enable_mac_roman(false)
+ {
+ // Initialize buffer
+ buf = new char[max_chars + 1];
+@@ -2115,7 +2115,7 @@ void w_select_popup::gotSelected ()
+ static const char* const sFileChooserInvalidFileString = "(no valid
selection)";
+
+ w_file_chooser::w_file_chooser(const char* inDialogPrompt, Typecode
inTypecode)
+- : w_select_button("", NULL, NULL, true), typecode(inTypecode)
++ : w_select_button("", 0, NULL
Re: UPDATE: security/kc
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.
> Index: Makefile
> ===
> RCS file: /cvs/ports/security/kc/Makefile,v
> retrieving revision 1.14
> diff -u -p -p -u -r1.14 Makefile
> --- Makefile 29 Dec 2015 19:49:41 - 1.14
> +++ Makefile 18 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
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_*.
> 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
> +
It's only a small dep, is there a real advantage to making it optional?
If there is, please mention the flavour in DESCR, otherwise I'd prefer to
have it rolled into a single package.
LIB_DEPENDS with no matching WANTLIB entry is not valid, it will be
stripped by pkg_create with a warning message.
If it's actually static linked then you can *either* list as
BUILD_DEPENDS, *or* list as LIB_DEPENDS + WANTLIB with a comment next
to WANTLIB about it being static linked. I prefer the latter because
there's a higher chance of your port getting updated when that library
is updated. Otherwise you're dependent on manual REVISION bumps to
trigger updates.
> 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
> --- distinfo 24 Dec 2013 12:56:19 - 1.5
> +++ distinfo 18 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):
> +- importxml kcdump.xml
> ++ importxml -k kcdump.xml
> + Import OK
> + 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
>
NEW: graphics/digikam [4/4 digikam 5]
Part 4 of 4 to replace graphics/digikam-kde4 by graphics/digikam. You need all parts do build and run graphics/digikam. $ graphics/digikam/pkg/DESCR digiKam is an advanced open-source digital photo management application. The application provides a comprehensive set of tools for importing, managing, editing, and sharing photos and raw files. Final ok to replace digikam 4 by 5? Digikam runs fine here over months with more or less ~ 12000 images. espie@, you as digikam power user, could you give it a chance? digikam.tar.gz Description: Binary data
NEW: x11/kde-applications/libkipi [3/4 digikam 5]
Part 3 of 4 to replace graphics/digikam-kde4 by graphics/digikam. $ x11/kde-applications/libkipi/pkg/DESCR Libkipi is an interface to use kipi-plugins from a KDE image management program like digiKam. Ok? Comments? libkipi.tar.gz Description: Binary data
NEW: x11/kde-applications/kcalcore [2/4 digikam 5]
Part 2 of 4 to replace graphics/digikam-kde4 by graphics/digikam. $ x11/kde-applications/kcalcore/pkg/DESCR This library provides access to and handling of calendar data. It supports the standard formats iCalendar and vCalendar and the group scheduling standard iTIP. Ok? Comments? kcalcore.tar.gz Description: Binary data
Re: UPDATE: mail/rspamd to 1.7.3
Already on my radar. Don't worry about sending a new diff but next time you should check that "make package" works and please send from a mail client that supports plaintext. On 2018/04/19 08:07, Akai wrote: > Sorry, re-send again > > Index: distinfo > === > RCS file: /cvs/ports/mail/rspamd/distinfo,v > retrieving revision 1.32 > diff -u -r1.32 distinfo > --- distinfo 20 Mar 2018 14:51:19 - 1.32 > +++ distinfo 19 Apr 2018 11:59:43 - > @@ -1,2 +1,2 @@ > -SHA256 (rspamd-1.7.1.tar.gz) = PdCD5o7cgAsxdFY9tBFmc0vrxt/y3419ehztS6ELiA0= > -SIZE (rspamd-1.7.1.tar.gz) = 4453460 > +SHA256 (rspamd-1.7.3.tar.gz) = 7BUu5h3sqXlB5m+5MGauH7OAK+ZuJDBgcudunlG03TU= > +SIZE (rspamd-1.7.3.tar.gz) = 4470637 > Index: Makefile > === > RCS file: /cvs/ports/mail/rspamd/Makefile,v > retrieving revision 1.48 > diff -u -r1.48 Makefile > --- Makefile 20 Mar 2018 14:51:19 - 1.48 > +++ Makefile 19 Apr 2018 12:06:29 - > @@ -4,7 +4,7 @@ > > GH_ACCOUNT= vstakhov > GH_PROJECT= rspamd > -GH_TAGNAME= 1.7.1 > +GH_TAGNAME= 1.7.3 > > CATEGORIES= mail > > Sent with [ProtonMail](https://protonmail.com) Secure Email. > > ‐‐‐ Original Message ‐‐‐ > On April 19, 2018 12:05 PM, Akai wrote: > > > Hi, update mail/rspamd to 1.7.3, > > Thanks. > > > > Index: distinfo > > === > > RCS file: /cvs/ports/mail/rspamd/distinfo,v > > retrieving revision 1.32 > > diff -u -r1.32 distinfo > > --- distinfo 20 Mar 2018 14:51:19 - 1.32 > > +++ distinfo 19 Apr 2018 11:59:43 - > > @@ -1,2 +1,2 @@ > > -SHA256 (rspamd-1.7.1.tar.gz) = PdCD5o7cgAsxdFY9tBFmc0vrxt/y3419ehztS6ELiA0= > > -SIZE (rspamd-1.7.1.tar.gz) = 4453460 > > +SHA256 (rspamd-1.7.3.tar.gz) = 7BUu5h3sqXlB5m+5MGauH7OAK+ZuJDBgcudunlG03TU= > > +SIZE (rspamd-1.7.3.tar.gz) = 4470637 > > Index: distinfo > > === > > RCS file: /cvs/ports/mail/rspamd/distinfo,v > > retrieving revision 1.32 > > diff -u -r1.32 distinfo > > --- distinfo 20 Mar 2018 14:51:19 - 1.32 > > +++ distinfo 19 Apr 2018 11:43:38 - > > @@ -1,2 +1,2 @@ > > -SHA256 (rspamd-1.7.1.tar.gz) = PdCD5o7cgAsxdFY9tBFmc0vrxt/y3419ehztS6ELiA0= > > -SIZE (rspamd-1.7.1.tar.gz) = 4453460 > > +SHA256 (rspamd-1.7.3.tar.gz) = 7BUu5h3sqXlB5m+5MGauH7OAK+ZuJDBgcudunlG03TU= > > +SIZE (rspamd-1.7.3.tar.gz) = 4470637 > > > > Sent with [ProtonMail](https://protonmail.com) Secure Email.
Re: UPDATE: mail/rspamd to 1.7.3
On Thu, Apr 19, 2018 at 08:07:34AM -0400, Akai wrote: > Sorry, re-send again Your patch still doesn't apply: patch: malformed patch at line 92: GH_ACCOUNT= vstakhov You can verify patches my sending mail to yourself first and applying the diff by piping it (or the entire mail) to patch(1). When you update a port, please tell us what you've tested (or not) and on which architecture. This will help others testing and confirming the update. A link to the changelog or a quick summary of notable/breaking changes usually doesn't hurt either. Otherwise people will ask you just like I have to do now, run into issues you already had or simply do unnecessary work.
Re: UPDATE: mail/rspamd to 1.7.3
Sorry, re-send again Index: distinfo === RCS file: /cvs/ports/mail/rspamd/distinfo,v retrieving revision 1.32 diff -u -r1.32 distinfo --- distinfo 20 Mar 2018 14:51:19 - 1.32 +++ distinfo 19 Apr 2018 11:59:43 - @@ -1,2 +1,2 @@ -SHA256 (rspamd-1.7.1.tar.gz) = PdCD5o7cgAsxdFY9tBFmc0vrxt/y3419ehztS6ELiA0= -SIZE (rspamd-1.7.1.tar.gz) = 4453460 +SHA256 (rspamd-1.7.3.tar.gz) = 7BUu5h3sqXlB5m+5MGauH7OAK+ZuJDBgcudunlG03TU= +SIZE (rspamd-1.7.3.tar.gz) = 4470637 Index: Makefile === RCS file: /cvs/ports/mail/rspamd/Makefile,v retrieving revision 1.48 diff -u -r1.48 Makefile --- Makefile 20 Mar 2018 14:51:19 - 1.48 +++ Makefile 19 Apr 2018 12:06:29 - @@ -4,7 +4,7 @@ GH_ACCOUNT= vstakhov GH_PROJECT= rspamd -GH_TAGNAME= 1.7.1 +GH_TAGNAME= 1.7.3 CATEGORIES= mail Sent with [ProtonMail](https://protonmail.com) Secure Email. ‐‐‐ Original Message ‐‐‐ On April 19, 2018 12:05 PM, Akai wrote: > Hi, update mail/rspamd to 1.7.3, > Thanks. > > Index: distinfo > === > RCS file: /cvs/ports/mail/rspamd/distinfo,v > retrieving revision 1.32 > diff -u -r1.32 distinfo > --- distinfo 20 Mar 2018 14:51:19 - 1.32 > +++ distinfo 19 Apr 2018 11:59:43 - > @@ -1,2 +1,2 @@ > -SHA256 (rspamd-1.7.1.tar.gz) = PdCD5o7cgAsxdFY9tBFmc0vrxt/y3419ehztS6ELiA0= > -SIZE (rspamd-1.7.1.tar.gz) = 4453460 > +SHA256 (rspamd-1.7.3.tar.gz) = 7BUu5h3sqXlB5m+5MGauH7OAK+ZuJDBgcudunlG03TU= > +SIZE (rspamd-1.7.3.tar.gz) = 4470637 > Index: distinfo > === > RCS file: /cvs/ports/mail/rspamd/distinfo,v > retrieving revision 1.32 > diff -u -r1.32 distinfo > --- distinfo 20 Mar 2018 14:51:19 - 1.32 > +++ distinfo 19 Apr 2018 11:43:38 - > @@ -1,2 +1,2 @@ > -SHA256 (rspamd-1.7.1.tar.gz) = PdCD5o7cgAsxdFY9tBFmc0vrxt/y3419ehztS6ELiA0= > -SIZE (rspamd-1.7.1.tar.gz) = 4453460 > +SHA256 (rspamd-1.7.3.tar.gz) = 7BUu5h3sqXlB5m+5MGauH7OAK+ZuJDBgcudunlG03TU= > +SIZE (rspamd-1.7.3.tar.gz) = 4470637 > > Sent with [ProtonMail](https://protonmail.com) Secure Email.
Re: [UPDATE] Tor Browser 7.5.3
Артур Истомин wrote:
> On Wed, Apr 18, 2018 at 02:16:09PM -0500, attila wrote:
> > Hi ports@,
> >
> > Attached is an update to Tor Browser 7.5.3. Tested lightly on amd64,
> > more testing would be welcome.
>
> Hi, attila! Is it possible to compile it on OpenBSD-stable?
The plan is to backport updates and offer packages for -stable on
torbsd.org similar to the way that landry@ does it for the Firefox
ports (at least amd64, other archs on request). We have not yet
gotten this going, I hope this update will be the first one.
I'll announce it here when it happens.
Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D 09C1 4068 D5D5 62A7 29CF
Re: clang6: x11/kde4/libs: some tentative fixes
Ingo Schwarze: > > > However, the dnssd/servicemodel.h patch changes an ABI. > > Indeed, you are right. That definitely requires a major bump, > which wasn't done earlier because it did not build yet. > > So, here is the hopefully final patch. I tested the full > build again, and it succeeded. ok -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: clang6: x11/kde4/libs: some tentative fixes
Hi Christian,
Christian Weisgerber wrote on Thu, Apr 19, 2018 at 06:20:27AM +0200:
> However, the dnssd/servicemodel.h patch changes an ABI.
Indeed, you are right. That definitely requires a major bump,
which wasn't done earlier because it did not build yet.
So, here is the hopefully final patch. I tested the full
build again, and it succeeded.
OK?
Ingo
Index: Makefile
===
RCS file: /cvs/ports/x11/kde4/libs/Makefile,v
retrieving revision 1.82
diff -u -p -r1.82 Makefile
--- Makefile14 Nov 2017 20:09:11 - 1.82
+++ Makefile19 Apr 2018 14:51:37 -
@@ -12,7 +12,7 @@ PKGNAME-langlist =kde4-langlist-$V
PKG_ARCH-en_US = *
PKG_ARCH-langlist =*
PKGSPEC-main = kdelibs-${MODKDE4_SPEC}
-REVISION-main =11
+REVISION-main =12
REVISION-en_US = 0
REVISION-langlist =0
@@ -25,8 +25,8 @@ SHARED_LIBS +=kdecore 50.2
SHARED_LIBS += kdefakes 50.2 # .5.0
SHARED_LIBS += kdesu50.2 # .5.0
SHARED_LIBS += kdeui50.2 # .5.0
-SHARED_LIBS += kdnssd 50.2 # .2.0
-SHARED_LIBS += khtml50.2 # .5.0
+SHARED_LIBS += kdnssd 51.0 # .2.0
+SHARED_LIBS += khtml51.0 # .5.0
SHARED_LIBS += kimproxy 50.2 # .4.0
SHARED_LIBS += kio 50.3 # .5.0
SHARED_LIBS += kjs 50.2 # .2.0
Index: patches/patch-khtml_dom_dom2_traversal_h
===
RCS file: patches/patch-khtml_dom_dom2_traversal_h
diff -N patches/patch-khtml_dom_dom2_traversal_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-khtml_dom_dom2_traversal_h19 Apr 2018 14:51:37 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: khtml/dom/dom2_traversal.h
+--- khtml/dom/dom2_traversal.h.orig
khtml/dom/dom2_traversal.h
+@@ -214,7 +214,7 @@ class KHTML_EXPORT NodeFilter (public)
+ *
+ */
+ enum ShowCode {
+-SHOW_ALL = 0x,
++SHOW_ALL = 0x7FFF,
+ SHOW_ELEMENT = 0x0001,
+ SHOW_ATTRIBUTE = 0x0002,
+ SHOW_TEXT = 0x0004,
UPDATE: mail/rspamd to 1.7.3
Hi, update mail/rspamd to 1.7.3, Thanks. Index: distinfo === RCS file: /cvs/ports/mail/rspamd/distinfo,v retrieving revision 1.32 diff -u -r1.32 distinfo --- distinfo 20 Mar 2018 14:51:19 - 1.32 +++ distinfo 19 Apr 2018 11:59:43 - @@ -1,2 +1,2 @@ -SHA256 (rspamd-1.7.1.tar.gz) = PdCD5o7cgAsxdFY9tBFmc0vrxt/y3419ehztS6ELiA0= -SIZE (rspamd-1.7.1.tar.gz) = 4453460 +SHA256 (rspamd-1.7.3.tar.gz) = 7BUu5h3sqXlB5m+5MGauH7OAK+ZuJDBgcudunlG03TU= +SIZE (rspamd-1.7.3.tar.gz) = 4470637 Index: distinfo === RCS file: /cvs/ports/mail/rspamd/distinfo,v retrieving revision 1.32 diff -u -r1.32 distinfo --- distinfo 20 Mar 2018 14:51:19 - 1.32 +++ distinfo 19 Apr 2018 11:43:38 - @@ -1,2 +1,2 @@ -SHA256 (rspamd-1.7.1.tar.gz) = PdCD5o7cgAsxdFY9tBFmc0vrxt/y3419ehztS6ELiA0= -SIZE (rspamd-1.7.1.tar.gz) = 4453460 +SHA256 (rspamd-1.7.3.tar.gz) = 7BUu5h3sqXlB5m+5MGauH7OAK+ZuJDBgcudunlG03TU= +SIZE (rspamd-1.7.3.tar.gz) = 4470637 Sent with [ProtonMail](https://protonmail.com) Secure Email.
Update: devel/github-backup
This is a simple update to devel/github-backup. 0.20.0 introduces a couple
of minor new features.
Laurie
Index: Makefile
===
RCS file: /cvs/ports/devel/github-backup/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile11 Dec 2017 10:06:28 - 1.1.1.1
+++ Makefile19 Apr 2018 09:29:09 -
@@ -2,7 +2,7 @@
COMMENT = backup a github user or organization
-MODPY_EGG_VERSION =0.14.1
+MODPY_EGG_VERSION =0.20.0
PKGNAME = github-backup-${MODPY_EGG_VERSION}
GH_ACCOUNT = josegonzalez
Index: distinfo
===
RCS file: /cvs/ports/devel/github-backup/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo11 Dec 2017 10:06:28 - 1.1.1.1
+++ distinfo19 Apr 2018 09:29:09 -
@@ -1,2 +1,2 @@
-SHA256 (python-github-backup-0.14.1.tar.gz) =
fh8tDSnWlprYaCdilvWahrK56leTuLgSIM2+cYLBjkA=
-SIZE (python-github-backup-0.14.1.tar.gz) = 15277
+SHA256 (python-github-backup-0.20.0.tar.gz) =
FCm/A126rI7l99YGQ+uHa6oxK15EaiPukeUdz8k8qJ0=
+SIZE (python-github-backup-0.20.0.tar.gz) = 16665
Re: UPDATE net/unison
On Tue, Apr 03, 2018 at 08:28:12PM +0200, Björn Ketelaars wrote: > unison received an update to 2.51.2. An overview on what has changed can > be found at https://github.com/bcpierce00/unison/releases. Noticeable is > that this version breaks compatibility with older versions. > > Tested OK on amd64, and make test runs successfully. > > Response MAINTAINER: 'fine, ok giovanni@'. > > Additional comments/OKs? Sorry for the long delay, looks OK port- and build-wise on amd64. Two things: > HOMEPAGE=http://www.cis.upenn.edu/~bcpierce/unison/ This site has TLS. > # Avoid the nightmare of their Makefile install target. > # Do not use INSTALL_PROGRAM, as the bytecode version must not be stripped! Just unset INSTALL_STRIP and use INSTALL_PROGRAM as normal, that way intentions are clear without this comment.
Fwd: update ssdeep
Ok?
Cheers,
Remi.
Courriel original
Objet: update ssdeep
Date: 17-04-2018 09:48
De: Remi Pointel
À: Lawrence Teo
Hi,
attached is the diff to update ssdeep.
Ok?
Cheers,
Remi.
Index: Makefile
===
RCS file: /cvs/ports/security/ssdeep/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile 26 Jul 2017 22:45:29 - 1.5
+++ Makefile 17 Apr 2018 06:50:29 -
@@ -2,14 +2,14 @@
COMMENT = fuzzy hashing program and library
-DISTNAME = ssdeep-2.13
-REVISION = 1
+VERSION = 2.14.1
+DISTNAME = ssdeep-${VERSION}
CATEGORIES = security
SHARED_LIBS = fuzzy 0.0 # 3.0
-HOMEPAGE = http://ssdeep.sourceforge.net/
+HOMEPAGE = https://ssdeep-project.github.io/ssdeep/
MAINTAINER = Lawrence Teo
@@ -18,7 +18,7 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB = c m ${COMPILER_LIBCXX}
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ssdeep/}
+MASTER_SITES = https://github.com/ssdeep-project/ssdeep/releases/download/release-${VERSION}/
CONFIGURE_STYLE = gnu
Index: distinfo
===
RCS file: /cvs/ports/security/ssdeep/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo 25 Mar 2016 01:11:40 - 1.1.1.1
+++ distinfo 17 Apr 2018 06:50:29 -
@@ -1,2 +1,2 @@
-SHA256 (ssdeep-2.13.tar.gz) = bkypRFfLUP8zQ9TdWFRzgXpGGlWmZtocWnRmeSTw+MU=
-SIZE (ssdeep-2.13.tar.gz) = 380712
+SHA256 (ssdeep-2.14.1.tar.gz) = /y6rx4EG8Am0+y3vLXb7DKnhKs9iTLv62bPrOQ2TExM=
+SIZE (ssdeep-2.14.1.tar.gz) = 408831
Re: [UPDATE] Tor Browser 7.5.3
On Wed, Apr 18, 2018 at 02:16:09PM -0500, attila wrote: > Hi ports@, > > Attached is an update to Tor Browser 7.5.3. Tested lightly on amd64, > more testing would be welcome. Hi, attila! Is it possible to compile it on OpenBSD-stable?
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):
+- importxml kcdump.xml
++ importxml -k kcdump.xml
+ Import OK
+ 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
