Re: [maintainer] www/hugo: update to 0.135.0

2024-10-01 Thread Ian Darwin

On 9/30/24 4:13 AM, Kirill A. Korinsky wrote:

ports@,

Here is an update of www/hugo to 0.135.0 and drop the "extended" flavor.
This flavor only adds a dependency to www/libsass, which is a small library
that doesn't depend on anything. It seems quite logical to drop it to make
support easier.

If you drop the extended flavor, will you update the package-readme 
telling people who use hugo themes depending on the extended version, 
how to hook up libsass so that these themes still work?




Re: Remote execution in CUPS

2024-09-27 Thread Ian Darwin

On 9/27/24 11:05 AM, Kirill A. Korinsky wrote:

On Fri, 27 Sep 2024 14:43:21 +0200,
Chris Narkiewicz  wrote:

https://www.evilsocket.net/2024/09/26/Attacking-UNIX-systems-via-CUPS-Part-I/

Is the cups in ports vulnerable as well?

OpenBSD mises quite import pices of this attack: cups-browsed

Without it, it isn't so dramatic.


Cups is is ports/packages so it is not part of the base system, at all.

And we have cups-browsed in ports/packages and it is a run-depend of 
cups, so it does get installed whenever cups is installed. However, it 
is not enabled by default (you have to enable it with rcctl enable 
cups-browsed or by editing /etc/rc.conf.local), and I hope nobody is 
doing so.




Re: graphics/sane-backend: can't scan from HP4155e scanner

2024-05-26 Thread Ian Darwin
Ack, phhfft. Ignore this. Literally right after I hit "Send", one of the 
sane developers told me that the device is sufficiently different from 
other HP models that it won't work with the HP driver.


/me goes back to the drawing board.

On 5/26/24 4:47 PM, Ian Darwin wrote:
Scanimage (and xsane) give generic failure message instead of 
actionable perror output.


This is on amd64, and has failed on 7.4, 7.5 and -current. Sane config 
files are stock except adding the USB id for this scanner and 
commenting out all the unused devices in /etc/sane.d/dll.conf.


$ scanimage -L
device `hpaio:/usb/DeskJet_4100_series?serial=CN23JFG31P' is a 
Hewlett-Packard DeskJet_4100_series all-in-one

$ scanimage > /tmp/id.pnm
Output format is not set, using pnm as a default.
scanimage: open of device 
hpaio:/usb/DeskJet_4100_series?serial=CN23JFG31P failed: Error during 
device I/O

$ ktrace scanimage > /tmp/id.pnm
Output format is not set, using pnm as a default.
scanimage: open of device 
hpaio:/usb/DeskJet_4100_series?serial=CN23JFG31P failed: Error during 
device I/O

$ kdump > /tmp/id.ktrace

Relevant bit from ktrace follows. Some time after it has successfully 
opened and read from /usr/local/lib/libhmud.so.2.0, it blows with 
this, seemingly looking in /usr/lib:


 81078 scanimage CALL  sendsyslog(0x7c360a32b4c0,87,0<>)
 81078 scanimage GIO   fd -1 wrote 87 bytes
   "<11>scanimage: common/utils.c 246: unable to load library 
libhpmud.so.0: File not found"

 81078 scanimage RET   sendsyslog 0

By "relevant" I mean" right after this message, it starts unloading 
and closing and giving the ever-helpful "failed: Error during device 
I/O" cop-out.


All the syslog output from one run:

2636:May 26 16:32:46 dalai scanimage: scan/sane/escl.c 434: 
escl_open() session=0x0
2637:May 26 16:32:46 dalai scanimage: io/hpmud/musb.c 428: Found 
interface conf=0, iface=1, altset=0, index=1
2638:May 26 16:32:46 dalai scanimage: io/hpmud/musb.c 390: Active 
kernel driver on interface=1 ret=-12
2639:May 26 16:32:46 dalai scanimage: io/hpmud/musb.c 536: claimed 
7/1/2 interface
2640:May 26 16:32:46 dalai scanimage: io/hpmud/musb.c 781: read actual 
device_id successfully fd=1 len=299
2641:May 26 16:32:46 dalai scanimage: io/hpmud/musb.c 562: released 
7/1/2 interface
2642:May 26 16:32:46 dalai scanimage: common/utils.c 246: unable to 
load library libhpmud.so.0: File not found
2643:May 26 16:32:46 dalai scanimage: common/utils.c 246: unable to 
load library libhpmud.so.0: File not found
2644:May 26 16:32:46 dalai scanimage: scan/sane/escl.c 89: Calling 
escl bb_unload:


Full 6MB ktrace at https://darwinsys.com/tmp/scanimage-kdump.txt

$ cd /usr/lib
$ ls -lL libhpmud*
-rw-r--r--  1 root  bin  226380 May 11 22:25 libhpmud.a
-rw-r--r--  1 root  bin    1121 May 11 22:25 libhpmud.la
-rw-r--r--  1 root  bin  140272 May 11 22:25 libhpmud.so.2.0

All these packages are up-to-date:

cups-2.4.8 foomatic-db-4.0.20210611    hplip-3.23.12p0
cups-browsed-2.0.0 foomatic-db-engine-4.0.13p4 hplip-common-3.23.12p0
cups-filters-2.0.0p0 hpaio-3.23.12p0 sane-backends-1.3.1
cups-libs-2.4.8 hpcups-3.23.12p0

This worked a year or so ago when I last used it, though I'm not 100% 
sure if it was this scanner or its predecessor, which isn't much to go 
on, but any thoughts?


The recent commit to sane-backends is not the cause as it was failing 
before that.






graphics/sane-backend: can't scan from HP4155e scanner

2024-05-26 Thread Ian Darwin
Scanimage (and xsane) give generic failure message instead of actionable 
perror output.


This is on amd64, and has failed on 7.4, 7.5 and -current. Sane config 
files are stock except adding the USB id for this scanner and commenting 
out all the unused devices in /etc/sane.d/dll.conf.


$ scanimage -L
device `hpaio:/usb/DeskJet_4100_series?serial=CN23JFG31P' is a 
Hewlett-Packard DeskJet_4100_series all-in-one

$ scanimage > /tmp/id.pnm
Output format is not set, using pnm as a default.
scanimage: open of device 
hpaio:/usb/DeskJet_4100_series?serial=CN23JFG31P failed: Error during 
device I/O

$ ktrace scanimage > /tmp/id.pnm
Output format is not set, using pnm as a default.
scanimage: open of device 
hpaio:/usb/DeskJet_4100_series?serial=CN23JFG31P failed: Error during 
device I/O

$ kdump > /tmp/id.ktrace

Relevant bit from ktrace follows. Some time after it has successfully 
opened and read from /usr/local/lib/libhmud.so.2.0, it blows with this, 
seemingly looking in /usr/lib:


 81078 scanimage CALL  sendsyslog(0x7c360a32b4c0,87,0<>)
 81078 scanimage GIO   fd -1 wrote 87 bytes
   "<11>scanimage: common/utils.c 246: unable to load library 
libhpmud.so.0: File not found"

 81078 scanimage RET   sendsyslog 0

By "relevant" I mean" right after this message, it starts unloading and 
closing and giving the ever-helpful "failed: Error during device I/O" 
cop-out.


All the syslog output from one run:

2636:May 26 16:32:46 dalai scanimage: scan/sane/escl.c 434: escl_open() 
session=0x0
2637:May 26 16:32:46 dalai scanimage: io/hpmud/musb.c 428: Found 
interface conf=0, iface=1, altset=0, index=1
2638:May 26 16:32:46 dalai scanimage: io/hpmud/musb.c 390: Active kernel 
driver on interface=1 ret=-12
2639:May 26 16:32:46 dalai scanimage: io/hpmud/musb.c 536: claimed 7/1/2 
interface
2640:May 26 16:32:46 dalai scanimage: io/hpmud/musb.c 781: read actual 
device_id successfully fd=1 len=299
2641:May 26 16:32:46 dalai scanimage: io/hpmud/musb.c 562: released 
7/1/2 interface
2642:May 26 16:32:46 dalai scanimage: common/utils.c 246: unable to load 
library libhpmud.so.0: File not found
2643:May 26 16:32:46 dalai scanimage: common/utils.c 246: unable to load 
library libhpmud.so.0: File not found
2644:May 26 16:32:46 dalai scanimage: scan/sane/escl.c 89: Calling escl 
bb_unload:


Full 6MB ktrace at https://darwinsys.com/tmp/scanimage-kdump.txt

$ cd /usr/lib
$ ls -lL libhpmud*
-rw-r--r--  1 root  bin  226380 May 11 22:25 libhpmud.a
-rw-r--r--  1 root  bin    1121 May 11 22:25 libhpmud.la
-rw-r--r--  1 root  bin  140272 May 11 22:25 libhpmud.so.2.0

All these packages are up-to-date:

cups-2.4.8 foomatic-db-4.0.20210611    hplip-3.23.12p0
cups-browsed-2.0.0 foomatic-db-engine-4.0.13p4 
hplip-common-3.23.12p0

cups-filters-2.0.0p0 hpaio-3.23.12p0 sane-backends-1.3.1
cups-libs-2.4.8 hpcups-3.23.12p0

This worked a year or so ago when I last used it, though I'm not 100% 
sure if it was this scanner or its predecessor, which isn't much to go 
on, but any thoughts?


The recent commit to sane-backends is not the cause as it was failing 
before that.




Re: Contributing to OBSD

2024-05-09 Thread Ian Darwin
On Thu, May 09, 2024 at 01:00:04PM +0200, Daniel Hejduk wrote:
>Hello, I am new.
>How can I send/create patch using CVS?
>Best regards
>Daniel Hejduk

Put this in ~/.cvsrc

cvs -q
diff -uNp
update -PAd

Then do cvs diff.  Send it with a mail program that doesn't mangle the 
formatting.



Re: [s...@spacehopper.org: Re: [NEW]: misc/openhab - open Home Automation Bus (openHAB)]

2024-03-14 Thread Ian Darwin




Latest version attached. I received some feedback that the permissions
were too restrictive for adjusting logging through the openHAB console.
Changed log4j2.xml and org.ops4j.logging to be owned by _openhab to fix
this.


Thanks. So I removed everything (except the config file where I'd set 
the port to 8200 from 8080) and installed from the new port. I'm still 
not able to get started. I get as far as the setup screen /setup-wizard/ 
where it says "Install Add-ons", but the big button "Select Add-ons to 
Install" is inoperative, so basicui doesn't get installed, and all I get is




  Overview Page Not Configured Yet

Edit the layout page with the ID |"overview"| to display important 
controls here.



This is on -current. Fails using FireFox or Chrome. Thoughts?

Also, in the pkg readme you say:


If, for example, you plan to access a locally connected USB
dongle for Zigbee or Z-Wave, you will need to add the _openhab user to the
'dialer' group. Further, you will  also need to edit /etc/openhab.conf and
adjust EXTRA_JAVA_OPTS accordingly.


I'm not convinced that normal users (who are mostly not Java experts) 
will 'hab' any idea about the "accordingly" part.


Thx.


Re: www/hugo exits with illegal instruction

2024-02-20 Thread Ian Darwin

On 2/20/24 12:02, Isaac Meerleo wrote:

on current amd64, hugo exits with "Illegal instruction"


Update again, Works for me on #7 with package updated.

And, please read up on how to make an error report.

hugo -D
Start building sites …
hugo v0.121.1 openbsd/amd64 BuildDate=unknown

WARN  The author key in site configuration is deprecated. Use 
params.author.name instead.


   | EN-US
---+
  Pages    |    80
  Paginator pages  | 8
  Non-page files   | 1
  Static files |    35
  Processed images | 0
  Aliases  |    19
  Sitemaps | 1
  Cleaned  | 0

Total in 2642 ms
$ ls -l /usr/local/bin/hugo
-rwxr-xr-x  1 root  bin  102261815 Feb 19 09:56 /usr/local/bin/hugo
$ dmesg |grep OpenBSD | tail -1
OpenBSD 7.5-beta (GENERIC.MP) #7: Tue Feb 20 11:09:18 MST 2024
$



Re: [new] security/certspotter 0.16.0

2024-02-14 Thread Ian Darwin

On 2/14/24 07:07, Stuart Henderson wrote:

ooof, this uses a *lot* of bandwidth!


From the man page:


-start_at_end

: Start monitoring logs from the end rather than the beginning.

|**WARNING**: monitoring from the beginning guarantees detection of 
all certificates, but requires downloading hundreds of millions of 
certificates, which takes days. |


Re: UPDATE: cad/prusaslicer

2024-02-06 Thread Ian Darwin
On Mon, Feb 05, 2024 at 08:52:58PM -0800, Renato Aguiar wrote:
> On Tue, Feb 06 2024, Klemens Nanni wrote:
> > That's a lot of patches, do you intend to upstream those?
> > If you do that on GitHub, you might as well switch GH_* to your fork and
> > thus reduce patches/ -- just a suggestion, whatever works best for you.
> 
> There is already a PR (from someone else) for adding support to Catch2 v3:
> https://github.com/prusa3d/PrusaSlicer/pull/11576
> 
> Once that is merged, most patches will be removed :)
> 
> I already keep a fork in GitHub, so I can update the port to use it in the
> meantime if that is preferred.

Given that there's a PR that *might* be accepted, let's leave it for now.
If the PR is rejected, we can switch to your PR; if accepted, you can remove
those patches. 

I'll commit this version later today if no further churn.



Re: UPDATE: cad/prusaslicer

2024-02-05 Thread Ian Darwin

PEBKAC, sorry.



Re: UPDATE: cad/prusaslicer

2024-02-05 Thread Ian Darwin

On 2/5/24 16:04, Renato Aguiar wrote:

Here is a diff updating cad/prusaslicer to 2.7.1.


Still fizzles out for me. Running -current (Feb 1), did pkg_add -vu, 
restored prusaslicer to what's in CVS, applied your patch, rm'd the 
empty patch file, did "make package" and got this. IDK what's different 
on my system to cause this...?


My system:
$ uname -a
OpenBSD dalai.darwinsys.com 7.4 GENERIC.MP#1641 amd64
$

Last paragraph of make output:


-- Checking for module 'hidapi-libusb'
--   Found hidapi-libusb, version 0.13.1
-- Found wxWidgets: 
-L/usr/local/lib;-pthread;;;-L/usr/X11R6/lib;-L/usr/X11R6/lib;-lwx_baseu-3.2;-lwx_gtk3u_core-3.2;-lwx_gtk3u_html-3.2;-lwx_gtk3u_gl-3.2 
(found suitable version "3.2.4", minimum required is "3.2")

-- wx-config path: /usr/local/bin/wx-config
-- Found TIFF: /usr/local/lib/libtiff.so.42.0 (found version "4.6.0")
-- wx libs: 
-L/usr/local/lib;-pthread;;;-L/usr/X11R6/lib;-L/usr/X11R6/lib;-lwx_baseu-3.2;-lwx_gtk3u_core-3.2;-lwx_gtk3u_html-3.2;-lwx_gtk3u_gl-3.2;/usr/local/lib/libpng.so.18.0;/usr/lib/libz.so.7.0;/usr/local/lib/libtiff.so.42.0;/usr/local/lib/libjpeg.so.70.2;/usr/lib/libexpat.so.14.0;X11;EGL
-- Found GTK3: 
/usr/local/include/gtk-3.0;/usr/local/include/at-spi2-atk/2.0;/usr/local/include/at-spi-2.0;/usr/X11R6/include;/usr/local/include/dbus-1.0;/usr/local/lib/dbus-1.0/include;/usr/local/include;/usr/local/include/gio-unix-2.0;/usr/local/include/libepoll-shim;/usr/X11R6/include/libdrm;/usr/local/include/pango-1.0;/usr/local/include/harfbuzz;/usr/local/include/fribidi;/usr/local/include/atk-1.0;/usr/local/include/cairo;/usr/X11R6/include/freetype2;/usr/X11R6/include/pixman-1;/usr/local/include/gdk-pixbuf-2.0;/usr/local/include/libpng16;/usr/local/include/glib-2.0;/usr/local/lib/glib-2.0/include 


CMake Error at tests/CMakeLists.txt:4 (find_package):
  Could not find a configuration file for package "Catch2" that is 
compatible

  with requested version "2.9".

  The following configuration files were considered but not accepted:

    /usr/local/lib/cmake/Catch2/Catch2Config.cmake, version: 3.5.2



-- Configuring incomplete, errors occurred!


Any thoughts/guesses?

Thx

Ian



Re: UPDATE: cad/prusaslicer

2024-02-05 Thread Ian Darwin

On 2/5/24 16:04, Renato Aguiar wrote:

Here is a diff updating cad/prusaslicer to 2.7.1.



"make patch" leaves this 0-byte behind:

./patches/patch-src_slic3r_GUI_GUI_ObjectManipulation_cpp

I'll just rm it and carry on.



Re: UPDATE: cad/prusaslicer

2024-02-05 Thread Ian Darwin

On 2/5/24 16:04, Renato Aguiar wrote:

Here is a diff updating cad/prusaslicer to 2.7.1.


Neat. Was just going to mention that the latest patch I have didn't 
work. Will restart with this patch. Thanks!





Re: Ping: NEW: archivers/heatshrink devel/libbgcode (cad/prusaslicer dependencies)

2024-02-04 Thread Ian Darwin

Both are OK by me with these changes. And both pass portcheck.

On 2/4/24 10:38, Renato Aguiar wrote:


On Sat, Jan 27 2024, Renato Aguiar wrote:



On Fri, Jan 26 2024, Klemens Nanni wrote:


On Thu, Jan 25, 2024 at 05:19:25PM -0800, Renato Aguiar wrote:

Hi,
These 2 ports are dependencies for upcoming cad/prusaslicer update
to 2.7.1:
- devel/heatshrink: data compression/decompression library for
embedded/real-time systems.


Uses -O3, OPTIMIZE='' in MAKE_FLAGS fixes that.

archivers seems a better category than devel.

DESCR could be a little more descriptive than COMMENT.

Shouldn't the first be a .so file?
@static-lib lib/libheatshrink_dynamic.a
@static-lib lib/libheatshrink_static.a


No, both are meant to be static libraries. Those suffixes are
referring to memory allocation model used by each one.




- devel/libbgcode: Prusa Block & Binary G-code reader / writer /
converter.


Unless consumers require static archives, I recomment
-DBUILD_SHARED_LIBS=ON to get versioned shared libraries, as usual.


I tried building prusaslicer (the only consumer) and it seems to work
fine with libbgcode being a dynamic library. As a bonus, it allowed
removing one of the patches from libbgcode port :)



DESCR could be a little more descriptive than COMMENT.

port-lib-depends-check says
Missing: boost_nowide-mt.23 from boost-1.84.0p2v0
(/usr/local/bin/bgcode)
WANTLIB += boost_nowide-mt

You could annotate the used C++ standard as COMPILER comment.



Thanks. I attached updated ports addressing all your comments.



Ping.






Re: NEW: devel/heatshink devel/libbgcode (cad/prusaslicer dependencies)

2024-01-26 Thread Ian Darwin

On 1/25/24 20:19, Renato Aguiar wrote:

Hi,

These 2 ports are dependencies for upcoming cad/prusaslicer update to 
2.7.1:


- devel/heatshrink: data compression/decompression library for 
 embedded/real-time systems.


- devel/libbgcode: Prusa Block & Binary G-code reader / writer / 
 converter.



Been using both for a few days w/o issue, so OK by me. Anyone else?




Re: [NEW] devel/jdk/21

2023-12-07 Thread Ian Darwin

On 12/7/23 13:38, Kurt Miller wrote:

Attached is a port of jdk-21. I have already updated javaPathHelper
to support jdk-21. Below is the diff for java.port.mk to add
support for it as well.

okay for java.port.mk and to import devel/jdk/21?


Both tested & ok by me. Thanks.



Index: java.port.mk
===
RCS file: /cvs/ports/devel/jdk/java.port.mk,v
retrieving revision 1.42
diff -u -p -u -r1.42 java.port.mk
--- java.port.mk11 Mar 2022 18:50:14 -  1.42
+++ java.port.mk7 Dec 2023 18:28:15 -
@@ -1,4 +1,4 @@
-# Set MODJAVA_VER to 1.8, 11 or 17 based on the version of the jdk needed
+# Set MODJAVA_VER to 1.8, 11, 17 or 21 based on the version of the jdk needed
  # for the port. Append a + (e.g., 11+) if any higher version is acceptable.
  
  MODJAVA_VER?=

@@ -22,8 +22,9 @@ MODJAVA_VER?=
  #
  
  .if ${MODJAVA_VER:S/+//} != "1.8" && ${MODJAVA_VER:S/+//} != "11" && \

-  ${MODJAVA_VER:S/+//} != "17"
-ERRORS+="Fatal: MODJAVA_VER must be one of 1.8, 11 or 17 with an optional + 
suffix."
+  ${MODJAVA_VER:S/+//} != "17" && ${MODJAVA_VER:S/+//} != "21"
+ERRORS+="Fatal: MODJAVA_VER must be one of 1.8, 11, 17 or 21"
+ERRORS+="with an optional + suffix."
  .endif
  
  .if ${MODJAVA_VER:S/+//} == "1.8"

@@ -38,9 +39,12 @@ MODJAVA_VER?=
  .elif ${MODJAVA_VER:S/+//} == "11"
  JAVA_HOME= ${LOCALBASE}/jdk-11
  MODJAVA_BUILD_DEPENDS+= jdk->=11v0,<12v0:devel/jdk/11
-.else
+.elif ${MODJAVA_VER:S/+//} == "17"
  JAVA_HOME= ${LOCALBASE}/jdk-17
  MODJAVA_BUILD_DEPENDS+= jdk->=17v0,<18v0:devel/jdk/17
+.else
+JAVA_HOME= ${LOCALBASE}/jdk-21
+MODJAVA_BUILD_DEPENDS+= jdk->=21v0,<22v0:devel/jdk/21
  .endif
  
  .if ${MODJAVA_VER:M*+}





Re: amd64: llvm 16 fallout (2023-11-14)

2023-11-18 Thread Ian Darwin
On Fri, Nov 17, 2023 at 12:26:08AM +0100, Christian Weisgerber wrote:
> Updated list:
> 
> cad/prusaslicer C++ ambiguous function call

Unbreak: Resolve two ambiguous overloads triggered by recent 
header changes and detected after switch to clang 16.

ok?

Index: patches/patch-src_slic3r_GUI_PhysicalPrinterDialog_cpp
===
RCS file: patches/patch-src_slic3r_GUI_PhysicalPrinterDialog_cpp
diff -N patches/patch-src_slic3r_GUI_PhysicalPrinterDialog_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_slic3r_GUI_PhysicalPrinterDialog_cpp  18 Nov 2023 
20:51:53 -
@@ -0,0 +1,20 @@
+Index: src/slic3r/GUI/PhysicalPrinterDialog.cpp
+--- src/slic3r/GUI/PhysicalPritnerDialog.cpp.orig
 src/slic3r/GUI/PhysicalPrinterDialog.cpp
+***
+*** 462,468 
+  // Always fill in the "printhost_port" combo box from the config and 
select it.
+  {
+  Choice* choice = 
dynamic_cast(m_optgroup->get_field("printhost_port"));
+! choice->set_values({ m_config->opt_string("printhost_port") });
+  choice->set_selection();
+  }
+  
+--- 462,468 
+  // Always fill in the "printhost_port" combo box from the config and 
select it.
+  {
+  Choice* choice = 
dynamic_cast(m_optgroup->get_field("printhost_port"));
+! choice->set_values((const std::vector){ 
m_config->opt_string("printhost_port") });
+  choice->set_selection();
+  }
+  
Index: patches/patch-src_slic3r_GUI_Plater_cpp
===
RCS file: patches/patch-src_slic3r_GUI_Plater_cpp
diff -N patches/patch-src_slic3r_GUI_Plater_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_slic3r_GUI_Plater_cpp 18 Nov 2023 20:51:53 -
@@ -0,0 +1,20 @@
+Index: src/slic3r/GUI/Plater.cpp
+--- src/slic3r/GUI/Plater.cpp.orig
 src/slic3r/GUI/Plater.cpp
+***
+*** 5310,5316 
+  
+  p->reset();
+  
+! if (! load_files({ into_path(filename) }).empty()) {
+  // At least one file was loaded.
+  p->set_project_filename(filename);
+  // Save the names of active presets and project specific config into 
ProjectDirtyStateManager.
+--- 5310,5316 
+  
+  p->reset();
+  
+! if (! load_files((const std::vector){ 
into_path(filename) }).empty()) {
+  // At least one file was loaded.
+  p->set_project_filename(filename);
+  // Save the names of active presets and project specific config into 
ProjectDirtyStateManager.



Re: [new] cad/opencascade

2023-10-20 Thread Ian Darwin

Thanks for picking this up and finishing it!
I'm OK with your being opencascade maintainer.

I built the opencascade and prusaslicer 2.5.2p1 and that seems to work 
as before. Didn't test kicad but it's a trivial change and you've tested 
it. So those three are OK ian@.


You probably need a 'quirks' entry and/or a conflict marker for anyone 
who might have the older oce installed. Probably a conflict entry, and 
then remove the old one in a few days?


On 10/19/23 03:42, Johannes Thyssen Tishman wrote:

Please find attached a port for opencascade (occt) intended for the
replacement of the outdated and unmaintained[1] cad/oce in
cad/{kicad,prusaslicer} (and for a future FreeCAD port). For context,
oce is a community driven fork of the Open CASCADE library (occt)
which is also why the ports share a lot in common (many bits were
taken from cad/oce). The replacement is very straightforward and
almost drop-in (see kicad.diff and prusaslicer.diff). With this
change I also suggest the removal of cad/oce as it conflicts with
cad/opencascade and it would no longer make sense to keep it.

Tested both consumers which seem to work great. However more testing
would be appreciated.

I've cc's Renato (maintainer of prusaslicer) and ian@ as he worked
on the wip port as well.

ian@: You were listed as the MAINTAINER of this port in the wip
version[2], but since I'm making this submission without your
consent, I've taken it over. Please let me know if you want it back
or if you'd like to co-maintain it together.





Re: update java/gradle to 8.3

2023-09-16 Thread Ian Darwin
On Sat, Sep 16, 2023 at 11:36:08AM +0100, Stuart Henderson wrote:
> > Unfortunately there is a show-stopper here. We have to fix/update
> > security/ghidra which is not trivial.
> 
> The ghidra port is really outdated, even from just a quick look at
> release notes various of the changes look security-related, not what you
> want when analysing (possibly malicious) binaries. At this point,
> especially since it was already noticed >1y ago, I don't think ghidra
> should stand in the way of updatng gradle, I'd be ok with marking ghidra
> BROKEN and updating gradle.

I concur.



Re: NEW: cad/prusa-slicer 2.5.2

2023-09-07 Thread Ian Darwin
On Wed, Sep 06, 2023 at 07:20:41PM -0700, Renato Aguiar wrote:
> Attached a port of PrusaSlicer 2.5.2. It still needs more testing, but basic
> use case of generating G-Code from STL models seems to be working on my
> amd64 machine.

Thanks for doing the heavy lifting here - a lot of dependencies.

I just took a 45 minute print job, sliced it with this port, and it printed 
fine.
Very glad to be able to do the whole 3D print workflow on OpenBSD: freecad | 
openscad | solvespace, 
prusaslicer, and prusalink via FireFox.

portcheck is also OK with the port, so: tested & OK ian@.



Re: NEW: riff

2023-09-04 Thread Ian Darwin

I'd put it under text/proc next to text/proc/cdiff aka ydiff, but then again
we also have devel/colordiff aka. cdiff(1), your call;  I just keep thinking
of devel/ as the kitchen sink category.
Numbers favor textproc, as there's also textproc/spiff (does same as 
riff) and textproc/idiff (does same as sdiff but in a different way).




tweak devel/zeal; +USE_NOBTCFI, bump rev

2023-07-21 Thread Ian Darwin
OK? No response from maintainer on previous query.

--- Makefile.orig   Fri Jul 21 08:59:20 2023
+++ MakefileFri Jul 21 08:57:40 2023
@@ -1,11 +1,13 @@
 # qt5 webkit
 USE_WXNEEDED = Yes
 
+USE_NOBTCFI =  Yes
+
 COMMENT =  simple offline API documentation browser
 
 V =0.6.1
 DISTNAME = zeal-${V}
-REVISION = 2
+REVISION = 3
 
 CATEGORIES =   devel
 



update openfire 4.2.3->4.6.8

2023-07-10 Thread Ian Darwin
4.6.8 stable fixes several  CVEs, most recently CVE-2023-32315
Use precompiled, until maven is easier to use in ports.
Take maintainer.

OK?

4.7.5 is available but staying on "stable" for time being.

Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- Makefile8 Nov 2022 11:16:59 -   1.56
+++ Makefile10 Jul 2023 14:28:36 -
@@ -1,7 +1,6 @@
 COMMENT=   XMPP real time collaboration server
-V= 4.2.3
-REVISION=  2
-DISTNAME=  openfire_src_${V:S/./_/g}
+V= 4.6.8
+DISTNAME=  openfire_${V:S/./_/g}
 PKGNAME=   openfire-$V
 CATEGORIES=net
 
@@ -9,46 +8,44 @@ MASTER_SITES= https://www.igniterealtime
 
 HOMEPAGE=  https://www.igniterealtime.org/projects/openfire/index.jsp
 
+MAINTAINER=Ian Darwin 
+
 # ASL 2.0
 PERMIT_PACKAGE=Yes
 
+NO_BUILD=  yes
 NO_TEST=   yes
 
 MODULES=   java
-MODJAVA_VER=   1.8
+MODJAVA_VER=   17
 MODJAVA_JRE=   Yes
-MODJAVA_BUILD= ant
 
 RUN_DEPENDS=   java/javaPathHelper
 
-WRKDIST=   ${WRKDIR}/openfire_src
-WRKSRC=${WRKDIST}/build
+WRKDIST=   ${WRKDIR}/openfire
 
 OPENFIREDEST=  ${PREFIX}/openfire
-DATADIRS=  lib logs plugins resources
-
-pre-install:
-   rm -rf ${WRKDIST}/target/openfire/resources/nativeAuth
-   mv ${WRKDIST}/target/openfire/resources/security ${WRKBUILD}
+DATADIRS=  lib plugins resources
+DOCDIRS=   documentation
 
 do-install:
-   cd ${WRKDIST}/target/openfire && \
+   rm -rf ${WRKDIST}/resources/nativeAuth
+   cd ${WRKDIST} && \
find ${DATADIRS} -type d \
-exec ${INSTALL_DATA_DIR} ${OPENFIREDEST}/{} \; && \
find ${DATADIRS} ! -type d \
-exec ${INSTALL_DATA} -m 644 {} ${OPENFIREDEST}/{} \;
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/openfire
-   ${INSTALL_DATA} ${WRKDIST}/documentation/docs/*-guide.html \
-   ${PREFIX}/share/doc/openfire
-   ${INSTALL_DATA} ${WRKDIST}/documentation/docs/database.html \
-   ${PREFIX}/share/doc/openfire
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openfire/security
+   cd ${WRKDIST} && \
+   find ${DOCDIRS} -type d \
+   -exec ${INSTALL_DATA_DIR} 
${PREFIX}/share/doc/openfire/{} \; && \
+   find ${DOCDIRS}/* ! -type d \
+   -exec ${INSTALL_DATA} -m 644 {} 
${PREFIX}/share/doc/openfire \;
+   ${INSTALL_DATA_DIR} ${OPENFIREDEST}/logs
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openfire/
-   ${INSTALL_DATA} ${WRKDIST}/target/openfire/conf/openfire.xml \
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openfire/security
+   ${INSTALL_DATA} ${WRKDIST}/conf/openfire.xml \
${PREFIX}/share/examples/openfire/
-   ${INSTALL_DATA} ${WRKDIST}/target/openfire/conf/security.xml \
+   ${INSTALL_DATA} ${WRKDIST}/conf/security.xml \
${PREFIX}/share/examples/openfire/
-   ${INSTALL_DATA} ${WRKBUILD}/security/* \
-   ${PREFIX}/share/examples/openfire/security
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo1 Oct 2018 20:08:53 -   1.19
+++ distinfo10 Jul 2023 14:28:36 -
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_4_2_3.tar.gz) = 
mpAbzQaSDMtbQXUX2wKaSiC3ddSao52RipltSq9HQww=
-SIZE (openfire_src_4_2_3.tar.gz) = 113557155
+SHA256 (openfire_4_6_8.tar.gz) = si/OmTvOSTA0YYPV7cHp44gnpH7Y9kxBSGoQX1dMwRY=
+SIZE (openfire_4_6_8.tar.gz) = 48730297
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/openfire/pkg/PLIST,v
retrieving revision 1.14
diff -u -p -r1.14 PLIST
--- pkg/PLIST   8 Nov 2022 11:16:59 -   1.14
+++ pkg/PLIST   10 Jul 2023 14:28:36 -
@@ -12,20 +12,116 @@ openfire/
 @owner
 @group
 openfire/lib/
-openfire/lib/bcpg-jdk15on.jar
-openfire/lib/bcpkix-jdk15on.jar
-openfire/lib/bcprov-jdk15on.jar
-openfire/lib/hsqldb.jar
-openfire/lib/javax.websocket-api.jar
-openfire/lib/jtds.jar
-openfire/lib/log4j.xml
-openfire/lib/mail.jar
-openfire/lib/mysql.jar
-openfire/lib/npn-boot.jar
-openfire/lib/openfire.jar
-openfire/lib/postgres.jar
-openfire/lib/slf4j-log4j12.jar
+openfire/lib/FastInfoset-1.2.16.jar
+openfire/lib/activation-1.1.jar
+openfire/lib/ant-1.10.9.jar
+openfire/lib/ant-launcher-1.10.9.jar
+openfire/lib/apache-el-8.5.54.jar
+openfire/lib/apache-jsp-8.5.54.jar
+openfire/lib/apache-jsp-9.4.35.v20201120.jar
+openfire/lib/asm-9.0.jar
+openfire/lib/asm-analysis-9.0.jar
+openfire/lib/asm-commons-9.0.jar
+openfire/lib/asm-tree-9.0.jar
+openfire/lib/bcpg-jdk15on-1.68.jar
+openfire/lib/bcpkix-jdk15on-1.68.jar
+openfire/lib/bcprov

Update: devel/ruby-tilt 2.0.8->2.0.11

2023-07-06 Thread Ian Darwin
Minor update, needed by other port. I'm no Ruby expert but it 
seems the new version doesn't ship with tests for some reason.

Comments/OKs?

Index: Makefile
===
RCS file: /cvs/ports/devel/ruby-tilt/Makefile,v
retrieving revision 1.16
diff -u -p -u -r1.16 Makefile
--- Makefile11 Mar 2022 18:53:21 -  1.16
+++ Makefile6 Jul 2023 14:04:53 -
@@ -1,6 +1,6 @@
 COMMENT =  generic interface to multiple Ruby template engines
 
-DISTNAME = tilt-2.0.8
+DISTNAME = tilt-2.0.11
 CATEGORIES =   devel textproc
 
 HOMEPAGE = https://github.com/rtomayko/tilt
@@ -12,6 +12,6 @@ MODULES = lang/ruby
 
 CONFIGURE_STYLE =  ruby gem
 
-MODRUBY_TEST = testrb
+NO_TEST =  Yes
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/devel/ruby-tilt/distinfo,v
retrieving revision 1.4
diff -u -p -u -r1.4 distinfo
--- distinfo14 Nov 2017 17:07:00 -  1.4
+++ distinfo6 Jul 2023 14:04:53 -
@@ -1,2 +1,2 @@
-SHA256 (tilt-2.0.8.gem) = KjvmxWqMxjOCA8ApEOIOhYZktjOttVDhEDgE116uQAA=
-SIZE (tilt-2.0.8.gem) = 54784
+SHA256 (tilt-2.0.11.gem) = exgPxHLL3rGGyF0xwPLR5hosDXfh2f0MooSCqdly1qA=
+SIZE (tilt-2.0.11.gem) = 23040
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/ruby-tilt/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -r1.6 PLIST
--- pkg/PLIST   11 Mar 2022 18:53:21 -  1.6
+++ pkg/PLIST   6 Jul 2023 14:04:53 -
@@ -1,17 +1,9 @@
 ${GEM_BIN}/tilt${GEM_BIN_SUFFIX}
 ${GEM_LIB}/cache/${DISTNAME}.gem
 ${GEM_LIB}/gems/${DISTNAME}/
-${GEM_LIB}/gems/${DISTNAME}/CHANGELOG.md
 ${GEM_LIB}/gems/${DISTNAME}/COPYING
-${GEM_LIB}/gems/${DISTNAME}/Gemfile
-${GEM_LIB}/gems/${DISTNAME}/HACKING
-${GEM_LIB}/gems/${DISTNAME}/README.md
-${GEM_LIB}/gems/${DISTNAME}/Rakefile
 ${GEM_LIB}/gems/${DISTNAME}/bin/
 ${GEM_LIB}/gems/${DISTNAME}/bin/tilt
-${GEM_LIB}/gems/${DISTNAME}/docs/
-${GEM_LIB}/gems/${DISTNAME}/docs/TEMPLATES.md
-${GEM_LIB}/gems/${DISTNAME}/docs/common.css
 ${GEM_LIB}/gems/${DISTNAME}/lib/
 ${GEM_LIB}/gems/${DISTNAME}/lib/tilt/
 ${GEM_LIB}/gems/${DISTNAME}/lib/tilt.rb
@@ -53,61 +45,4 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/tilt/tem
 ${GEM_LIB}/gems/${DISTNAME}/lib/tilt/typescript.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/tilt/wikicloth.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/tilt/yajl.rb
-${GEM_LIB}/gems/${DISTNAME}/man/
-${GEM_LIB}/gems/${DISTNAME}/man/index.txt
-${GEM_LIB}/gems/${DISTNAME}/man/tilt.1.ronn
-${GEM_LIB}/gems/${DISTNAME}/test/
-${GEM_LIB}/gems/${DISTNAME}/test/markaby/
-${GEM_LIB}/gems/${DISTNAME}/test/markaby/locals.mab
-${GEM_LIB}/gems/${DISTNAME}/test/markaby/markaby.mab
-${GEM_LIB}/gems/${DISTNAME}/test/markaby/markaby_other_static.mab
-${GEM_LIB}/gems/${DISTNAME}/test/markaby/render_twice.mab
-${GEM_LIB}/gems/${DISTNAME}/test/markaby/scope.mab
-${GEM_LIB}/gems/${DISTNAME}/test/markaby/yielding.mab
-${GEM_LIB}/gems/${DISTNAME}/test/mytemplate.rb
-${GEM_LIB}/gems/${DISTNAME}/test/test_helper.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_asciidoctor_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_babeltemplate.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_blueclothtemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_buildertemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_cache_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_coffeescripttemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_commonmarkertemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_compilesite_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_creoletemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_csv_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_erbtemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_erubistemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_erubitemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_etannitemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_hamltemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_kramdown_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_lesstemplate_test.less
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_lesstemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_liquidtemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_livescripttemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_mapping_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_markaby_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_markdown_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_marukutemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_metadata_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_nokogiritemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_pandoctemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_prawntemplate.prawn
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_prawntemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_radiustemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_rdiscounttemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/til

Re: NEW: devel/cereal serialization header library

2023-07-05 Thread Ian Darwin
This time with the attachement.

On Wed, Jul 05, 2023 at 02:07:01AM -0400, Ian Darwin wrote:
> On Tue, Jul 04, 2023 at 03:20:41AM -0400, Ian Darwin wrote:
> > Descr: 
> > Cereal is a header-only C++11 serialization library. It takes
> > arbitrary data types and reversibly turns them into different
> > representations, such as compact binary encodings, XML, or JSON.
> > Cereal was designed to be fast, light-weight, and easy to extend -
> > it has no external dependencies and can be easily bundled with
> > other code or used standalone.
> > 
> > Dependency for WIP cad/prusaslicer
> > 
> > Comments/OKs/improvements welcome.
> 
> Merged Makefile with one done independently by Renato Aguiar, thanks.
> 


cereal.tar.gz
Description: application/tar-gz


Re: NEW: devel/cereal serialization header library

2023-07-04 Thread Ian Darwin
On Tue, Jul 04, 2023 at 03:20:41AM -0400, Ian Darwin wrote:
> Descr: 
> Cereal is a header-only C++11 serialization library. It takes
> arbitrary data types and reversibly turns them into different
> representations, such as compact binary encodings, XML, or JSON.
> Cereal was designed to be fast, light-weight, and easy to extend -
> it has no external dependencies and can be easily bundled with
> other code or used standalone.
> 
> Dependency for WIP cad/prusaslicer
> 
> Comments/OKs/improvements welcome.

Merged Makefile with one done independently by Renato Aguiar, thanks.



NEW: devel/cereal serialization header library

2023-07-04 Thread Ian Darwin
Descr: 
Cereal is a header-only C++11 serialization library. It takes
arbitrary data types and reversibly turns them into different
representations, such as compact binary encodings, XML, or JSON.
Cereal was designed to be fast, light-weight, and easy to extend -
it has no external dependencies and can be easily bundled with
other code or used standalone.

Dependency for WIP cad/prusaslicer

Comments/OKs/improvements welcome.


cereal.tgz
Description: application/tar-gz


Re: www/hugo Error while watching: bad address

2023-04-14 Thread Ian Darwin
I tested Paco's update on a machine recently upgraded to 7.3, and the
patch solves the problem here. I saw the "Error while watching" on
v0.101.0 and do not see it on v0.111.3. Tested both development and
production mode; my website still works both ways :-)

ok ian@

On Fri, Apr 14, 2023 at 10:18:16AM +0200, Paco Esteban wrote:
> On Thu, 13 Apr 2023, Stuart Henderson wrote:
> 
> > On 2023/04/13 22:43, Joel Carnat wrote:
> > > Hello,
> > > 
> > > Running `hugo -D server` on my newly installed OpenBSD 7.3 amd64 leads to
> > > loads or error messages:
> > > ERROR 2023/04/13 22:35:24 Error while watching: bad address
> > > Environment: "development"
> > > Serving pages from memory
> > > Running in Fast Render Mode. For full rebuilds on change: hugo server
> > > --disableFastRender
> > > ERROR 2023/04/13 22:35:24 Error while watching: bad address
> > > ERROR 2023/04/13 22:35:24 Error while watching: bad address
> > 
> > There's a fair chance this is affected by syscall changes in base.
> > 
> > Updating the port to a version with newer go deps might possibly fix it..
> > 
> 
> I got a similar report from Lari Huttunen earlier this week.
> 
> I could not reproduce it really, either with the base or the extended
> flavor.
> 
> In any case, here's an update to hugo's latest version.
> Works fine for me.  Please test it to see if the problem goes away.
> 
> 
> diff /usr/ports
> commit - 5465a55dd7a877e7274738c214a1679d0edd8732
> path + /usr/ports
> blob - 9754170526210dcb362034f18a95a9f49bf04542
> file + www/hugo/Makefile
> --- www/hugo/Makefile
> +++ www/hugo/Makefile
> @@ -3,7 +3,7 @@ MODGO_VERSION =   v0.101.0
>  COMMENT =fast and flexible static site generator
>  
>  MODGO_MODNAME =  github.com/gohugoio/hugo
> -MODGO_VERSION =  v0.101.0
> +MODGO_VERSION =  v0.111.3
>  
>  DISTNAME =   hugo-${MODGO_VERSION}
>  
> blob - 67b51fd87f14b195c6355f2ad1983f0930bbbfc3
> file + www/hugo/distinfo
> --- www/hugo/distinfo
> +++ www/hugo/distinfo
> @@ -52,6 +52,8 @@ SHA256 (go_modules/cloud.google.com/go/datastore/@v/v1
>  SHA256 (go_modules/cloud.google.com/go/compute/@v/v1.6.0.mod) = 
> YirbnXkI3clE/9zmS7I+eqTWgKHwRamTZkhTyWFvzzA=
>  SHA256 (go_modules/cloud.google.com/go/compute/@v/v1.6.1.mod) = 
> AptruYw6E6qlwYlxymDZGBZujZwzDW0qJO8lwpfXOFM=
>  SHA256 (go_modules/cloud.google.com/go/compute/@v/v1.6.1.zip) = 
> /Zwp6ZrXY6utVRuDpBzqqw2lISsvaEtqwC+homoBSRQ=
> +SHA256 (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.0.mod) = 
> ZmAMRI0rXFR3BnNIkO0YGJyCgLII2Gua8qsIENW2HSE=
> +SHA256 (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.0.zip) = 
> v36mmm629lvSsa2TebXRmQQP81Rk3+iLEKPFL30ROq8=
>  SHA256 (go_modules/cloud.google.com/go/datastore/@v/v1.0.0.mod) = 
> A0xS+1OSg3+NsnVIX7DpXRDmzSUw3Ty2c9fTUJ4WsuY=
>  SHA256 (go_modules/cloud.google.com/go/datastore/@v/v1.1.0.mod) = 
> Yj/KeFSbpDuc5dHtTrHijciTKPpxM5eUBe4wnb0tt8A=
>  SHA256 (go_modules/cloud.google.com/go/datastore/@v/v1.1.0.zip) = 
> fa5WPcfC5USyKfMDIQOsBWhxIOjSVSGu8EtF80bsX/s=
> @@ -153,11 +155,13 @@ SHA256 (go_modules/github.com/alecthomas/chroma/v2/@v/
>  SHA256 (go_modules/github.com/!puerkito!bio/purell/@v/v1.1.1.zip) = 
> WeY2dg1/KrQcL4DBeEscc9OB1EiI0ZmSKN7dY03c9e0=
>  SHA256 
> (go_modules/github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod)
>  = 0Fp201NQxH3db+fCU8mcyKzlr1rCA8/gBVILMp/TFI4=
>  SHA256 
> (go_modules/github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.zip)
>  = F5MSQnPdlOcInpVxbUBSm89wuehxYtYCGPaN3k1q650=
> -SHA256 (go_modules/github.com/alecthomas/chroma/v2/@v/v2.0.1.mod) = 
> LGyBhsksWT8I1jbcXtyB9GEkFtAtzUojEF+oF2dAZnM=
> +SHA256 (go_modules/github.com/alecthomas/assert/v2/@v/v2.2.1.mod) = 
> Szweb9ARH7axr0ylcfLQeaeiBuGRQHASsZ7HbASyN2A=
> +SHA256 (go_modules/github.com/alecthomas/assert/v2/@v/v2.2.1.zip) = 
> 2irW5NabMzqEIjrqaU3CIbscv+MlXSDD31ncCKdO+Hg=
>  SHA256 (go_modules/github.com/alecthomas/chroma/v2/@v/v2.2.0.mod) = 
> LGyBhsksWT8I1jbcXtyB9GEkFtAtzUojEF+oF2dAZnM=
> -SHA256 (go_modules/github.com/alecthomas/chroma/v2/@v/v2.2.0.zip) = 
> 585KNMrXV2yA0czpefx9acgS+eISo8T+FaeXv5YBOTk=
> -SHA256 
> (go_modules/github.com/alecthomas/repr/@v/v0.0.0-20220113201626-b1b626ac65ae.mod)
>  = CPwPpIMMHGYnVFCpoC1oKA5s+ao/Sb1g32Rc+pBZb08=
> -SHA256 
> (go_modules/github.com/alecthomas/repr/@v/v0.0.0-20220113201626-b1b626ac65ae.zip)
>  = BuvPLzN5HHEscv08QQ1HDuivXuVhUj28TzmEu0MK5vg=
> +SHA256 (go_modules/github.com/alecthomas/chroma/v2/@v/v2.5.0.mod) = 
> h1MpQG6b4jpX4LqSDQJe/dO1C/K5lpg3cBwAgLi4uuE=
> +SHA256 (go_modules/github.com/alecthomas/chroma/v2/@v/v2.5.0.zip) = 
> yGkyUfS2JmZq2NFXylK5QyvKvR+KdxN/9fsXbRL8YR0=
> +SHA256 (go_modules/github.com/alecthomas/repr/@v/v0.2.0.mod) = 
> K/LL5QDij0uoEQeYW/DzESIcWImu+5JtUjBgaIlEMrQ=
> +SHA256 (go_modules/github.com/alecthomas/repr/@v/v0.2.0.zip) = 
> ib/EIL10sb2l9FgWtnqNdD9TRwujnFDjvJS8D9HAZPo=
>  SHA256 (go_modules/github.com/antihax/optional/@v/v1.0.0.mod) = 
> 0sIhN/ViECf4dLEiVGzxWHIp34YY+WFbqf5OYw4oC+s=
>  SHA256 (go_modules/github.com/

Re: remove security/chntpw ?

2022-11-13 Thread Ian Darwin
On Sun, Nov 13, 2022 at 11:33:12PM +0100, Stefan Hagen wrote:
> Klemens Nanni wrote (2022-11-13 22:55 CET):
> > Upstream last released in 2014, we never updated since import in 2010:
> > 
> > revision 1.1.1.1
> > date: 2010/11/04 21:59:20;  author: ian;  state: Exp;  lines: +0 -0;
> > Import chntpw, for resetting your M$Windows-NT/XP/... password under 
> > *Nix.
> > Useful now that NTFS is enabled by default. Tested by several. OK 
> > merdely@.  
> > Prodded by "Jiri B" who submitted a similar port.
> > 
> > I hope noone is still booting such old windows and keeps forgetting
> > their pw...
> > 
> > Would anyone miss this tool on openbsd?
> 
> The tool is on several linux live-CDs and the author also provides a bootable
> image. These are better suited for this kind of rescue attempts (imho).
> 
> OK for removal from me. But let's wait a bit for Ian.

Sure. Boot a Linux live cd instead of an OpenBSD one. It was more useful when
disks were expensive and people had to dual-boot. OK to nuke it. 



rm books/{JLS,JVMS}

2022-04-08 Thread Ian Darwin
These are books about Java.  The versions in ports are way out of
date. New versions are issued with each new major release (every 6
months), but the current ones are covered by a license that does not
permit redistribution. My thought is to rm them both, unless anybody
thinks leaving out of date ones is a better plan.  Quirks will be
included.

Comments? OKs?



Re: net/openfire update to 4.6.7 fix log4shell CVE-2021-44832

2022-01-28 Thread Ian Darwin

Ping?

On 1/19/22 12:51, Ian Darwin wrote:

Update to 4.6.7, which uses log4j 2.1.7. Use modern Java runtime. Drop
some trivial sampled files.  Use provided class files instead
of compiling, to speed build. Take Maintainer in case I'm the only
one still using it :-).

OK?

And yes, I know they released 4.7.0 an hour ago, but (a) it's a brand new
major release, not tested, and (b) I'd like to get this out ASAP due to log4j.

Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.54
diff -u -p -r1.54 Makefile
--- Makefile23 Sep 2019 15:14:25 -  1.54
+++ Makefile19 Jan 2022 17:47:22 -
@@ -1,9 +1,8 @@
  # $OpenBSD: Makefile,v 1.54 2019/09/23 15:14:25 kurt Exp $
  
  COMMENT=	XMPP real time collaboration server

-V= 4.2.3
-REVISION=  1
-DISTNAME=  openfire_src_${V:S/./_/g}
+V= 4.6.7
+DISTNAME=  openfire_${V:S/./_/g}
  PKGNAME=  openfire-$V
  CATEGORIES=   net
  
@@ -11,46 +10,44 @@ MASTER_SITES=	https://www.igniterealtime
  
  HOMEPAGE=	https://www.igniterealtime.org/projects/openfire/index.jsp
  
+MAINTAINER=	Ian Darwin 

+
  # ASL 2.0
  PERMIT_PACKAGE=   Yes
  
+NO_BUILD=	yes

  NO_TEST=  yes
  
  MODULES=	java

-MODJAVA_VER=   1.8
+MODJAVA_VER=   17
  MODJAVA_JRE=  Yes
-MODJAVA_BUILD= ant
  
  RUN_DEPENDS=	java/javaPathHelper
  
-WRKDIST=	${WRKDIR}/openfire_src

-WRKSRC=${WRKDIST}/build
+WRKDIST=   ${WRKDIR}/openfire
  
  OPENFIREDEST=	${PREFIX}/openfire

-DATADIRS=  lib logs plugins resources
-
-pre-install:
-   rm -rf ${WRKDIST}/target/openfire/resources/nativeAuth
-   mv ${WRKDIST}/target/openfire/resources/security ${WRKBUILD}
+DATADIRS=  lib plugins resources
+DOCDIRS=   documentation
  
  do-install:

-   cd ${WRKDIST}/target/openfire && \
+   rm -rf ${WRKDIST}/resources/nativeAuth
+   cd ${WRKDIST} && \
find ${DATADIRS} -type d \
-exec ${INSTALL_DATA_DIR} ${OPENFIREDEST}/{} \; && \
find ${DATADIRS} ! -type d \
-exec ${INSTALL_DATA} -m 644 {} ${OPENFIREDEST}/{} \;
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/openfire
-   ${INSTALL_DATA} ${WRKDIST}/documentation/docs/*-guide.html \
-   ${PREFIX}/share/doc/openfire
-   ${INSTALL_DATA} ${WRKDIST}/documentation/docs/database.html \
-   ${PREFIX}/share/doc/openfire
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openfire/security
+   cd ${WRKDIST} && \
+   find ${DOCDIRS} -type d \
+   -exec ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/openfire/{} \; 
&& \
+   find ${DOCDIRS}/* ! -type d \
+   -exec ${INSTALL_DATA} -m 644 {} 
${PREFIX}/share/doc/openfire \;
+   ${INSTALL_DATA_DIR} ${OPENFIREDEST}/logs
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openfire/
-   ${INSTALL_DATA} ${WRKDIST}/target/openfire/conf/openfire.xml \
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openfire/security
+   ${INSTALL_DATA} ${WRKDIST}/conf/openfire.xml \
${PREFIX}/share/examples/openfire/
-   ${INSTALL_DATA} ${WRKDIST}/target/openfire/conf/security.xml \
+   ${INSTALL_DATA} ${WRKDIST}/conf/security.xml \
${PREFIX}/share/examples/openfire/
-   ${INSTALL_DATA} ${WRKBUILD}/security/* \
-   ${PREFIX}/share/examples/openfire/security
  
  .include 

Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo1 Oct 2018 20:08:53 -   1.19
+++ distinfo19 Jan 2022 17:47:22 -
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_4_2_3.tar.gz) = 
mpAbzQaSDMtbQXUX2wKaSiC3ddSao52RipltSq9HQww=
-SIZE (openfire_src_4_2_3.tar.gz) = 113557155
+SHA256 (openfire_4_6_7.tar.gz) = ayunxJdtvTYkkmmkU+sXbXGh5/gFdZUc3Rc9DsQkcFY=
+SIZE (openfire_4_6_7.tar.gz) = 48681460
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/openfire/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST   1 Oct 2018 20:08:53 -   1.12
+++ pkg/PLIST   19 Jan 2022 17:47:22 -
@@ -13,20 +13,116 @@ openfire/
  @owner
  @group
  openfire/lib/
-openfire/lib/bcpg-jdk15on.jar
-openfire/lib/bcpkix-jdk15on.jar
-openfire/lib/bcprov-jdk15on.jar
-openfire/lib/hsqldb.jar
-openfire/lib/javax.websocket-api.jar
-openfire/lib/jtds.jar
-openfire/lib/log4j.xml
-openfire/lib/mail.jar
-openfire/lib/mysql.jar
-openfire/lib/npn-boot.jar
-openfire/lib/openfire.jar
-openfire/lib/postgres.jar
-openfire/lib/slf4j-log4j12.jar
+openfire/lib/FastInfoset-1.2.16.jar
+openfire/lib/activation-1.1.jar
+openfire/lib/ant-1.10.9.jar
+openfire/lib/ant-launcher-1.10.9.jar
+openfire/lib/apache-el-8.5.54.jar
+open

Re: net/openfire update to 4.6.7 fix log4shell CVE-2021-44832

2022-01-20 Thread Ian Darwin
On Wed, Jan 19, 2022 at 12:51:49PM -0500, Ian Darwin wrote:
> Update to 4.6.7, which uses log4j 2.1.7. Use modern Java runtime. Drop
> some trivial sampled files.  Use provided class files instead
> of compiling, to speed build. Take Maintainer in case I'm the only
> one still using it :-).
> 

Just for clarity, I have been running this in production for a while,
and did not have any issues moving from the 4.2.3 in ports to this release.

It not only fixes CVE-2021-44832 but removes the old log4j v1 completely.

Any OKs or cluebats? Thx

> 
> And yes, I know they released 4.7.0 an hour ago, but (a) it's a brand new 
> major release, not tested, and (b) I'd like to get this out ASAP due to log4j.
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/openfire/Makefile,v
> retrieving revision 1.54
> diff -u -p -r1.54 Makefile
> --- Makefile  23 Sep 2019 15:14:25 -  1.54
> +++ Makefile  19 Jan 2022 17:47:22 -
> @@ -1,9 +1,8 @@
>  # $OpenBSD: Makefile,v 1.54 2019/09/23 15:14:25 kurt Exp $
>  
>  COMMENT= XMPP real time collaboration server
> -V=   4.2.3
> -REVISION=1
> -DISTNAME=openfire_src_${V:S/./_/g}
> +V=   4.6.7
> +DISTNAME=openfire_${V:S/./_/g}
>  PKGNAME= openfire-$V
>  CATEGORIES=  net
>  
> @@ -11,46 +10,44 @@ MASTER_SITES= https://www.igniterealtime
>  
>  HOMEPAGE=https://www.igniterealtime.org/projects/openfire/index.jsp
>  
> +MAINTAINER=  Ian Darwin 
> +
>  # ASL 2.0
>  PERMIT_PACKAGE=  Yes
>  
> +NO_BUILD=yes
>  NO_TEST= yes
>  
>  MODULES= java
> -MODJAVA_VER= 1.8
> +MODJAVA_VER= 17
>  MODJAVA_JRE= Yes
> -MODJAVA_BUILD=   ant
>  
>  RUN_DEPENDS= java/javaPathHelper
>  
> -WRKDIST= ${WRKDIR}/openfire_src
> -WRKSRC=  ${WRKDIST}/build
> +WRKDIST= ${WRKDIR}/openfire
>  
>  OPENFIREDEST=${PREFIX}/openfire
> -DATADIRS=lib logs plugins resources
> -
> -pre-install:
> - rm -rf ${WRKDIST}/target/openfire/resources/nativeAuth
> - mv ${WRKDIST}/target/openfire/resources/security ${WRKBUILD}
> +DATADIRS=lib plugins resources
> +DOCDIRS= documentation
>  
>  do-install:
> - cd ${WRKDIST}/target/openfire && \
> + rm -rf ${WRKDIST}/resources/nativeAuth
> + cd ${WRKDIST} && \
>   find ${DATADIRS} -type d \
>   -exec ${INSTALL_DATA_DIR} ${OPENFIREDEST}/{} \; && \
>   find ${DATADIRS} ! -type d \
>   -exec ${INSTALL_DATA} -m 644 {} ${OPENFIREDEST}/{} \;
> - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/openfire
> - ${INSTALL_DATA} ${WRKDIST}/documentation/docs/*-guide.html \
> - ${PREFIX}/share/doc/openfire
> - ${INSTALL_DATA} ${WRKDIST}/documentation/docs/database.html \
> - ${PREFIX}/share/doc/openfire
> - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openfire/security
> + cd ${WRKDIST} && \
> + find ${DOCDIRS} -type d \
> + -exec ${INSTALL_DATA_DIR} 
> ${PREFIX}/share/doc/openfire/{} \; && \
> + find ${DOCDIRS}/* ! -type d \
> + -exec ${INSTALL_DATA} -m 644 {} 
> ${PREFIX}/share/doc/openfire \;
> + ${INSTALL_DATA_DIR} ${OPENFIREDEST}/logs
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openfire/
> - ${INSTALL_DATA} ${WRKDIST}/target/openfire/conf/openfire.xml \
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openfire/security
> + ${INSTALL_DATA} ${WRKDIST}/conf/openfire.xml \
>   ${PREFIX}/share/examples/openfire/
> - ${INSTALL_DATA} ${WRKDIST}/target/openfire/conf/security.xml \
> + ${INSTALL_DATA} ${WRKDIST}/conf/security.xml \
>   ${PREFIX}/share/examples/openfire/
> - ${INSTALL_DATA} ${WRKBUILD}/security/* \
> - ${PREFIX}/share/examples/openfire/security
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/openfire/distinfo,v
> retrieving revision 1.19
> diff -u -p -r1.19 distinfo
> --- distinfo  1 Oct 2018 20:08:53 -   1.19
> +++ distinfo  19 Jan 2022 17:47:22 -
> @@ -1,2 +1,2 @@
> -SHA256 (openfire_src_4_2_3.tar.gz) = 
> mpAbzQaSDMtbQXUX2wKaSiC3ddSao52RipltSq9HQww=
> -SIZE (openfire_src_4_2_3.tar.gz) = 113557155
> +SHA256 (openfire_4_6_7.tar.gz) = ayunxJdtvTYkkmmkU+sXbXGh5/gFdZUc3Rc9DsQkcFY=
> +SIZE (openfire_4_6_7.tar.gz) = 48681460
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/net/openfire/pkg/PLIST,v
> retrieving revision 1.12
> di

net/openfire update to 4.6.7 fix log4shell

2022-01-19 Thread Ian Darwin
Update to 4.6.7, which uses log4j 2.1.7. Use modern Java runtime. Drop
some trivial sampled files.  Use provided class files instead
of compiling, to speed build. Take Maintainer in case I'm the only
one still using it :-).

OK?

And yes, I know they released 4.7.0 an hour ago, but (a) it's a brand new 
major release, not tested, and (b) I'd like to get this out ASAP due to log4j.

Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.54
diff -u -p -r1.54 Makefile
--- Makefile23 Sep 2019 15:14:25 -  1.54
+++ Makefile19 Jan 2022 17:47:22 -
@@ -1,9 +1,8 @@
 # $OpenBSD: Makefile,v 1.54 2019/09/23 15:14:25 kurt Exp $
 
 COMMENT=   XMPP real time collaboration server
-V= 4.2.3
-REVISION=  1
-DISTNAME=  openfire_src_${V:S/./_/g}
+V= 4.6.7
+DISTNAME=  openfire_${V:S/./_/g}
 PKGNAME=   openfire-$V
 CATEGORIES=net
 
@@ -11,46 +10,44 @@ MASTER_SITES=   https://www.igniterealtime
 
 HOMEPAGE=  https://www.igniterealtime.org/projects/openfire/index.jsp
 
+MAINTAINER=Ian Darwin 
+
 # ASL 2.0
 PERMIT_PACKAGE=Yes
 
+NO_BUILD=  yes
 NO_TEST=   yes
 
 MODULES=   java
-MODJAVA_VER=   1.8
+MODJAVA_VER=   17
 MODJAVA_JRE=   Yes
-MODJAVA_BUILD= ant
 
 RUN_DEPENDS=   java/javaPathHelper
 
-WRKDIST=   ${WRKDIR}/openfire_src
-WRKSRC=${WRKDIST}/build
+WRKDIST=   ${WRKDIR}/openfire
 
 OPENFIREDEST=  ${PREFIX}/openfire
-DATADIRS=  lib logs plugins resources
-
-pre-install:
-   rm -rf ${WRKDIST}/target/openfire/resources/nativeAuth
-   mv ${WRKDIST}/target/openfire/resources/security ${WRKBUILD}
+DATADIRS=  lib plugins resources
+DOCDIRS=   documentation
 
 do-install:
-   cd ${WRKDIST}/target/openfire && \
+   rm -rf ${WRKDIST}/resources/nativeAuth
+   cd ${WRKDIST} && \
find ${DATADIRS} -type d \
-exec ${INSTALL_DATA_DIR} ${OPENFIREDEST}/{} \; && \
find ${DATADIRS} ! -type d \
-exec ${INSTALL_DATA} -m 644 {} ${OPENFIREDEST}/{} \;
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/openfire
-   ${INSTALL_DATA} ${WRKDIST}/documentation/docs/*-guide.html \
-   ${PREFIX}/share/doc/openfire
-   ${INSTALL_DATA} ${WRKDIST}/documentation/docs/database.html \
-   ${PREFIX}/share/doc/openfire
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openfire/security
+   cd ${WRKDIST} && \
+   find ${DOCDIRS} -type d \
+   -exec ${INSTALL_DATA_DIR} 
${PREFIX}/share/doc/openfire/{} \; && \
+   find ${DOCDIRS}/* ! -type d \
+   -exec ${INSTALL_DATA} -m 644 {} 
${PREFIX}/share/doc/openfire \;
+   ${INSTALL_DATA_DIR} ${OPENFIREDEST}/logs
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openfire/
-   ${INSTALL_DATA} ${WRKDIST}/target/openfire/conf/openfire.xml \
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openfire/security
+   ${INSTALL_DATA} ${WRKDIST}/conf/openfire.xml \
${PREFIX}/share/examples/openfire/
-   ${INSTALL_DATA} ${WRKDIST}/target/openfire/conf/security.xml \
+   ${INSTALL_DATA} ${WRKDIST}/conf/security.xml \
${PREFIX}/share/examples/openfire/
-   ${INSTALL_DATA} ${WRKBUILD}/security/* \
-   ${PREFIX}/share/examples/openfire/security
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo1 Oct 2018 20:08:53 -   1.19
+++ distinfo19 Jan 2022 17:47:22 -
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_4_2_3.tar.gz) = 
mpAbzQaSDMtbQXUX2wKaSiC3ddSao52RipltSq9HQww=
-SIZE (openfire_src_4_2_3.tar.gz) = 113557155
+SHA256 (openfire_4_6_7.tar.gz) = ayunxJdtvTYkkmmkU+sXbXGh5/gFdZUc3Rc9DsQkcFY=
+SIZE (openfire_4_6_7.tar.gz) = 48681460
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/openfire/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST   1 Oct 2018 20:08:53 -   1.12
+++ pkg/PLIST   19 Jan 2022 17:47:22 -
@@ -13,20 +13,116 @@ openfire/
 @owner
 @group
 openfire/lib/
-openfire/lib/bcpg-jdk15on.jar
-openfire/lib/bcpkix-jdk15on.jar
-openfire/lib/bcprov-jdk15on.jar
-openfire/lib/hsqldb.jar
-openfire/lib/javax.websocket-api.jar
-openfire/lib/jtds.jar
-openfire/lib/log4j.xml
-openfire/lib/mail.jar
-openfire/lib/mysql.jar
-openfire/lib/npn-boot.jar
-openfire/lib/openfire.jar
-openfire/lib/postgres.jar
-openfire/lib/slf4j-log4j12.jar
+openfire/lib/FastInfoset-1.2.16.jar
+openfire/lib/activation-1.1.jar
+openfire/lib/ant-1.10.9.jar
+openfire/lib/ant-launcher-1.10.9.jar
+openfire/lib/apache-el-8.5.54.jar
+openfire/lib/apache-jsp-8.5.54.jar
+openfir

Re: OpenBSD wrapper for Linux/FreeBSD sendfile? (for ZoneMinder)

2021-11-19 Thread Ian Darwin
On Thu, Nov 18, 2021 at 06:04:26PM -0800, Steve Williams wrote:
> Hi,
> 
> I'm trying to compile a Linux/FreeBSD application (zoneminder) under OpenBSD
> 7.0.
> 
> I'm slowly working through it but have gotten stuck at the point where it
> has a dependency on sendfile(2) which OpenBSD doesn't have.

It's generally good to start with a "Is anybody else working on a
ZoneMinder port?"



Re: UPDATE: Pidgin 2.14.8

2021-10-24 Thread Ian Darwin
On Sun, Oct 24, 2021 at 12:09:27AM -0400, Brad Smith wrote:
> Here is an update to Pidgin 2.14.8.

Tested on amd64 & ok by me



Re: [new port] games/wordsearch: Classic word search game that you can play in your terminal

2021-10-15 Thread Ian Darwin
> > Unfortunately I can't replicate this. I tried just now with a freshly
> > installed rxvt-unicode package. Tried both with and without tmux running in
> > urxvt, both worked. Let me know if there's some special setup you have and
> > I'll try to track the problem down.
> > 
> > ~Brian
> 
> I'm not sure what's triggering it, but looking at curs_set(3) doc
> I think ERR should simply be ignored:
> 
>The curs_set routine sets the cursor state is set to invisible, normal,
>or very visible for visibility equal to 0, 1, or 2 respectively.  If
>the terminal supports the visibility requested, the previous cursor
>state is returned; otherwise, ERR is returned.
> 
> This works but I don't know python so there might be a nicer way
> 
>   # Initialize curses
>   try:
> curses.curs_set(2)
>   except:
> 1

Use the keyword "pass" instead of the constant 1. 



Re: sysutils/gource missing a rundep on git

2021-09-21 Thread Ian Darwin
On Tue, Sep 21, 2021 at 01:21:18PM +0100, Stuart Henderson wrote:
> On 2021/09/21 14:12, Stefan Sperling wrote:
> > On Tue, Sep 21, 2021 at 02:04:09PM +0200, Solene Rapenne wrote:
> > > gource package doesn't have a run depend on git which
> > > make it fail on use.
> > > 
> > > $ gource
> > > sh: git: not found
> > > sh: git: not found
> > > gource: failed to generate log file
> > > Try 'gource --help' for more information.
> > > 
> > > following diff make gource working out of the box
> > 
> > The gource README.md file lists the following VCS as supported:
> > Git, Bazaar, Mercurial, SVN, CVS
> > 
> > I would expect that you'd need the corresponding tools for each
> > of these to make use of gource, depending on the repository format?
> 
> yes, for cvs:
> 
> pkg_add cvs2cl
> cvs2cl --chrono --xml
> gource ChangeLog

Git, CVS and SVN are probably needed. Bazaar and Mercurial are not that
commonly used; maybe list them in a package-readme as optional deps? 



devel/adb remove snprintf %n

2021-09-12 Thread Ian Darwin
This leaves one snprintf %n which is inside "#ifdef APPLE" and two
scanf(%n) which are all ignorable.

tests/oks?

Index: Makefile
===
RCS file: /cvs/ports/devel/adb/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile17 Jul 2019 14:49:20 -  1.3
+++ Makefile12 Sep 2021 22:02:59 -
@@ -5,7 +5,7 @@ COMMENT =   Android Debug Bridge
 V =5.1.1_r4
 DISTNAME = adb-${V}
 PKGNAME =  ${DISTNAME:S/_r/./}
-REVISION = 0
+REVISION = 1
 
 GH_ACCOUNT =   android
 GH_PROJECT =   platform_system_core
Index: patches/patch-adb_transport_c
===
RCS file: patches/patch-adb_transport_c
diff -N patches/patch-adb_transport_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-adb_transport_c   12 Sep 2021 22:02:59 -
@@ -0,0 +1,25 @@
+$OpenBSD$
+Add error checking and avoid %n
+
+Index: adb/transport.c
+--- adb/transport.c.orig
 adb/transport.c
+@@ -912,11 +912,17 @@ static void add_qual(char **buf, size_t *buf_size,
+ {
+ size_t len;
+ int prefix_len;
++char tbuf[*buf_size];
+ 
+ if (!buf || !*buf || !buf_size || !*buf_size || !qual || !*qual)
+ return;
+ 
+-len = snprintf(*buf, *buf_size, "%s%n%s", prefix, &prefix_len, qual);
++prefix_len = snprintf(tbuf, *buf_size, "%s", prefix);
++if (prefix_len == -1 || prefix_len > *buf_size)
++ return;
++len = snprintf(*buf, *buf_size, "%s%s", tbuf, qual);
++if (len == -1 || len > *buf_size)
++ return;
+ 
+ if (sanitize_qual) {
+ char *cp;



rm lang/antlr3

2021-08-29 Thread Ian Darwin
Antlr is a compiler generator like yacc but in Java.
This port just installs the Java ARchive (glorified Zip with .class files) in 
/usr/local/share/java.
In modern Java practice almost everybody uses either Maven or Gradle, both of
which will download it anyway. And, it's for an old version (antlr 4.9 is 
current).

OK to rm it?



Re: sysutils/bat

2021-07-27 Thread Ian Darwin
On Tue, Jul 27, 2021 at 10:15:23AM -0600, Theo de Raadt wrote:
> > >> And to think that Rob Pike once wrote a paper "cat -v considered harmful"
> > >> since it added unnecessary functionality to cat, whose only job is
> > >> to catenate files...
> > 
> > > bat is my favorite rust program
> > > 
> > > please continue maintaining it in ports,
> > > i don't want the standup comedy to end
> > 
> > I didn't mean to summon tedu@ regarding the port,
> > quite to the contary, i might even contribute to it!
> > 
> > https://github.com/sharkdp/bat/pull/1756
> 
> I won't use bat until it has an emacs mode.

If 'bat' is 'cat with wings', it's just to prove that pigs can fly. 



Re: sysutils/bat

2021-07-27 Thread Ian Darwin
On Tue, Jul 27, 2021 at 04:47:46PM +0200, Ingo Schwarze wrote:
> > Changes by: st...@cvs.openbsd.org   2021/07/27 05:55:36
> > 
> > Modified files:
> > sysutils/bat   : Makefile 
> > 
> > Log message:
> > set sysutils/bat to ONLY_FOR_ARCHS=${LP64_ARCHS}, one of the 147
> > dependencies (sys-info) has a 32 vs 64 bit issue when checking
> > the number of CPUs online
> 
> Wait, a cat with 147 dependencies?  Looks like it's a rabbit after all!
> At least there can be no doubt that it inhabits a rabbit hole, doesn't it?
> 
> Besides, isn't a program that stops working once your machine has
> more than four billion CPUs utterly useless in the 31st century?
> 
> If it didn't constantly trip up otherwise busy porters, this port
> would be a really good laugh.
> 
> *Looking at the calendar*
> No, it's unlikely to be the Easter bunny.
> We are not that close to Apil 1.

And to think that Rob Pike once wrote a paper "cat -v considered harmful"
since it added unnecessary functionality to cat, whose only job is
to catenate files...



new sysutils/galleon - JBoss Wildfly provisioning tool

2021-05-08 Thread Ian Darwin
JBoss Wildfly is an OK Java EE app server but it is big and it is unruly,
perhaps too much so to tame and put into ports. For one, it insists on
rewriting its config files on every run, and nobody wants a great hulk like
this updating any files in /etc!

Instead, there is a tool that will install JBoss in its own sandbox,
and allow the user to pare it down by not even downloading services
that are not needed.

This is that tool.

Comments or (dare I hope) OKs welcome.

Thx
Ian


galleon.tgz
Description: application/tar-gz


Re: pkg_add can't resolve package - bad major

2020-05-03 Thread Ian Darwin
On Sun, May 03, 2020 at 01:07:40PM +, katzeilla wrote:
> Hi everyone,
> 
> I am using OpenBSD 6.6 and I noticed that pkg_add can't install any new
> package:
> 
> $ doas pkg_add emacs-26.3-no_x11
> 
> quirks-3.185 signed on 2020-04-30T09:14:52Z
> Can't install libxml-2.9.9 because of libraries
> |library iconv.7.0 not found
> | /usr/local/lib/libiconv.so.6.0 (libiconv-1.14p3): bad major


Usual cause, and first thing to check, is using snapshot packages
on a -stable system. All ports development is done on -current
so newly-built ports can usually not be installed on the stable
version due to libraries.



new: CrossFire crossword editor

2020-04-23 Thread Ian Darwin
The guys who make many of the New York Times crosswords use
and recommend this crossword-maker.

Since there is an unrelated crossfire-client in games/,
would it be better to keep the camelcased name CrossFire
(at least for the package and directory names, not the startup script)
instead of lowercasing these?

It works fine on jdk-11, should we make that the dep to encourage
ppl to move along?

OKs or cluebats welcome, thanks.


textproc.crossfire.tgz
Description: application/tar-gz


New: AsciiDoctor, replaces AsciiDoc

2019-11-18 Thread Ian Darwin
A ruby replacement for AsciiDoc that's faster and has some
syntactic improvements. https://asciidoctor.org/

Would like a way to avoid having it installed as asciidoctor26 and having to
symlink it with @exec.  No plan to use the "Make this symlink if you wish"
MESSAGE approach.

If there's not a simpler way then looking for OKs and/or cluesticks.

Thanks.

Port tarball attached and also at https://darwinsys.com/tmp/asciidoctor.tgz


asciidoctor.tgz
Description: application/tar-gz


Re: security/burpsuite MODJAVA_VER

2019-06-03 Thread Ian Darwin

On 6/2/19 10:42 PM, Lawrence Teo wrote:

Thanks. I tried what you suggested:
/usr/local/jdk-11/bin/java -Xms1G -Xmx4G -XX:MaxPermSize=1024M -jar \
  /usr/local/share/java/classes/burpsuite.jar

I got the same result where Firefox showed the Secure Connection Failed
page with error code SSL_ERROR_RX_RECORD_TOO_LONG.

I noticed that the person who posted those -X options in that thread was
using Burp Suite Professional Edition instead of the Community Edition.
According to an Apr 9, 2019 post by Paul Johnston (a Support Center
agent) in that thread:

"The latest versions of Burp Professional have fixes so that Burp
correctly works with the latest Java versions. At the moment there isn't
a Community Edition release with these features."

So it seems like that error is unfortunately related to the Java version
itself.

Do you have other ideas or suggestions on how to overcome this instead
of reverting to jdk 1.8?

No, given that it's a known problem between Burp CE and Java 11, I'd set 
it to 1.8 for the time being.


Thx

Ian




Re: security/burpsuite MODJAVA_VER

2019-06-02 Thread Ian Darwin
On Sat, Jun 01, 2019 at 11:34:30PM -0400, Lawrence Teo wrote:
> Burp Suite Community Edition needs jdk 1.8 to run properly.  Using it
> with jdk 11 will show this message on startup:
> 
> WARNING: An illegal reflective access operation has occurred
> WARNING: Illegal reflective access by burp.uie 
> (file:/usr/local/share/java/classes/burpsuite.jar) to field 
> javax.crypto.JceSecurity.isRestricted
> WARNING: Please consider reporting this to the maintainers of burp.uie
> WARNING: Use --illegal-access=warn to enable warnings of further illegal 
> reflective access operations
> WARNING: All illegal access operations will be denied in a future release

That message is just a warning, appears all over Java land these days, and
is due to Java 9+ enforcing inter-class security more (if a library author
wants to expose classes to introspection by client classes, the library has
to list those classes as 'open' in the library's module info file, in
addition to the previously-required 'public' specification).  These will get
cleaned up over time.

> In addition, attempting to intercept HTTPS will make the browser show an
> error code SSL_ERROR_RX_RECORD_TOO_LONG (I tested with Firefox).
> According to [1], this is due to using the free edition of Burp Suite
> with jdk 11.
> 
> The diff below fixes this by setting MODJAVA_VER to 1.8 which resolves
> both issues.  While here I have also:

Before reverting to a relatively old version of Java, did you try
adding the options shown in the link you cited, e.g -Xms16 -Xms4G 
-XX:MaxPermSize=1024M?
Actually that looks a typo, I suspect it was meant to be -Xms1G -Xmx4G
(these are start and max memory allocation).  I don't have 'burp' installed or 
I'd d try it.



Re: NEW PORT: openbsd-backgrounds

2019-05-28 Thread Ian Darwin
On Tue, May 28, 2019 at 08:17:39AM +0200, Giovanni Bechis wrote:
> On Mon, May 27, 2019 at 10:49:34PM +0200, Marc Espie wrote:
> > Hum, some people are giving me cool pictures,
> > so it's probably impractical to provide a package by now (470M of pics
> > and counting)
> > 
> what if the package will provide just one picture per dev to be able to have 
> a decent size ?
> the other ones will always be on Github.
> 
> > (well, unless we finally get a way to provide ONE single arch-independent
> > package that's not duplicated).


Have the port bundle a list of the files, pick one at random to download (and 
cache locally)
when the script runs? Or download the list at runtime? (Starts to sound a bit
like pkg_add :-))



Re: rm java/jBCrypt

2019-05-13 Thread Ian Darwin
On Mon, May 13, 2019 at 09:05:10PM +0100, Stuart Henderson wrote:
> On 2019/05/13 15:02, Ian Darwin wrote:
> > Another library that people will get from Maven Central instead of
> > installing as a port and then burying in a local classpath directory.
> 
> Please keep that, I use it for some web stuff.

Done.
 
> If you happen to come across any versions that support "new" bcrypt
> ($2b$ prefix) could you let me know please? :)

Will do.



rm java/jBCrypt

2019-05-13 Thread Ian Darwin
Another library that people will get from Maven Central instead of
installing as a port and then burying in a local classpath directory.

Will unhook from parent dir.  Will use Quirks reason 1, not useful to package.

OK to attic-ify?

Index: Makefile
===
RCS file: Makefile
diff -N Makefile
--- Makefile24 Mar 2019 22:24:13 -  1.7
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,34 +0,0 @@
-# $OpenBSD: Makefile,v 1.7 2019/03/24 22:24:13 sthen Exp $
-
-COMMENT=   BCrypt library for Java
-
-DISTNAME=  jBCrypt-0.4
-REVISION=  1
-
-CATEGORIES=security
-
-HOMEPAGE=  http://www.mindrot.org/projects/jBCrypt/
-
-MAINTAINER=Stuart Henderson 
-
-# ISC
-PERMIT_PACKAGE_CDROM=  Yes
-
-MASTER_SITES=  http://www.mindrot.org/files/jBCrypt/
-
-MODULES=   java
-MODJAVA_VER=   1.8+
-MODJAVA_BUILD= ant
-
-# JUnit tests exist but unsure how to handle non-ascii chars
-NO_TEST=   Yes
-
-do-configure:
-   cp ${FILESDIR}/build.xml ${WRKSRC}/
-
-do-install:
-   ${INSTALL_DATA_DIR} ${MODJAVA_JAR_DIR} ${MODJAVA_DOC_DIR}/BCrypt
-   ${INSTALL_DATA} ${WRKSRC}/build/lib/BCrypt.jar ${MODJAVA_JAR_DIR}
-   ${INSTALL_DATA} ${WRKSRC}/{README,LICENSE} ${MODJAVA_DOC_DIR}/BCrypt
-
-.include 
Index: distinfo
===
RCS file: distinfo
diff -N distinfo
--- distinfo6 Feb 2015 14:11:46 -   1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,2 +0,0 @@
-SHA256 (jBCrypt-0.4.tar.gz) = HCDVsdF5+2PZpOspX3DJbinNvbYXMVCDhUAhAhBiMFM=
-SIZE (jBCrypt-0.4.tar.gz) = 15167
Index: files/build.xml
===
RCS file: files/build.xml
diff -N files/build.xml
--- files/build.xml 23 May 2012 15:02:52 -  1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,40 +0,0 @@
-
-
-
-
-  
-
-  
-  
-  
-  
-  
-  
-
-  
-
-
-
-
-
-  
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-  
-
-  
-
-
-
Index: pkg/DESCR
===
RCS file: pkg/DESCR
diff -N pkg/DESCR
--- pkg/DESCR   23 May 2012 15:02:52 -  1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-jBCrypt is a Java implementation of OpenBSD's Blowfish password
-hashing code, compatible with the canonical C implementation of the
-bcrypt algorithm.
-
-This system hashes passwords using a version of Bruce Schneier's
-Blowfish block cipher with modifications designed to raise the cost
-of off-line password cracking and frustrate fast hardware implementation.
-The computation cost of the algorithm is parametised, so it can be
-increased as computers get faster. The intent is to make a compromise
-of a password database less likely to result in an attacker gaining
-knowledge of the plaintext passwords (e.g. using John the Ripper).
Index: pkg/PLIST
===
RCS file: pkg/PLIST
diff -N pkg/PLIST
--- pkg/PLIST   23 May 2012 15:02:52 -  1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,8 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2012/05/23 15:02:52 sthen Exp $
-share/java/
-share/java/classes/
-share/java/classes/BCrypt.jar
-share/java/doc/
-share/java/doc/BCrypt/
-share/java/doc/BCrypt/LICENSE
-share/java/doc/BCrypt/README



UPDATE textproc/idiff

2019-05-12 Thread Ian Darwin
1.0->1.1, more stuff moved into github repo, uses GH_TAG like a good kid.
Man page converted to mandoc.

Index: Makefile
===
RCS file: /cvs/ports/textproc/idiff/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile11 Mar 2013 11:42:42 -  1.20
+++ Makefile12 May 2019 19:27:39 -
@@ -1,12 +1,13 @@
-# $OpenBSD: Makefile,v 1.20 2013/03/11 11:42:42 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2013/01/09 23:24:09 sthen Exp $
 #
 
-COMMENT=   powerful command-line front end to diff
+COMMENT=   command-line front end to diff
 
-DISTNAME=  idiff-1.0
-REVISION=  1
-CATEGORIES=textproc
-MASTER_SITES=  http://www.darwinsys.com/freeware/
+GH_ACCOUNT =   iandarwin
+GH_PROJECT =   idiff
+GH_TAGNAME =   v1.1
+
+CATEGORIES =   textproc
 
 MAINTAINER=    Ian Darwin 
 
Index: distinfo
===
RCS file: /cvs/ports/textproc/idiff/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo9 Jan 2013 23:24:09 -   1.4
+++ distinfo12 May 2019 19:27:39 -
@@ -1,2 +1,2 @@
-SHA256 (idiff-1.0.tar.gz) = HXO7jDLxWOph1vvjwUV2ZKMWw0/bYKLnyCjUIB/GEEs=
-SIZE (idiff-1.0.tar.gz) = 2307
+SHA256 (idiff-1.1.tar.gz) = 7QY/lDPOM3HW2dfocs9wEk6dO+LHR5c3Ute7XhKqyMg=
+SIZE (idiff-1.1.tar.gz) = 4311
Index: patches/patch-idiff_1
===
RCS file: patches/patch-idiff_1
diff -N patches/patch-idiff_1
--- patches/patch-idiff_1   8 Jul 2011 09:52:50 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,83 +0,0 @@
-$OpenBSD: patch-idiff_1,v 1.1 2011/07/08 09:52:50 jasper Exp $
 idiff.1.orig   Fri Jul  8 11:46:48 2011
-+++ idiff.1Fri Jul  8 11:46:48 2011
-@@ -0,0 +1,79 @@
-+.TH IDIFF Local
-+.SH NAME
-+idiff \- interactive diff of two files
-+.SH SYNOPSIS
-+.B idiff
-+file1 file2
-+.SH DESCRIPTION
-+.I Idiff
-+runs
-+.IR diff (1)
-+on the specified files and then
-+presents each chunk of
-+.I diff
-+output and offers the user the option of
-+choosing the ``from'' part or the ``to'' part,
-+or editing the parts.
-+.I Idiff
-+produces the selected pieces in the proper order in a file called
-+.IR idiff.out .
-+.LP
-+After each chunk is presented,
-+.I idiff
-+will prompt the user (with a `? ')
-+for a command.
-+The valid commands are:
-+.TP
-+.B <
-+Take the ``from'' portion of the displayed chunk.
-+This is the portion which
-+was extracted from the first file specified.
-+.TP
-+.B >
-+Take the ``to'' portion of the displayed chunk.
-+This corresponds to that
-+extracted from the second file specified.
-+.TP
-+.B e
-+Invoke an editor on the chunk.
-+The contents of shell variable EDITOR select the editor to be used.
-+The default is
-+.IR /bin/ed .
-+Whatever is written out from
-+.I ed
-+will be placed into the final output.
-+.TP
-+.B q<
-+Take all the rest of the '<' choices automatically.
-+Think of this as ``quit from''.
-+.TP
-+.B q>
-+Take all the rest of the '>' choices automatically.
-+Think of this as ``quit to''.
-+.TP
-+.B !
-+Pass the command buffer to the shell for processing.
-+.LP
-+All code that
-+.I diff
-+considers identical in both input files 
-+is automatically put into the output file.
-+.SH FILES
-+.I idiff.out 
-+\- merged output
-+.SH BUGS
-+It is not possible to pass any options to
-+.I diff
-+through
-+.I idiff.
-+Nor can you use `-' as a filename argument.
-+.SH HISTORY
-+.I Idiff
-+appears in the book
-+.I ``The UNIX Programming Environment''
-+by Brian Kernighan and Rob Pike.
-+.SH SEE ALSO
-+.I sdiff (1)
-+(side-by-side diff), a GNU tool that is included in OpenBSD.
-+.I mgdiff (1),
-+an X11 tool for comparing two files visually.
Index: patches/patch-idiff_c
===
RCS file: patches/patch-idiff_c
diff -N patches/patch-idiff_c
--- patches/patch-idiff_c   8 Jul 2011 09:52:50 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,280 +0,0 @@
-$OpenBSD: patch-idiff_c,v 1.1 2011/07/08 09:52:50 jasper Exp $
 idiff.c.orig   Wed Sep 16 21:58:16 1998
-+++ idiff.cFri Jul  8 11:46:48 2011
-@@ -1,45 +1,109 @@
- /* idiff:  interactive diff */
- 
- #include 
-+#include 
-+#include 
-+#include 
- #include 
--char  *progname;
--#define   HUGE1   /* large number of lines */
-+#include 
-+#include 
-+#include 
-+#include 
- 
--main(argc, argv)
--  int argc;
--  char *argv[];
-+#define HUGE 100L
-+
-+char *progname;   /* for error messages */
-+char *DIFFOUT = "/tmp/idiff.";
-+char *TEMPFILE = "/tmp/idiff.";
-+char *diffout, *tempfile;
-+
-+FILE *efopen(const char *fname, const char *fmode);
-+void onintr(const int signum);
-+void idiff(FILE *f1, FILE *f2, FILE *fin, FILE *fou

bye-bye java/java-getopt

2019-05-10 Thread Ian Darwin
Another library that nobody will use in this location.

Removes from makefile, updates quirks, and removes the port.

OK?

Index: java/Makefile
===
RCS file: /cvs/ports/java/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- java/Makefile   7 May 2019 19:38:46 -   1.13
+++ java/Makefile   10 May 2019 22:56:36 -
@@ -2,7 +2,6 @@
 
  SUBDIR =
  SUBDIR += jBCrypt
- SUBDIR += java-getopt
  SUBDIR += javaPathHelper
  SUBDIR += jlint
  SUBDIR += jna
Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.756
diff -u -p -r1.756 Makefile
--- devel/quirks/Makefile   10 May 2019 12:11:33 -  1.756
+++ devel/quirks/Makefile   10 May 2019 22:56:36 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =  quirks-3.148
+PKGNAME =  quirks-3.149
 PKG_ARCH = *
 MAINTAINER =   Marc Espie 
 
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.774
diff -u -p -r1.774 Quirks.pm
--- devel/quirks/files/Quirks.pm10 May 2019 12:11:33 -  1.774
+++ devel/quirks/files/Quirks.pm10 May 2019 22:56:36 -
@@ -1231,6 +1231,7 @@ my $obsolete_reason = {
'mysql++' => 5,
'mysqlcc' => 3,
'relayd-updateconf' => 6,
+   'java-getopt' => 1,
 };
 
 # reasons for obsolete packages
Index: java/java-getopt/Makefile
===
RCS file: java/java-getopt/Makefile
diff -N java/java-getopt/Makefile
--- java/java-getopt/Makefile   24 Mar 2019 22:24:13 -  1.9
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,30 +0,0 @@
-# $OpenBSD: Makefile,v 1.9 2019/03/24 22:24:13 sthen Exp $
-
-COMMENT=   Java port of GNU getopt family functions
-
-DISTNAME=  java-getopt-1.0.14
-CATEGORIES=devel
-REVISION=  1
-
-HOMEPAGE=  http://www.urbanophile.com/arenn/hacking/download.html
-
-# LGPLv2+
-PERMIT_PACKAGE_CDROM=  Yes
-
-MASTER_SITES=  ${HOMEPAGE:=/../getopt/}
-
-WRKDIST=   ${WRKDIR}
-
-MODULES=   java
-MODJAVA_VER=   1.8+
-MODJAVA_BUILD= ant
-
-post-extract:
-   cp ${WRKSRC}/gnu/getopt/buildx.xml ${WRKSRC}/build.xml
-
-do-install:
-   ${INSTALL_DATA_DIR} ${MODJAVA_JAR_DIR} ${MODJAVA_DOC_DIR}/getopt/
-   ${INSTALL_DATA} ${WRKSRC}/build/lib/gnu.getopt.jar ${MODJAVA_JAR_DIR}
-   cp -r ${WRKSRC}/build/api/* ${MODJAVA_DOC_DIR}/getopt/
-
-.include 
Index: java/java-getopt/distinfo
===
RCS file: java/java-getopt/distinfo
diff -N java/java-getopt/distinfo
--- java/java-getopt/distinfo   27 Sep 2014 17:23:45 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,2 +0,0 @@
-SHA256 (java-getopt-1.0.14.tar.gz) = 
rQ1c0UbWdqOsDvS/aikut/edMtDLTyAvp+PUPctS2Y4=
-SIZE (java-getopt-1.0.14.tar.gz) = 45561
Index: java/java-getopt/pkg/DESCR
===
RCS file: java/java-getopt/pkg/DESCR
diff -N java/java-getopt/pkg/DESCR
--- java/java-getopt/pkg/DESCR  30 Aug 2011 07:16:22 -  1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,4 +0,0 @@
-The GNU Java getopt classes support short and long argument parsing in a
-manner 100% compatible with the version of GNU getopt with a mostly
-compatible programmer's interface as well. Note that this is a port, not
-a new implementation.
Index: java/java-getopt/pkg/PLIST
===
RCS file: java/java-getopt/pkg/PLIST
diff -N java/java-getopt/pkg/PLIST
--- java/java-getopt/pkg/PLIST  21 Apr 2017 13:27:46 -  1.4
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,23 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.4 2017/04/21 13:27:46 kurt Exp $
-share/java/
-share/java/classes/
-share/java/classes/gnu.getopt.jar
-share/java/doc/
-share/java/doc/getopt/
-share/java/doc/getopt/allclasses-frame.html
-share/java/doc/getopt/allclasses-noframe.html
-share/java/doc/getopt/constant-values.html
-share/java/doc/getopt/deprecated-list.html
-share/java/doc/getopt/gnu/
-share/java/doc/getopt/gnu/getopt/
-share/java/doc/getopt/gnu/getopt/Getopt.html
-share/java/doc/getopt/gnu/getopt/LongOpt.html
-share/java/doc/getopt/gnu/getopt/package-frame.html
-share/java/doc/getopt/gnu/getopt/package-summary.html
-share/java/doc/getopt/gnu/getopt/package-tree.html
-share/java/doc/getopt/help-doc.html
-share/java/doc/getopt/index-all.html
-share/java/doc/getopt/index.html
-share/java/doc/getopt/overview-tree.html
-share/java/doc/getopt/package-list
-share/java/doc/getopt/stylesheet.css



rm java/junit

2019-05-07 Thread Ian Darwin
Previously jca@ ok'd the removal. Is this a good way on quirks? OK?

Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.767
diff -u -p -r1.767 Quirks.pm
--- devel/quirks/files/Quirks.pm5 May 2019 23:48:01 -   1.767
+++ devel/quirks/files/Quirks.pm7 May 2019 19:00:27 -
@@ -1225,6 +1225,7 @@ my $obsolete_reason = {
'libkgeomap' => 0,
'piwik' => 1,
'wml' => 5,
+   'junit' => 1,
 };
 
 # reasons for obsolete packages
Index: java/junit/Makefile
===
RCS file: java/junit/Makefile
diff -N java/junit/Makefile
--- java/junit/Makefile 24 Mar 2019 22:24:13 -  1.31
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,43 +0,0 @@
-# $OpenBSD: Makefile,v 1.31 2019/03/24 22:24:13 sthen Exp $
-
-COMMENT=   regression testing utility for use with the Java language
-
-VERSION=   4.9
-DISTNAME=  junit${VERSION}
-REVISION=  3
-PKGNAME=   junit-${VERSION}
-
-CATEGORIES=devel
-
-HOMEPAGE=  http://www.junit.org/
-
-MAINTAINER=Ian Darwin 
-
-# Common Public License - v1.0
-# Commercial distribution defend and indemnify clauses
-PERMIT_PACKAGE_CDROM=  No
-PERMIT_PACKAGE_FTP=Yes
-
-# github is bad for getting reliable distfiles from.
-MASTER_SITES=  https://distfiles.nl/
-EXTRACT_SUFX=  .zip
-
-MODULES=   java
-MODJAVA_VER=   1.8+
-
-NO_BUILD=  Yes
-NO_TEST=   Yes
-
-JAR_DIR=   ${PREFIX}/share/java/classes/junit/
-DOC_DIR=   ${PREFIX}/share/java/junit/
-
-do-install:
-   ${INSTALL_DATA_DIR} ${JAR_DIR} ${DOC_DIR}
-   ${INSTALL_DATA} ${WRKSRC}/README.html ${DOC_DIR}
-   ${INSTALL_DATA} ${WRKSRC}/cpl-v10.html ${DOC_DIR}
-   cp ${WRKSRC}/junit-${VERSION}.jar ${JAR_DIR}/junit.jar
-   cp ${WRKSRC}/junit-${VERSION}-src.jar ${JAR_DIR}/junit-src.jar
-   cp -R ${WRKSRC}/doc ${DOC_DIR}
-   cp -R ${WRKSRC}/javadoc ${DOC_DIR}
-
-.include 
Index: java/junit/distinfo
===
RCS file: java/junit/distinfo
diff -N java/junit/distinfo
--- java/junit/distinfo 18 Jan 2015 03:14:18 -  1.7
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,2 +0,0 @@
-SHA256 (junit4.9.zip) = Fgr+/qnRXbxzAcqydqskUGluFnB1JU8xGwI9Pa0uo7Y=
-SIZE (junit4.9.zip) = 1716127
Index: java/junit/pkg/DESCR
===
RCS file: java/junit/pkg/DESCR
diff -N java/junit/pkg/DESCR
--- java/junit/pkg/DESCR15 Apr 2007 23:08:23 -  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,5 +0,0 @@
-JUnit is a simple framework to write repeatable tests of Java code,
-and the most widely-used unit testing in Java land (and perhaps the world).
-It is an instance of the xUnit architecture for unit testing frameworks.
-It will help you measure your progress, spot unintended side effects,
-and focus your development efforts.
Index: java/junit/pkg/PLIST
===
RCS file: java/junit/pkg/PLIST
diff -N java/junit/pkg/PLIST
--- java/junit/pkg/PLIST6 Sep 2011 16:58:30 -   1.5
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,241 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.5 2011/09/06 16:58:30 jasper Exp $
-share/java/
-share/java/classes/
-share/java/classes/junit/
-share/java/classes/junit/junit-src.jar
-share/java/classes/junit/junit.jar
-share/java/junit/
-share/java/junit/README.html
-share/java/junit/cpl-v10.html
-share/java/junit/doc/
-share/java/junit/doc/ReleaseNotes4.4.html
-share/java/junit/doc/ReleaseNotes4.4.txt
-share/java/junit/doc/ReleaseNotes4.5.txt
-share/java/junit/doc/ReleaseNotes4.6.html
-share/java/junit/doc/ReleaseNotes4.6.txt
-share/java/junit/doc/ReleaseNotes4.7.html
-share/java/junit/doc/ReleaseNotes4.7.txt
-share/java/junit/doc/ReleaseNotes4.8.1.html
-share/java/junit/doc/ReleaseNotes4.8.1.txt
-share/java/junit/doc/ReleaseNotes4.8.2.html
-share/java/junit/doc/ReleaseNotes4.8.2.txt
-share/java/junit/doc/ReleaseNotes4.8.html
-share/java/junit/doc/ReleaseNotes4.8.txt
-share/java/junit/doc/ReleaseNotes4.9.html
-share/java/junit/doc/ReleaseNotes4.9.txt
-share/java/junit/doc/building-junit.txt
-share/java/junit/doc/cookbook/
-share/java/junit/doc/cookbook/cookbook.htm
-share/java/junit/doc/cookbook/logo.gif
-share/java/junit/doc/cookstour/
-share/java/junit/doc/cookstour/Image1.gif
-share/java/junit/doc/cookstour/Image2.gif
-share/java/junit/doc/cookstour/Image3.gif
-share/java/junit/doc/cookstour/Image4.gif
-share/java/junit/doc/cookstour/Image5.gif
-share/java/junit/doc/cookstour/Image6.gif
-share/java/junit/doc/cookstour/Image7.gif
-share/java/junit/doc/cookstour/cookstour.htm
-share/java/junit/doc/faq/
-share/java/junit/doc/faq/faq.htm
-share/java/junit/doc/homepage.html
-share/java/junit/doc/inde

Re: rm lang/jikes, ...

2019-05-01 Thread Ian Darwin

On 5/1/19 11:13 AM, Yozo TODA wrote:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512


jikes, because it's old and unmaintained.

may I be a maintainer?
I got interested in alternative java implementations than OpenJDK.

I want to try to update gnu classpath to 0.99, jamvm to 2.0.0,
add JikesRVM.

You do know that Jikes stopped being developed sometime around Java 5 
(our ports is at 11; latest release is 12^H^H13), right?


But certainly, if you want it, take it, with my blessing. Alternate 
implementations are often fun.




rm lang/jikes, java/junit

2019-04-30 Thread Ian Darwin
I'm going to kill these two next week if nobody objects.

junit, because everybody in Java-land should be using maven or gradle, not 
assembling dependencies with a pair of tweezers

jikes, because it's old and unmaintained.

Anyone who wants them kept automatically becomes maintainer.



Re: Ports tree locked for 6.5 release

2019-04-05 Thread Ian Darwin

On 4/5/19 7:44 AM, Edward Lopez-Acosta wrote:
Is this due to an inefficient process, technical limitation, or other 
reason (lack of manpower doesn't qualify as that seems self inflicted 
by the project)?


This wording is one of several things that led to accusations of 
disrespect. If I said "Are you asking about our process due to your 
terrible reading skills, or because you're too lazy to look on the web 
site, or other reason (not having time to read web pages doesn't qualify 
as it seems self-inflicted by your choices)", would you be inclined to 
answer in a good mood?


That, and the fact that you actually did somehow fail to look on the 
website where there are multiple presentations on the topic, shows a 
disrespect for the developers' time, in having to take the time away 
from development to answer questions that are already answered and/or 
that are common practice in the field (these have both been pointed out 
by others in this thread).




Re: More OCaml ports for /dev/null?

2019-04-02 Thread Ian Darwin
> Adding support to portgen would be ideal ..

Exactly what I was going to say, but Stuart beat me to it. This would be ideal 
for OpenBSD;
hopefully not too non-ideal for upstream.

> Adding something to directly build a package from outside ports
> infrastructure is not so good

Yup. And remember that OpenBSD ports cannot fetch files over the net during bulk
builds, so portgen is the best option, something else that builds a port in
the same manner is next (but why reinvent the thing?).

Installing outside of the ports system would be treated as renegade by the
project and as a pain in the arse for users. I also have a Mac and have to
install crap from Apple store, from brew, from at least one other other
ports system, directly from some vendors, some as .dmg and some as .pkg. 
Updating is such a frickin' mess I have all but given up trying to keep that
system up to date! OBSD is the very best because you can just do pkg_add -vu
and update all third-party software.



Re: ZoneMinder

2017-12-08 Thread Ian Darwin

On 2017-12-08 1:25 PM, Stephen Graf wrote:

Has anyone ever attempted or have interest in porting ZoneMinder?
https://zoneminder.com


There is a start at one in openbsd-wip, under multimedia/zoneminder. 
Feel free to finish it :-)




New: productivity/goobook Use google contacts in Mutt abook + 1 dep

2017-08-30 Thread Ian Darwin
Two ports, goobook and one dependency, let you use your Google contacts
inside Mutt or any other app that uses abook format.

Both are very trivial Python module ports created with portgen.

Since they are so small, tar file contains both net/py-oauth2client and
productivity/py-goobook

OK?


prod.goobook+net.oauth2cli.tgz
Description: application/tar-gz


Re: New: net/wildfly

2017-08-29 Thread Ian Darwin
Ping?

On Mon, Aug 21, 2017 at 03:58:37PM -0400, Ian Darwin wrote:
> On Tue, Aug 15, 2017 at 09:49:24PM -0400, Ian Darwin wrote:
> > Here is a port of Wildfly 10, the Java-based app server formerly known as
> > JBoss AS.
> > 
> > It packages and works.
> > 
> > Like Tomcat it goes through revisions a lot, so there's a v10 subdirectory
> > (v11 is already in beta).
> > 
> > It needs write access to its configuration files in several directories,
> > which is why it's all
> > under /var, with @mode +w for the places that need write access. 
> 
> Improved packaging, now removes cleanly (with -c)
> 
> OK?



net.wildfly.tgz
Description: application/tar-gz


Re: New: net/wildfly

2017-08-21 Thread Ian Darwin
On Tue, Aug 15, 2017 at 09:49:24PM -0400, Ian Darwin wrote:
> Here is a port of Wildfly 10, the Java-based app server formerly known as
> JBoss AS.
> 
> It packages and works.
> 
> Like Tomcat it goes through revisions a lot, so there's a v10 subdirectory
> (v11 is already in beta).
> 
> It needs write access to its configuration files in several directories,
> which is why it's all
> under /var, with @mode +w for the places that need write access. 

Improved packaging, now removes cleanly (with -c)

OK?


net.wildfly.tgz
Description: application/tar-gz


Re: UPADATE: jenkins

2017-07-27 Thread Ian Darwin
On Thu, Jul 27, 2017 at 03:10:33PM +0200, Artur Pędziwilk wrote:
> Pretty much tested with JDK 1.8 amd64 on 6.1 and 6.1-current
> I increased to +MODJAVA_VER = 1.8+

> -VERSION =  1.656
> +VERSION =  2.71
>  MASTER_SITES = http://mirrors.jenkins-ci.org/war/${VERSION}/
>  DIST_SUBDIR =  jenkins-devel
> -REVISION = 4
> +REVISION = 5

Revision comes out when major version is changed; it's our version of a "minor 
minor version #".`

I'll commit on the weekend if nobody beats me to it.

Thanks.



Re: GNU APL interpreter port for OpenBSD

2017-07-19 Thread Ian Darwin
On Wed, Jul 19, 2017 at 03:45:30PM +0200, Giuseppe Cocomazzi wrote:
> I asked one of the distributors (Dyalog) of the APL385 font and he
> kindly addressed me to the page of the original Adrian Smith's font,
> where it is explicitly mentioned that the font is in the public domain:
> 
> http://www.apl385.com/fonts/index.htm
> 
> > The readme for Emacs APL mode, at https://github.com/lokedhs/gnu-apl-mode,
> > suggests to use GNU FreeFont, which is GPL'd. If you can't find 
> > documentation
> > that your other font is PD or otherwise licensable, I'd use their "Free" 
> > Font.
> 
> It seems that GNU FreeFont is already in the port tree, so we have two
> options here: either we add FreeFont as a dependency to the package
> (which is not, technically) or we ship the APL385 font with the package,
> or we preserve the distribution as it is and only add a 'README.openBSD'
> to address the user to further resources, just like Emacs APL mode did.

That's three, actually :-) But given that the 385 font is indeed explicitly PD I
would probably just include it, unless anyone else wants to weigh in?

You should probably mention that the font is PD in the license comment.



Re: GNU APL interpreter port for OpenBSD

2017-07-19 Thread Ian Darwin
> Also, I was wondering whether it is the case to include in the
> package the standard APL font (not part of the original distribution)
> and install it in the default X11 font directory. It would save new
> users a lot of woe, I suppose, since the language uses a non-ASCII
> set of characters and symbols for which a new font is needed. My only
> concern so far is that I have not been able to find any information on
> the license of this font that anyway seems to be in the public domain.

I used APL in a past life and believe me, you need font support.

The readme for Emacs APL mode, at https://github.com/lokedhs/gnu-apl-mode,
suggests to use GNU FreeFont, which is GPL'd. If you can't find documentation
that your other font is PD or otherwise licensable, I'd use their "Free" Font.



Re: Eclipse not working

2016-11-17 Thread Ian Darwin

On 2016-11-17 2:06 AM, Fernando Cruz wrote:

Hi list,

I install the eclipse-sdk-3.2.2p24 package, but when I trying to run
give me the following error ...


Maybe the "use an older JDK" will get you going for a while.

Please understand that Eclipse 3.2 is so ancient that it was recently 
removed altogether from ports in -current.
People who want Eclipse support will have to step up to the plate and 
bring forth a working port of Eclipse Neon
if they want to continue using it on OpenBSD.  Otherwise IntelliJ and/or 
Netbeans may work for you, though I do
realize what a PITA it is to switch both your projects and your fingers 
from one IDE to another.




Re: devel/jenkins - multiple vulnerabilities

2016-04-18 Thread Ian Darwin
On Mon, Apr 18, 2016 at 02:10:56PM +0100, Sevan Janiyan wrote:
> Hello,
> Both the devel & stable releases of Jenkins in ports are vulnerable to
> CVE-2016-0788 through to 0792.

Updated, thanks.



Re: Anybody interested in / working on ZoneMinder?

2016-04-11 Thread Ian Darwin
On Thu, Apr 07, 2016 at 08:12:12AM -0700, Eric Lalonde wrote:
> > Attention turns to ZoneMinder instead. There is a FreeBSD port but it will 
> > take, ahh, some work 
> > to get it going. Anybody already started down this rabbit hole?

> I have a linux zoneminder installation and would love to move it over to 
> openbsd. I can help test at the very least.

Thank. Your mail just arrived now!  

The port compiles and packages but doesn't work yet. It's in openbsd-wip on 
gitub,
which you probably know is a tree parallel to ports, for works in progress. 
Look in multimedia/zoneminder.
I did the initial work and Stu did a major revision, that's what's in WIP at 
the momement.

zonmon-DEVEL-ian $ doas zmu -d /dev/video0 -q -v 
zonmon-DEVEL-ian $ echo $?
210
zonmon-DEVEL-ian $ doas zmu -d /dev/NOSUCHVIDEO -q -v
zonmon-DEVEL-ian $ echo $?
210
zonmon-DEVEL-ian $ 

So it doesn't seem to be getting very far yet :-) But maybe it just needs 
someone that knows how to configure it -
do you edit config files or use the php web front-end?
 
At any rate the weekend is over so I'm back to paying work for a while...



Anybody interested in / working on ZoneMinder?

2016-04-06 Thread Ian Darwin
Generally suspicious of the cheapo security camera systems; suspicions 
confirmed after reading 
https://www.pentestpartners.com/blog/pwning-cctv-cameras/


Attention turns to ZoneMinder instead. There is a FreeBSD port but it 
will take, ahh, some work to get it going. Anybody already started down 
this rabbit hole?




Re: [NEW] databases/liquibase

2016-03-13 Thread Ian Darwin



On 2016-03-13 2:45 PM, Adam Wolk wrote:




I like the changes and the port now 'works' on my side.

First impressions are not great:
$ liquibase --changeLogFile=1.json --url="" updateSQL
Unexpected error running Liquibase: java.lang.RuntimeException: Cannot find 
database driver: Driver class was not specified and could not be determined 
from the url ()

$ liquibase --changeLogFile=1.json 
--url="jdbc:mysql://localhost/dbname?useUnicode=true&characterEncoding=UTF-8" 
updateSQL
Unexpected error running Liquibase: java.lang.RuntimeException: Cannot find 
database driver: com.mysql.jdbc.Driver

1.json is the content from 
http://www.liquibase.org/documentation/json_format.html

Is there a way to test this port in a simple way?

In theory,  Java apps can ask for any JDBC driver at any time, and the 
onus is on the user to ensure the driver is on the CLASSPATH.


Since we don't know in advance which driver a user wants to use 
liquibase with, it might make sense to brew up a small batch of ports 
for the various drivers (half a dozen or so common ones) and have ports 
like this just depend on all of them (none of the drivers is 
particularly huge).




Re: NEW: htop 2.0.0

2016-02-11 Thread Ian Darwin



On 2016-02-11 8:16 PM, Pedro de Oliveira wrote:

Hi,

Attached is a new port for sysutils/htop.The new 2.0.0 release now
supports OpenBSD.
It's my first port, so be easy!

Any comments? OK to import?



Again, http://marc.info/?l=openbsd-ports&m=145460329517278&w=2



Re: [maintainer update] update to Openfire 4.0.0

2016-01-18 Thread Ian Darwin



On 2016-01-16 12:30 PM, Marc Peters wrote:

Hi list,

here's an update to Openfire 4.0.0. The changelog can be found here:
http://www.igniterealtime.org/builds/openfire/docs/latest/changelog.html

Attached as patch to avoid mangling.

Openfire pulls now jdk-1.8 and dependencies.

Tested on amd64. Comments/OKs?



Installed cleanly, lightly tested and ok.



Re: Eclipse on OpenBSD 5.7 java.lang.UnsatisfiedLinkError

2015-09-18 Thread Ian Darwin

On 2015-09-18 13:25, Alan Corey wrote:

If you're trying to do Android development, Android Studio I think is
the only officially supported development environment, but it's just
written in Java so it might be portable.
It is a repacking of IntelliJ IDea with the new Android plugin. IntelliJ 
is indeed mostly in Java

but does have some binary components (it's in ports).

As Stuart Henderson pointed
out to me though Android is actually a Linux kernel running in
Google's userland muck so running it under OpenBSD may be tricky.

You wouldn't be running Android apps directly, you'd be running them
in the Android emulator, which was (and still may be) a fork of qemu, so 
it might

be possible to make the emulator run on OpenBSD.



Fwd: Update: trivial update devel/maven 3.2.3->3.3.1

2015-07-27 Thread Ian Darwin


Ping.

Slightly updated (1.7+ as 1.6 is dead; delete .cmd files as well as .bat),
portcheck warning fixed. Been using for a couple months.

 Forwarded Message 
Subject:Update: trivial update devel/maven 3.2.3->3.3.1
Date:   Wed, 29 Apr 2015 11:36:39 -0400 (EDT)
From:   Ian Darwin 
To: ports@openbsd.org



3.3.1 introduces a brave new world of hooks for providing configuration files
in formats other than XML (finally).
[And better support for JDK 1.8 which we now have].

OK?


Index: Makefile
===
RCS file: /cvs/ports/devel/maven/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile8 May 2015 09:08:45 -   1.25
+++ Makefile28 Jul 2015 02:34:09 -
@@ -2,7 +2,7 @@
 
 COMMENT=	software project management and comprehension tool
 
-V=		3.2.3

+V= 3.3.1
 DISTNAME=  apache-maven-$V
 PKGNAME=   ${DISTNAME:S/apache-//}
 CATEGORIES=devel
@@ -19,7 +19,7 @@ MASTER_SITES= ${MASTER_SITE_APACHE:=mave
 EXTRACT_SUFX=  -bin.tar.gz
 
 MODULES=	java

-MODJAVA_VER=   1.6+
+MODJAVA_VER=   1.7+
 RUN_DEPENDS=   java/javaPathHelper
 
 NO_BUILD=	Yes

@@ -36,7 +36,8 @@ do-install:
cd ${WRKDIST} && \
tar -cf - bin boot lib `find * -prune -type f` | \
tar -C ${PREFIX}/maven -xf -
-   find ${WRKINST} -name \*.orig -or -name \*.bat -or -name \*.exe | \
+   find ${WRKINST} \
+   -name \*.orig -o -name \*.bat -o -name \*.cmd -o -name \*.exe | 
\
xargs rm
${INSTALL_DATA_DIR} ${SAMPLEDIR}/logging/
${INSTALL_DATA} ${WRKSRC}/conf/logging/* ${SAMPLEDIR}/logging/
Index: distinfo
===
RCS file: /cvs/ports/devel/maven/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo11 Nov 2014 08:29:59 -  1.6
+++ distinfo28 Jul 2015 02:34:09 -
@@ -1,2 +1,2 @@
-SHA256 (apache-maven-3.2.3-bin.tar.gz) = 
vz8Eqt7jpnFYrr37C0ywIgYzKdRZ0Q/WtLAiI+EKqO0=
-SIZE (apache-maven-3.2.3-bin.tar.gz) = 6956162
+SHA256 (apache-maven-3.3.1-bin.tar.gz) = 
FTVkkAYXIYoSb3jSYD0GDQoV8Z8+wWifwrdpKjwVuao=
+SIZE (apache-maven-3.3.1-bin.tar.gz) = 8059952
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/maven/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST   11 Nov 2014 08:29:59 -  1.7
+++ pkg/PLIST   28 Jul 2015 02:34:09 -
@@ -10,18 +10,20 @@ maven/bin/mvn
 maven/bin/mvnDebug
 maven/bin/mvnyjp
 maven/boot/
-maven/boot/plexus-classworlds-2.5.1.jar
+maven/boot/plexus-classworlds-2.5.2.jar
 maven/conf
 maven/lib/
-maven/lib/aether-api-0.9.0.M2.jar
+maven/lib/aether-api-1.0.2.v20150114.jar
 maven/lib/aether-api.license
-maven/lib/aether-connector-wagon-0.9.0.M2.jar
-maven/lib/aether-connector-wagon.license
-maven/lib/aether-impl-0.9.0.M2.jar
+maven/lib/aether-connector-basic-1.0.2.v20150114.jar
+maven/lib/aether-connector-basic.license
+maven/lib/aether-impl-1.0.2.v20150114.jar
 maven/lib/aether-impl.license
-maven/lib/aether-spi-0.9.0.M2.jar
+maven/lib/aether-spi-1.0.2.v20150114.jar
 maven/lib/aether-spi.license
-maven/lib/aether-util-0.9.0.M2.jar
+maven/lib/aether-transport-wagon-1.0.2.v20150114.jar
+maven/lib/aether-transport-wagon.license
+maven/lib/aether-util-1.0.2.v20150114.jar
 maven/lib/aether-util.license
 maven/lib/aopalliance-1.0.jar
 maven/lib/cdi-api-1.0.jar
@@ -31,54 +33,60 @@ maven/lib/commons-io-2.2.jar
 maven/lib/commons-lang-2.6.jar
 maven/lib/ext/
 maven/lib/ext/README.txt
-maven/lib/guava-14.0.1.jar
+maven/lib/guava-18.0.jar
 maven/lib/javax.inject-1.jar
 maven/lib/jsoup-1.7.2.jar
 maven/lib/jsoup.license
 maven/lib/jsr250-api-1.0.jar
 maven/lib/jsr250-api.license
-maven/lib/maven-aether-provider-3.2.3.jar
+maven/lib/maven-aether-provider-3.3.1.jar
 maven/lib/maven-aether-provider.license
-maven/lib/maven-artifact-3.2.3.jar
+maven/lib/maven-artifact-3.3.1.jar
 maven/lib/maven-artifact.license
-maven/lib/maven-compat-3.2.3.jar
+maven/lib/maven-builder-support-3.3.1.jar
+maven/lib/maven-builder-support.license
+maven/lib/maven-compat-3.3.1.jar
 maven/lib/maven-compat.license
-maven/lib/maven-core-3.2.3.jar
+maven/lib/maven-core-3.3.1.jar
 maven/lib/maven-core.license
-maven/lib/maven-embedder-3.2.3.jar
+maven/lib/maven-embedder-3.3.1.jar
 maven/lib/maven-embedder.license
-maven/lib/maven-model-3.2.3.jar
-maven/lib/maven-model-builder-3.2.3.jar
+maven/lib/maven-model-3.3.1.jar
+maven/lib/maven-model-builder-3.3.1.jar
 maven/lib/maven-model-builder.license
 maven/lib/maven-model.license
-maven/lib/maven-plugin-api-3.2.3.jar
+maven/lib/maven-plugin-api-3.3.1.jar
 maven/lib/maven-plugin-api.license
-maven/lib/maven-repository-metadata-3.2.3.jar
+maven/lib/maven-repository-metadata-3.3.1.jar
 maven/lib/maven-repository-metadata.license
-maven/lib/maven-settings-3.2.3.jar
-maven/lib/maven-settings-builder-3.2.3.jar
+mave

Update: trivial update devel/maven 3.2.3->3.3.1

2015-04-29 Thread Ian Darwin
3.3.1 introduces a brave new world of hooks for providing configuration
in other than XML (finally).

OK?

Index: Makefile
===
RCS file: /cvs/ports/devel/maven/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile11 Nov 2014 08:40:38 -  1.24
+++ Makefile29 Apr 2015 15:24:41 -
@@ -2,7 +2,7 @@
 
 COMMENT=   software project management and comprehension tool
 
-V= 3.2.3
+V= 3.3.1
 DISTNAME=  apache-maven-$V
 PKGNAME=   ${DISTNAME:S/apache-//}
 CATEGORIES=devel
@@ -14,7 +14,6 @@ PERMIT_PACKAGE_CDROM= Yes
 
 MASTER_SITES=  ${MASTER_SITE_APACHE:=maven/maven-3/${V}/binaries/} \
http://archive.apache.org/dist/maven/binaries/
-
 
 EXTRACT_SUFX=  -bin.tar.gz
 
Index: distinfo
===
RCS file: /cvs/ports/devel/maven/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo11 Nov 2014 08:29:59 -  1.6
+++ distinfo29 Apr 2015 15:24:41 -
@@ -1,2 +1,2 @@
-SHA256 (apache-maven-3.2.3-bin.tar.gz) = 
vz8Eqt7jpnFYrr37C0ywIgYzKdRZ0Q/WtLAiI+EKqO0=
-SIZE (apache-maven-3.2.3-bin.tar.gz) = 6956162
+SHA256 (apache-maven-3.3.1-bin.tar.gz) = 
FTVkkAYXIYoSb3jSYD0GDQoV8Z8+wWifwrdpKjwVuao=
+SIZE (apache-maven-3.3.1-bin.tar.gz) = 8059952
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/maven/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST   11 Nov 2014 08:29:59 -  1.7
+++ pkg/PLIST   29 Apr 2015 15:24:41 -
@@ -7,21 +7,25 @@ maven/README.txt
 maven/bin/
 maven/bin/m2.conf
 maven/bin/mvn
+maven/bin/mvn.cmd
 maven/bin/mvnDebug
+maven/bin/mvnDebug.cmd
 maven/bin/mvnyjp
 maven/boot/
-maven/boot/plexus-classworlds-2.5.1.jar
+maven/boot/plexus-classworlds-2.5.2.jar
 maven/conf
 maven/lib/
-maven/lib/aether-api-0.9.0.M2.jar
+maven/lib/aether-api-1.0.2.v20150114.jar
 maven/lib/aether-api.license
-maven/lib/aether-connector-wagon-0.9.0.M2.jar
-maven/lib/aether-connector-wagon.license
-maven/lib/aether-impl-0.9.0.M2.jar
+maven/lib/aether-connector-basic-1.0.2.v20150114.jar
+maven/lib/aether-connector-basic.license
+maven/lib/aether-impl-1.0.2.v20150114.jar
 maven/lib/aether-impl.license
-maven/lib/aether-spi-0.9.0.M2.jar
+maven/lib/aether-spi-1.0.2.v20150114.jar
 maven/lib/aether-spi.license
-maven/lib/aether-util-0.9.0.M2.jar
+maven/lib/aether-transport-wagon-1.0.2.v20150114.jar
+maven/lib/aether-transport-wagon.license
+maven/lib/aether-util-1.0.2.v20150114.jar
 maven/lib/aether-util.license
 maven/lib/aopalliance-1.0.jar
 maven/lib/cdi-api-1.0.jar
@@ -31,54 +35,60 @@ maven/lib/commons-io-2.2.jar
 maven/lib/commons-lang-2.6.jar
 maven/lib/ext/
 maven/lib/ext/README.txt
-maven/lib/guava-14.0.1.jar
+maven/lib/guava-18.0.jar
 maven/lib/javax.inject-1.jar
 maven/lib/jsoup-1.7.2.jar
 maven/lib/jsoup.license
 maven/lib/jsr250-api-1.0.jar
 maven/lib/jsr250-api.license
-maven/lib/maven-aether-provider-3.2.3.jar
+maven/lib/maven-aether-provider-3.3.1.jar
 maven/lib/maven-aether-provider.license
-maven/lib/maven-artifact-3.2.3.jar
+maven/lib/maven-artifact-3.3.1.jar
 maven/lib/maven-artifact.license
-maven/lib/maven-compat-3.2.3.jar
+maven/lib/maven-builder-support-3.3.1.jar
+maven/lib/maven-builder-support.license
+maven/lib/maven-compat-3.3.1.jar
 maven/lib/maven-compat.license
-maven/lib/maven-core-3.2.3.jar
+maven/lib/maven-core-3.3.1.jar
 maven/lib/maven-core.license
-maven/lib/maven-embedder-3.2.3.jar
+maven/lib/maven-embedder-3.3.1.jar
 maven/lib/maven-embedder.license
-maven/lib/maven-model-3.2.3.jar
-maven/lib/maven-model-builder-3.2.3.jar
+maven/lib/maven-model-3.3.1.jar
+maven/lib/maven-model-builder-3.3.1.jar
 maven/lib/maven-model-builder.license
 maven/lib/maven-model.license
-maven/lib/maven-plugin-api-3.2.3.jar
+maven/lib/maven-plugin-api-3.3.1.jar
 maven/lib/maven-plugin-api.license
-maven/lib/maven-repository-metadata-3.2.3.jar
+maven/lib/maven-repository-metadata-3.3.1.jar
 maven/lib/maven-repository-metadata.license
-maven/lib/maven-settings-3.2.3.jar
-maven/lib/maven-settings-builder-3.2.3.jar
+maven/lib/maven-settings-3.3.1.jar
+maven/lib/maven-settings-builder-3.3.1.jar
 maven/lib/maven-settings-builder.license
 maven/lib/maven-settings.license
-maven/lib/org.eclipse.sisu.inject-0.0.0.M5.jar
+maven/lib/org.eclipse.sisu.inject-0.3.0.jar
 maven/lib/org.eclipse.sisu.inject.license
-maven/lib/org.eclipse.sisu.plexus-0.0.0.M5.jar
+maven/lib/org.eclipse.sisu.plexus-0.3.0.jar
 maven/lib/org.eclipse.sisu.plexus.license
 maven/lib/plexus-cipher-1.7.jar
 maven/lib/plexus-cipher.license
 maven/lib/plexus-component-annotations-1.5.5.jar
-maven/lib/plexus-interpolation-1.19.jar
+maven/lib/plexus-interpolation-1.21.jar
 maven/lib/plexus-sec-dispatcher-1.3.jar
 maven/lib/plexus-sec-dispatcher.license
-maven/lib/plexus-utils-3.0.17.jar
-maven/lib/sisu-guice-3.1.3-no_aop.jar
+maven/lib/plexus-utils-

Re: new: net/wildfly

2015-04-29 Thread Ian Darwin

ping?

On 2015-04-03 13:16, Ian Darwin wrote:
Wildfly is a full-stack Java EE network "application server", formerly 
known as JBoss AS.
In addition to HTTP, it supports a variety of protocols including RMI, 
CORBA, JMS, etc.


http://www.darwinsys.com/openbsd/myports/wildfly.tar.gz

It installs in $p/net/wildfly/v8/ because v9 is in Beta already and, 
like Tomcat, people will
want one version or the other for a while. Wildfly is actively 
developed and a continuing

series of versions is expected.

The base product has two versions, standalone and domain, which could 
become flavors
or multi-package down the road. This port only provides the standalone 
version; be nice
to get it in-tree so that support for "domain" could be added if 
anybody needs it.
I've kept the directory structure such that domain could be added 
without moving stuff around.


The port works (running on my test server, soon to be production) ...


Update: now in production
One annoyance is that it gives a de-install warning about a README 
file, because that file is
installed with @sample and pkg_delete says it can't be removed as 
there is no checksum.


Any thoughts, comments, improvements or ... OK's would be appreciated.

Thanks
Ian

P.S. Acks: based in part on our Tomcat port; help from ajacoutot and 
from sthen.






new: net/wildfly

2015-04-03 Thread Ian Darwin
Wildfly is a full-stack Java EE network "application server", formerly 
known as JBoss AS.
In addition to HTTP, it supports a variety of protocols including RMI, 
CORBA, JMS, etc.


http://www.darwinsys.com/openbsd/myports/wildfly.tar.gz

It installs in $p/net/wildfly/v8/ because v9 is in Beta already and, 
like Tomcat, people will
want one version or the other for a while. Wildfly is actively developed 
and a continuing

series of versions is expected.

The base product has two versions, standalone and domain, which could 
become flavors
or multi-package down the road. This port only provides the standalone 
version; be nice
to get it in-tree so that support for "domain" could be added if anybody 
needs it.
I've kept the directory structure such that domain could be added 
without moving stuff around.


The port works (running on my test server, soon to be production) but 
could be improved.
One annoyance is that it gives a de-install warning about a README file, 
because that file is
installed with @sample and pkg_delete says it can't be removed as there 
is no checksum.


Any thoughts, comments, improvements or (not really expected at this 
stage, but wouldn't

say no) OK's would be appreciated.

Thanks
Ian

P.S. Acks: based in part on our Tomcat port; help from ajacoutot and 
from sthen.




Update: telephony/asterisk-openbsd-moh

2014-09-25 Thread Ian Darwin

Index: Makefile
===
RCS file: /cvs/ports/telephony/asterisk-openbsd-moh/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile27 May 2014 21:22:29 -  1.18
+++ Makefile25 Sep 2014 20:56:22 -
@@ -7,10 +7,10 @@ BUILD_DEPENDS =   telephony/asterisk
 
 COMMENT =  add OpenBSD songs to Asterisk music-on-hold
 
-PKGNAME =  asterisk-openbsd-moh-5.5
+PKGNAME =  asterisk-openbsd-moh-5.6
 REL_LIST = 30 31 32 33 34 35 36 37 38 39 \
40 41 42 43 44 45 46 47 48 49 \
-   50 51 52 53 54 55
+   50 51 52 53 54 55 56
 .for release in ${REL_LIST}
 DISTFILES += song${release}.mp3
 .endfor

OK? I won't be able to commit for a couple days...



Re: Anyone working on pandoc?

2014-06-19 Thread Ian Darwin

On 2014-06-19, 9:42 AM, Zé Loff wrote:

Hi all

Has anyone tried / started to port pandoc, or knows of any good reason
not to? I'd like to give it a shot, but I don't want do duplicate
efforts...


Yes, I have it mostly done (a dozen or so new dependencies, of course), 
but it's on hold waiting for the annual churnover of Haskell GHC port.




Update devel/maven 3.0.5 -> 3.1.1

2014-02-05 Thread Ian Darwin
Minor update, adds one directory and config file.

OK?

Index: Makefile
===
RCS file: /cvs/ports/devel/maven/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile11 Mar 2013 10:50:11 -  1.21
+++ Makefile5 Feb 2014 14:52:31 -
@@ -2,11 +2,10 @@
 
 COMMENT=   software project management and comprehension tool
 
-V= 3.0.5
+V= 3.1.1
 DISTNAME=  apache-maven-$V
 PKGNAME=   ${DISTNAME:S/apache-//}
 CATEGORIES=devel
-REVISION=  0
 
 HOMEPAGE=  http://maven.apache.org/
 
@@ -16,7 +15,6 @@ PERMIT_PACKAGE_CDROM= Yes
 MASTER_SITES=  ${MASTER_SITE_APACHE:=maven/maven-3/${V}/binaries/} \
http://archive.apache.org/dist/maven/binaries/
 
-
 EXTRACT_SUFX=  -bin.tar.gz
 
 MODULES=   java
@@ -31,13 +29,14 @@ SAMPLEDIR=  ${PREFIX}/share/examples/mave
 
 do-install:
${INSTALL_DATA_DIR} ${PREFIX}/maven
-   ${INSTALL_DATA_DIR} ${SAMPLEDIR}
+   ${INSTALL_DATA_DIR} ${SAMPLEDIR} ${SAMPLEDIR}/conf 
${SAMPLEDIR}/conf/logging
cd ${WRKDIST} && \
tar -cf - bin boot lib `find * -prune -type f` | \
tar -C ${PREFIX}/maven -xf -
find ${WRKINST} -name \*.orig -or -name \*.bat -or -name \*.exe | \
xargs rm
${INSTALL_DATA} ${WRKSRC}/conf/settings.xml ${SAMPLEDIR}/
+   ${INSTALL_DATA} ${WRKSRC}/conf/logging/simplelogger.properties 
${SAMPLEDIR}/conf/logging/
ln -s ${SYSCONFDIR}/maven ${PREFIX}/maven/conf
@perl -pi -e 's,%%SYSCONFDIR%%,${SYSCONFDIR},' \
${PREFIX}/maven/bin/mvn
Index: distinfo
===
RCS file: /cvs/ports/devel/maven/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo2 Mar 2013 12:33:57 -   1.5
+++ distinfo5 Feb 2014 14:52:31 -
@@ -1,2 +1,2 @@
-SHA256 (apache-maven-3.0.5-bin.tar.gz) = 
2Y12a+klQiKSDB1UHv1GauZQK4KjkWbJDWX/1+o1fdk=
-SIZE (apache-maven-3.0.5-bin.tar.gz) = 5144659
+SHA256 (apache-maven-3.1.1-bin.tar.gz) = 
B37UZkVZkdWrtHSKHQIuLSpU3E1VfHI+y6zchXxh1Rs=
+SIZE (apache-maven-3.1.1-bin.tar.gz) = 5494427
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/maven/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST   6 Mar 2013 13:12:47 -   1.6
+++ pkg/PLIST   5 Feb 2014 14:52:31 -
@@ -1,8 +1,8 @@
 @comment $OpenBSD: PLIST,v 1.5 2013/03/02 12:35:01 jasper Exp $
 bin/mvn
 maven/
-maven/LICENSE.txt
-maven/NOTICE.txt
+maven/LICENSE
+maven/NOTICE
 maven/README.txt
 maven/bin/
 maven/bin/m2.conf
@@ -10,37 +10,58 @@ maven/bin/mvn
 maven/bin/mvnDebug
 maven/bin/mvnyjp
 maven/boot/
-maven/boot/plexus-classworlds-2.4.jar
-maven/conf
+maven/boot/plexus-classworlds-2.5.1.jar
+maven/conf/
+maven/conf/logging/
 maven/lib/
-maven/lib/aether-api-1.13.1.jar
-maven/lib/aether-connector-wagon-1.13.1.jar
-maven/lib/aether-impl-1.13.1.jar
-maven/lib/aether-spi-1.13.1.jar
-maven/lib/aether-util-1.13.1.jar
+maven/lib/aether-api-0.9.0.M2.jar
+maven/lib/aether-api.license
+maven/lib/aether-connector-wagon-0.9.0.M2.jar
+maven/lib/aether-connector-wagon.license
+maven/lib/aether-impl-0.9.0.M2.jar
+maven/lib/aether-impl.license
+maven/lib/aether-spi-0.9.0.M2.jar
+maven/lib/aether-spi.license
+maven/lib/aether-util-0.9.0.M2.jar
+maven/lib/aether-util.license
+maven/lib/aopalliance-1.0.jar
+maven/lib/cdi-api-1.0.jar
+maven/lib/cdi-api.license
 maven/lib/commons-cli-1.2.jar
 maven/lib/ext/
 maven/lib/ext/README.txt
-maven/lib/maven-aether-provider-3.0.5.jar
-maven/lib/maven-artifact-3.0.5.jar
-maven/lib/maven-compat-3.0.5.jar
-maven/lib/maven-core-3.0.5.jar
-maven/lib/maven-embedder-3.0.5.jar
-maven/lib/maven-model-3.0.5.jar
-maven/lib/maven-model-builder-3.0.5.jar
-maven/lib/maven-plugin-api-3.0.5.jar
-maven/lib/maven-repository-metadata-3.0.5.jar
-maven/lib/maven-settings-3.0.5.jar
-maven/lib/maven-settings-builder-3.0.5.jar
+maven/lib/guava-11.0.2.jar
+maven/lib/javax.inject-1.jar
+maven/lib/jsr250-api-1.0.jar
+maven/lib/jsr250-api.license
+maven/lib/jsr305-1.3.9.jar
+maven/lib/maven-aether-provider-3.1.1.jar
+maven/lib/maven-artifact-3.1.1.jar
+maven/lib/maven-compat-3.1.1.jar
+maven/lib/maven-core-3.1.1.jar
+maven/lib/maven-embedder-3.1.1.jar
+maven/lib/maven-model-3.1.1.jar
+maven/lib/maven-model-builder-3.1.1.jar
+maven/lib/maven-plugin-api-3.1.1.jar
+maven/lib/maven-repository-metadata-3.1.1.jar
+maven/lib/maven-settings-3.1.1.jar
+maven/lib/maven-settings-builder-3.1.1.jar
+maven/lib/org.eclipse.sisu.inject-0.0.0.M5.jar
+maven/lib/org.eclipse.sisu.inject.license
+maven/lib/org.eclipse.sisu.plexus-0.0.0.M5.jar
+maven/lib/org.eclipse.sisu.plexus.license
 maven/lib/plexus-cipher-1.7.jar
+maven/lib/plexus-cipher.license
 maven/lib/plexus-component-annotations-1.5.5.jar
-maven/lib/plexus-interpolation-1.14.jar
+maven/lib/plexus-interpolation-1.19.jar
 maven/lib/plexus-

Re: Update devel/intellij

2014-01-24 Thread Ian Darwin
On Sat, Jan 25, 2014 at 12:18:14AM +0400, Vadim Zhukov wrote:
> 2014/1/24 Ian Darwin :
> > Somewhat overdue, no official maintainer ATM. Upgrade from 9.x to
> > 12.x.  Regen PLIST shows this adds lots of plugins (they finally
> > stopped mooching off Eclipse for their Java compiler :-)).
> >
> > Didn't upgrade to 13.x yet b/c it comes with a bunch of binary .so's
> > for other platforms and I didn't have time to evaluate how important
> > they are. Like to get this in now, worry about 13 later. OK?
> 
> Ian, could you please, take a look at this, too? I don't use IDEA for
> now and thus I forgot about this update.
> 
> http://marc.info/?l=openbsd-ports&m=138228998608804&w=2

Heh, yours is better. If you use my BUILD variable or similar, then
it has my OK (I hate getting part way through a Makefile and finding
some completely random build number pulled out of the darkness and
stuck into a directory path like that).



Update devel/intellij

2014-01-24 Thread Ian Darwin
Somewhat overdue, no official maintainer ATM. Upgrade from 9.x to
12.x.  Regen PLIST shows this adds lots of plugins (they finally
stopped mooching off Eclipse for their Java compiler :-)).

Didn't upgrade to 13.x yet b/c it comes with a bunch of binary .so's
for other platforms and I didn't have time to evaluate how important
they are. Like to get this in now, worry about 13 later. OK?

Index: devel/intellij/Makefile
===
RCS file: /cvs/ports/devel/intellij/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- devel/intellij/Makefile 11 Mar 2013 10:50:09 -  1.17
+++ devel/intellij/Makefile 24 Jan 2014 19:40:28 -
@@ -4,12 +4,13 @@ SHARED_ONLY=  Yes
 
 COMMENT=   IntelliJ Java IDE
 
-V= 9.0.4
+V= 12.1.6
+BUILD= 129.1359
 DISTNAME=  ideaIC-${V}
 PKGNAME=   intellij-${V}
 CATEGORIES=devel
-
-REVISION=  3
+WRKDIST=   ${WRKDIR}/idea-IC-${BUILD}
+IJ=${PREFIX}/intellij
 
 HOMEPAGE=  http://www.jetbrains.com/idea/
 
@@ -19,7 +20,7 @@ PERMIT_PACKAGE_CDROM= Yes
 MASTER_SITES=  http://download.jetbrains.com/idea/
 
 MODULES=   java
-MODJAVA_VER=   1.6
+MODJAVA_VER=   1.7
 
 BUILD_DEPENDS= ${MODJAVA_RUN_DEPENDS}
 
@@ -28,10 +29,6 @@ RUN_DEPENDS= devel/desktop-file-utils
 NO_TEST=   Yes
 
 SUBST_VARS+=   JAVA_HOME
-
-WRKDIST=   ${WRKDIR}/idea-IC-95.627
-IJ=${PREFIX}/intellij
-
 # If NO_BUILD is set, JAVA_HOME doesn't get defined. So do
 # a no-op for do-build.
 do-build:
Index: devel/intellij/distinfo
===
RCS file: /cvs/ports/devel/intellij/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- devel/intellij/distinfo 22 Nov 2010 14:07:54 -  1.4
+++ devel/intellij/distinfo 24 Jan 2014 19:40:28 -
@@ -1,5 +1,2 @@
-MD5 (ideaIC-9.0.4.tar.gz) = ZG26DKNGI5/clvHBCmiLyQ==
-RMD160 (ideaIC-9.0.4.tar.gz) = /pw2ToJpb7yeIrfcOKk3DCfq7l0=
-SHA1 (ideaIC-9.0.4.tar.gz) = UrN7jy9ekA3EngEID7UOswIWynE=
-SHA256 (ideaIC-9.0.4.tar.gz) = Uf1TxmrdTCd6bsqmJkjitzPpwAWetALPGAtpwBVORAQ=
-SIZE (ideaIC-9.0.4.tar.gz) = 70686036
+SHA256 (ideaIC-13.tar.gz) = XNiLjv/F5OVdmZ3xzsb1TFO1rfC4jklACzoYW+99sTo=
+SIZE (ideaIC-13.tar.gz) = 164640124
Index: devel/intellij/pkg/PLIST
===
RCS file: /cvs/ports/devel/intellij/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- devel/intellij/pkg/PLIST10 Nov 2010 07:58:59 -  1.5
+++ devel/intellij/pkg/PLIST24 Jan 2014 19:40:28 -
@@ -1,15 +1,19 @@
-@comment $OpenBSD: PLIST,v 1.4 2010/07/24 22:12:53 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.5 2010/11/10 07:58:59 jasper Exp $
 bin/idea
 bin/intellij
 intellij/
+intellij/Install-Linux-tar.txt
 intellij/LICENSE.txt
 intellij/bin/
 intellij/bin/appletviewer.policy
+intellij/bin/fsnotifier
+intellij/bin/fsnotifier64
+intellij/bin/idea.png
 intellij/bin/idea.properties
 intellij/bin/idea.sh
 intellij/bin/idea.vmoptions
+intellij/bin/idea64.vmoptions
 intellij/bin/inspect.sh
-intellij/bin/inspect_diff.sh
 intellij/bin/libbreakgen.so
 intellij/bin/libbreakgen64.so
 intellij/bin/log.xml
@@ -21,9 +25,6 @@ intellij/lib/ant/
 intellij/lib/ant/INSTALL
 intellij/lib/ant/KEYS
 intellij/lib/ant/LICENSE
-intellij/lib/ant/LICENSE.dom
-intellij/lib/ant/LICENSE.sax
-intellij/lib/ant/LICENSE.xerces
 intellij/lib/ant/NOTICE
 intellij/lib/ant/README
 intellij/lib/ant/WHATSNEW
@@ -33,120 +34,178 @@ intellij/lib/ant/get-m2.xml
 intellij/lib/ant/lib/
 intellij/lib/ant/lib/README
 intellij/lib/ant/lib/ant-antlr.jar
+intellij/lib/ant/lib/ant-antlr.pom
 intellij/lib/ant/lib/ant-apache-bcel.jar
+intellij/lib/ant/lib/ant-apache-bcel.pom
 intellij/lib/ant/lib/ant-apache-bsf.jar
+intellij/lib/ant/lib/ant-apache-bsf.pom
 intellij/lib/ant/lib/ant-apache-log4j.jar
+intellij/lib/ant/lib/ant-apache-log4j.pom
 intellij/lib/ant/lib/ant-apache-oro.jar
+intellij/lib/ant/lib/ant-apache-oro.pom
 intellij/lib/ant/lib/ant-apache-regexp.jar
+intellij/lib/ant/lib/ant-apache-regexp.pom
 intellij/lib/ant/lib/ant-apache-resolver.jar
+intellij/lib/ant/lib/ant-apache-resolver.pom
+intellij/lib/ant/lib/ant-apache-xalan2.jar
+intellij/lib/ant/lib/ant-apache-xalan2.pom
 intellij/lib/ant/lib/ant-commons-logging.jar
+intellij/lib/ant/lib/ant-commons-logging.pom
 intellij/lib/ant/lib/ant-commons-net.jar
+intellij/lib/ant/lib/ant-commons-net.pom
 intellij/lib/ant/lib/ant-jai.jar
+intellij/lib/ant/lib/ant-jai.pom
 intellij/lib/ant/lib/ant-javamail.jar
+intellij/lib/ant/lib/ant-javamail.pom
 intellij/lib/ant/lib/ant-jdepend.jar
+intellij/lib/ant/lib/ant-jdepend.pom
 intellij/lib/ant/lib/ant-jmf.jar
+intellij/lib/ant/lib/ant-jmf.pom
 intellij/lib/ant/lib/ant-jsch.jar
+intellij/lib/ant/lib

Re: JDK 1.6 Broken

2014-01-01 Thread Ian Darwin
> While I have no doubt the port may have been broken for some time, it 
> was working reliably in my particular use case as of the Dec. 7 
> snapshot. (I'm running Apache Solr 4.6.) It was only after I updated to 
> the Dec. 28 snapshot that the breakage manifested itself.
> 
> Following up on your suggestion about GENERIC.MP, I switched to bsd.sp 
> in the belief that this might get the JRE running again. However, it 
> failed in the same way as under the bsd.mp kernel. Do you have any other 
> suggestions to get the JRE limping along? Failing that, I will have to 
> roll back to the Dec. 7 snapshot. A working JRE on this host is 
> imperative for me.
> 
> FWIW, I have submitted a bug report to http://bugreport.sun.com/.

Given that Java 6 has been EOL'd by Oracle for almost a year (Feb 2013,
as announced in Feb 2011), and it's on an operating system they
don't even know about, your bug report will most likely be ignored.
Sorry you wasted time there.

Given the situation with Java 6 being broken, it would probably
make sense to work on correcting/updating apps to work on Java 7.

Java 8 is just around the corner, btw. March 2014.



Re: new: let xmms play mpa/mp4/aac audio

2013-12-14 Thread Ian Darwin
On Sat, Dec 14, 2013 at 09:58:06PM +, Christian Weisgerber wrote:
> Ian Darwin  wrote:
> 
> > Found a plugin that plays all the m4a's I had lying around.
> > Port tarball at http://darwinsys.com/tmp/audio_xmms-mp4-port.tgz
> 
> How does this compare with faad-xmms? ;-)

Meh

(does an rm -r and crawls back under rock)



new: let xmms play mpa/mp4/aac audio

2013-12-11 Thread Ian Darwin
Found a plugin that plays all the m4a's I had lying around.

Port tarball at http://darwinsys.com/tmp/audio_xmms-mp4-port.tgz

Comments/ok?


audio_xmms-mp4-port.tgz
Description: application/tar-gz


java/tanukiwrapper, for timeb.h

2013-12-07 Thread Ian Darwin
ok?

Index: Makefile
===
RCS file: /cvs/ports/java/tanukiwrapper/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile10 Jul 2013 14:40:29 -  1.1.1.1
+++ Makefile7 Dec 2013 19:46:30 -
@@ -7,6 +7,7 @@ COMMENT=Tanuki Java Service Wrapper
 SVN_REV=   1780
 DISTNAME=  wrapper-code-${SVN_REV}-trunk
 PKGNAME=   java-tanukiwrapper-3.5.19.1
+REVISION=  1
 CATEGORIES=java
 
 HOMEPAGE=  http://wrapper.tanukisoftware.com/
Index: patches/patch-src_c_wrapper_h
===
RCS file: patches/patch-src_c_wrapper_h
diff -N patches/patch-src_c_wrapper_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_c_wrapper_h   7 Dec 2013 19:46:30 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- src/c/wrapper.h.orig   Wed Apr 17 01:48:52 2013
 src/c/wrapper.hSat Dec  7 14:45:36 2013
+@@ -52,7 +52,12 @@
+ #define DWORD unsigned long
+ #endif
+ 
+-#include 
++struct timeb {
++  time_t  time;   /* seconds since the Epoch */
++  unsigned short millitm; /* + milliseconds since the Epoch */
++  short   timezone;   /* minutes west of UTC */
++  short   dstflag;/* DST == non-zero */
++};
+ 
+ #include "property.h"
+ 
Index: patches/patch-src_c_wrapper_unix_c
===
RCS file: /cvs/ports/java/tanukiwrapper/patches/patch-src_c_wrapper_unix_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-src_c_wrapper_unix_c
--- patches/patch-src_c_wrapper_unix_c  10 Jul 2013 14:40:29 -  1.1.1.1
+++ patches/patch-src_c_wrapper_unix_c  7 Dec 2013 19:46:30 -
@@ -2,9 +2,17 @@ $OpenBSD: patch-src_c_wrapper_unix_c,v 1
 
 Wrap SI_ASYNCIO like is being done for other signals.
 
 src/c/wrapper_unix.c.orig  Tue Jul  2 14:15:14 2013
-+++ src/c/wrapper_unix.c   Tue Jul  2 14:17:17 2013
-@@ -408,8 +408,10 @@ const TCHAR* getSignalCodeDesc(int code) {
+--- src/c/wrapper_unix.c.orig  Wed Apr 17 01:48:52 2013
 src/c/wrapper_unix.c   Thu Dec  5 18:09:19 2013
+@@ -48,7 +48,6 @@
+ #include 
+ #include 
+ #include 
+-#include 
+ #include 
+ #include 
+ #include 
+@@ -408,8 +407,10 @@ const TCHAR* getSignalCodeDesc(int code) {
  return TEXT("mesq state changed");
  #endif
  



java/tanukiwrapper loses -lcompat: was: Re: Let's get rid of -lcompat

2013-11-29 Thread Ian Darwin
On Fri, Nov 29, 2013 at 04:29:29PM +, Christian Weisgerber wrote:
> > sthen@ has (been) volunteered to find all ports that still require
> > libcompat and will provide a list in the next few days.
> 
> Combining various efforts, this is the list:
> ...
> java/tanukiwrapper

-lcompat is provided by their "OpenBSD" Makefile, but not used: builds and 
packages (on amd64, but not tested) with this patch; OK?

cat /tmp/patch-src_c_Makefile-openbsd-x86-64_gmake
$OpenBSD$
--- src/c/Makefile-openbsd-x86-64.gmake.origFri Nov 29 12:03:51 2013
+++ src/c/Makefile-openbsd-x86-64.gmake Fri Nov 29 12:03:54 2013
@@ -33,7 +33,7 @@ init:
if test ! -d .deps; then mkdir .deps; fi
 
 wrapper: $(wrapper_SOURCE)
-   $(CC) $(wrapper_SOURCE) -lm -lcompat -pthread -o $(BIN)/wrapper
+   $(CC) $(wrapper_SOURCE) -lm -pthread -o $(BIN)/wrapper
 
 libwrapper.so: $(libwrapper_so_OBJECTS)
$(CC) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so



Re: CVS: cvs.openbsd.org: ports

2013-08-11 Thread Ian Darwin
> > Log message:
> > Remove mentions of -kpilot subpackage, and reorder things a bit to
> > be more in line with other stuff in tree.
> >
> > okay laundry@
> 
> It was not a good idea to go washing clothes at the same time as
> committing... Sorry, Landry! :-\

You'll clean up with comments like that.

BTW, speaking of laundry and code, the original "Lint" program was named after
dryer lint when Steve Johnson, its author, was at home and
doing laundry, so the two domains can sometimes mix.



Re: unbreak smtp-vilter

2013-08-09 Thread Ian Darwin
Sharper cluestick from matthew@.

OK now?

Index: Makefile
===
RCS file: /cvs/ports/mail/smtp-vilter/Makefile,v
retrieving revision 1.53
diff -u -p -r1.53 Makefile
--- Makefile9 May 2013 18:47:53 -   1.53
+++ Makefile9 Aug 2013 17:25:11 -
@@ -3,7 +3,7 @@
 COMMENT=   sendmail milter to scan messages for viruses and spam
 
 DISTNAME=  smtp-vilter-1.3.8
-REVISION=  0
+REVISION=  1
 
 CATEGORIES=mail
 
Index: patches/patch-backend_vilter-attachment_Makefile
===
RCS file: patches/patch-backend_vilter-attachment_Makefile
diff -N patches/patch-backend_vilter-attachment_Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-backend_vilter-attachment_Makefile9 Aug 2013 17:25:11 
-
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- backend/vilter-attachment/Makefile.origSat May  4 07:07:11 2013
 backend/vilter-attachment/Makefile Fri Aug  9 12:19:15 2013
+@@ -22,7 +22,7 @@ LIBDIR=  /usr/pkg/lib/smtp-vilter
+ CFLAGS+=  -I/usr/src/gnu/usr.sbin/sendmail/include
+ .endif
+ 
+-LDADD+=   -nostdlib
++LDADD+=   -nodefaultlibs
+ 
+ beforeinstall:
+   -mkdir -p ${DESTDIR}${LIBDIR}
Index: patches/patch-backend_vilter-clamd_Makefile
===
RCS file: patches/patch-backend_vilter-clamd_Makefile
diff -N patches/patch-backend_vilter-clamd_Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-backend_vilter-clamd_Makefile 9 Aug 2013 17:25:11 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- backend/vilter-clamd/Makefile.orig Sat May  4 07:05:12 2013
 backend/vilter-clamd/Makefile  Fri Aug  9 12:19:18 2013
+@@ -22,7 +22,7 @@ LIBDIR=  /usr/pkg/lib/smtp-vilter
+ CFLAGS+=  -I/usr/src/gnu/usr.sbin/sendmail/include
+ .endif
+ 
+-LDADD+=   -nostdlib
++LDADD+=   -nodefaultlibs
+ 
+ beforeinstall:
+   -mkdir -p ${DESTDIR}${LIBDIR}
Index: patches/patch-backend_vilter-icap_Makefile
===
RCS file: patches/patch-backend_vilter-icap_Makefile
diff -N patches/patch-backend_vilter-icap_Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-backend_vilter-icap_Makefile  9 Aug 2013 17:25:11 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- backend/vilter-icap/Makefile.orig  Sat May  4 07:08:28 2013
 backend/vilter-icap/Makefile   Fri Aug  9 12:19:21 2013
+@@ -22,7 +22,7 @@ LIBDIR=  /usr/pkg/lib/smtp-vilter
+ CFLAGS+=  -I/usr/src/gnu/usr.sbin/sendmail/include
+ .endif
+ 
+-LDADD+=   -nostdlib
++LDADD+=   -nodefaultlibs
+ 
+ beforeinstall:
+   -mkdir -p ${DESTDIR}${LIBDIR}
Index: patches/patch-backend_vilter-regex_Makefile
===
RCS file: patches/patch-backend_vilter-regex_Makefile
diff -N patches/patch-backend_vilter-regex_Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-backend_vilter-regex_Makefile 9 Aug 2013 17:25:11 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- backend/vilter-regex/Makefile.orig Sat May  4 07:10:56 2013
 backend/vilter-regex/Makefile  Fri Aug  9 12:19:25 2013
+@@ -22,7 +22,7 @@ LIBDIR=  /usr/pkg/lib/smtp-vilter
+ CFLAGS+=  -I/usr/src/gnu/usr.sbin/sendmail/include
+ .endif
+ 
+-LDADD+=   -nostdlib
++LDADD+=   -nodefaultlibs
+ 
+ beforeinstall:
+   -mkdir -p ${DESTDIR}${LIBDIR}
Index: patches/patch-backend_vilter-spamd_Makefile
===
RCS file: patches/patch-backend_vilter-spamd_Makefile
diff -N patches/patch-backend_vilter-spamd_Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-backend_vilter-spamd_Makefile 9 Aug 2013 17:25:11 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- backend/vilter-spamd/Makefile.orig Sat May  4 07:11:57 2013
 backend/vilter-spamd/Makefile  Fri Aug  9 12:19:29 2013
+@@ -22,7 +22,7 @@ LIBDIR=  /usr/pkg/lib/smtp-vilter
+ CFLAGS+=  -I/usr/src/gnu/usr.sbin/sendmail/include
+ .endif
+ 
+-LDADD+=   -nostdlib
++LDADD+=   -nodefaultlibs
+ 
+ beforeinstall:
+   -mkdir -p ${DESTDIR}${LIBDIR}



unbreak smtp-vilter

2013-08-09 Thread Ian Darwin
On amd64 at least, the current version fails to start with messages
about __guard missing. Correction based on cluebat from matthew@

OK?

Index: Makefile
===
RCS file: /cvs/ports/mail/smtp-vilter/Makefile,v
retrieving revision 1.53
diff -u -p -r1.53 Makefile
--- Makefile9 May 2013 18:47:53 -   1.53
+++ Makefile9 Aug 2013 16:42:23 -
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.53 2013/05/09 18:47:53 jasper Exp $
+# $OpenBSD: Makefile,v 1.52 2013/05/05 17:37:00 jasper Exp $
 
 COMMENT=   sendmail milter to scan messages for viruses and spam
 
 DISTNAME=  smtp-vilter-1.3.8
-REVISION=  0
+REVISION=  1
 
 CATEGORIES=mail
 
Index: patches/patch-backend_vilter-attachment_Makefile
===
RCS file: patches/patch-backend_vilter-attachment_Makefile
diff -N patches/patch-backend_vilter-attachment_Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-backend_vilter-attachment_Makefile9 Aug 2013 16:42:23 
-
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- backend/vilter-attachment/Makefile.origSat May  4 07:07:11 2013
 backend/vilter-attachment/Makefile Fri Aug  9 12:19:15 2013
+@@ -22,7 +22,7 @@ LIBDIR=  /usr/pkg/lib/smtp-vilter
+ CFLAGS+=  -I/usr/src/gnu/usr.sbin/sendmail/include
+ .endif
+ 
+-LDADD+=   -nostdlib
++LDADD+=   --nodefaultlib
+ 
+ beforeinstall:
+   -mkdir -p ${DESTDIR}${LIBDIR}
Index: patches/patch-backend_vilter-clamd_Makefile
===
RCS file: patches/patch-backend_vilter-clamd_Makefile
diff -N patches/patch-backend_vilter-clamd_Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-backend_vilter-clamd_Makefile 9 Aug 2013 16:42:23 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- backend/vilter-clamd/Makefile.orig Sat May  4 07:05:12 2013
 backend/vilter-clamd/Makefile  Fri Aug  9 12:19:18 2013
+@@ -22,7 +22,7 @@ LIBDIR=  /usr/pkg/lib/smtp-vilter
+ CFLAGS+=  -I/usr/src/gnu/usr.sbin/sendmail/include
+ .endif
+ 
+-LDADD+=   -nostdlib
++LDADD+=   --nodefaultlib
+ 
+ beforeinstall:
+   -mkdir -p ${DESTDIR}${LIBDIR}
Index: patches/patch-backend_vilter-icap_Makefile
===
RCS file: patches/patch-backend_vilter-icap_Makefile
diff -N patches/patch-backend_vilter-icap_Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-backend_vilter-icap_Makefile  9 Aug 2013 16:42:23 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- backend/vilter-icap/Makefile.orig  Sat May  4 07:08:28 2013
 backend/vilter-icap/Makefile   Fri Aug  9 12:19:21 2013
+@@ -22,7 +22,7 @@ LIBDIR=  /usr/pkg/lib/smtp-vilter
+ CFLAGS+=  -I/usr/src/gnu/usr.sbin/sendmail/include
+ .endif
+ 
+-LDADD+=   -nostdlib
++LDADD+=   --nodefaultlib
+ 
+ beforeinstall:
+   -mkdir -p ${DESTDIR}${LIBDIR}
Index: patches/patch-backend_vilter-regex_Makefile
===
RCS file: patches/patch-backend_vilter-regex_Makefile
diff -N patches/patch-backend_vilter-regex_Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-backend_vilter-regex_Makefile 9 Aug 2013 16:42:23 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- backend/vilter-regex/Makefile.orig Sat May  4 07:10:56 2013
 backend/vilter-regex/Makefile  Fri Aug  9 12:19:25 2013
+@@ -22,7 +22,7 @@ LIBDIR=  /usr/pkg/lib/smtp-vilter
+ CFLAGS+=  -I/usr/src/gnu/usr.sbin/sendmail/include
+ .endif
+ 
+-LDADD+=   -nostdlib
++LDADD+=   --nodefaultlib
+ 
+ beforeinstall:
+   -mkdir -p ${DESTDIR}${LIBDIR}
Index: patches/patch-backend_vilter-spamd_Makefile
===
RCS file: patches/patch-backend_vilter-spamd_Makefile
diff -N patches/patch-backend_vilter-spamd_Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-backend_vilter-spamd_Makefile 9 Aug 2013 16:42:23 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- backend/vilter-spamd/Makefile.orig Sat May  4 07:11:57 2013
 backend/vilter-spamd/Makefile  Fri Aug  9 12:19:29 2013
+@@ -22,7 +22,7 @@ LIBDIR=  /usr/pkg/lib/smtp-vilter
+ CFLAGS+=  -I/usr/src/gnu/usr.sbin/sendmail/include
+ .endif
+ 
+-LDADD+=   -nostdlib
++LDADD+=   --nodefaultlib
+ 
+ beforeinstall:
+   -mkdir -p ${DESTDIR}${LIBDIR}



fix for rxvt crash under synergy and possibly other wm's

2013-07-06 Thread Ian Darwin
I hit this under synergy; the rxvt window holding a selection is killed 
by an xerror when moving the pointer to a window on another computer.
Patch from FreeBSD ports/98590 amd64 crash inside rxvt_selection_send()

Project appears dead upstream ("new" site last updated 2008).

OK?

Index: Makefile
===
RCS file: /cvs/ports/x11/rxvt/Makefile,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile
--- Makefile21 Mar 2013 08:48:57 -  1.50
+++ Makefile6 Jul 2013 14:46:17 -
@@ -6,7 +6,7 @@ COMMENT-clock=  analog clock for X11 w/ap
 VER=   2.7.10
 DISTNAME=  rxvt-${VER}
 PKGNAME-main=  rxvt-${VER}
-REVISION-main= 8
+REVISION-main= 9
 PKGNAME-clock= rclock-${VER}
 REVISION-clock=2
 CATEGORIES=x11
Index: patches/patch-src_screen_c
===
RCS file: /cvs/ports/x11/rxvt/patches/patch-src_screen_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_screen_c
--- patches/patch-src_screen_c  24 Jan 2006 19:14:18 -  1.1
+++ patches/patch-src_screen_c  6 Jul 2013 14:46:17 -
@@ -6,8 +6,10 @@ window (c1 == 0). The added check preven
 allocated buffer. This seems to also be semantically correct as there is
 no need to extend selection when there is nothing selected on the line.
 
 src/screen.c.orig  Sat Dec 10 18:58:35 2005
-+++ src/screen.c   Sat Dec 10 19:05:48 2005
+Also, bring in FreeBSD patch ports/98590 64-bit crash inside 
rxvt_selection_send()
+
+--- src/screen.c.orig  Sat Jul  6 10:27:22 2013
 src/screen.c   Sat Jul  6 10:28:03 2013
 @@ -3211,9 +3211,9 @@ rxvt_selection_adjust_kanji(rxvt_t *r)
&& IS_MULTI1(r->screen.rend[r1][c1 - 1]))
r->selection.beg.col--;
@@ -20,3 +22,63 @@ no need to extend selection when there i
if (IS_MULTI1(r->screen.rend[r1][c1 - 1])
&& IS_MULTI2(r->screen.rend[r1][c1]))
r->selection.end.col++;
+@@ -3520,6 +3520,7 @@ rxvt_selection_send(rxvt_t *r, const XSelectionRequest
+ Atom32  target_list[3];
+ #endif
+ Atomtarget;
++Atomproperty;
+ XTextProperty   ct;
+ XICCEncodingStyle style;
+ char   *cl[2], dummy[1];
+@@ -3532,6 +3533,15 @@ rxvt_selection_send(rxvt_t *r, const XSelectionRequest
+ ev.target = rq->target;
+ ev.time = rq->time;
+ 
++  /* ICCCM: 2.2. Responsibilities of the Selection Owner   
++   * SelectionRequest:
++   * If the specified property is None , the requestor
++   * an obsolete client. Owners are encouraged
++   * to support these clients by using the specified
++   * target atom as the property name to be used for
++   * the reply.
++   */
++  property = (rq->property == 0) ? rq->target : rq->property;
+ if (rq->target == r->h->xa[XA_TARGETS]) {
+   target_list[0] = (Atom32) r->h->xa[XA_TARGETS];
+   target_list[1] = (Atom32) XA_STRING;
+@@ -3539,7 +3549,7 @@ rxvt_selection_send(rxvt_t *r, const XSelectionRequest
+ #ifdef USE_XIM
+   target_list[3] = (Atom32) r->h->xa[XA_COMPOUND_TEXT];
+ #endif
+-  XChangeProperty(r->Xdisplay, rq->requestor, rq->property, XA_ATOM,
++  XChangeProperty(r->Xdisplay, rq->requestor, property, XA_ATOM,
+   (8 * sizeof(target_list[0])), PropModeReplace,
+   (unsigned char *)target_list,
+   (sizeof(target_list) / sizeof(target_list[0])));
+@@ -3547,10 +3557,10 @@ rxvt_selection_send(rxvt_t *r, const XSelectionRequest
+ } else if (rq->target == r->h->xa[XA_MULTIPLE]) {
+   /* TODO: Handle MULTIPLE */
+ } else if (rq->target == r->h->xa[XA_TIMESTAMP] && r->selection.text) {
+-  XChangeProperty(r->Xdisplay, rq->requestor, rq->property, XA_INTEGER,
+-  (8 * sizeof(Time)), PropModeReplace,
++  XChangeProperty(r->Xdisplay, rq->requestor, property, XA_INTEGER,
++  32, PropModeReplace,
+   (unsigned char *)&r->h->selection_time, 1);
+-  ev.property = rq->property;
++  ev.property = property;
+ } else if (rq->target == XA_STRING
+  || rq->target == r->h->xa[XA_COMPOUND_TEXT]
+  || rq->target == r->h->xa[XA_TEXT]) {
+@@ -3588,10 +3598,10 @@ rxvt_selection_send(rxvt_t *r, const XSelectionRequest
+   ct.value = (unsigned char *)cl[0];
+   ct.nitems = selectlen;
+   }
+-  XChangeProperty(r->Xdisplay, rq->requestor, rq->property,
++  XChangeProperty(r->Xdisplay, rq->requestor, property,
+   target, 8, PropModeReplace,
+   ct.value, (int)ct.nitems);
+-  ev.property = rq->property;
++  ev.property = property;
+ #ifdef USE_XIM
+   if (freect)
+   XFree(ct.value);



Re: jenkins split, devel and stable

2013-05-05 Thread Ian Darwin
Revised to have a single copy of files like DESCR and pkg rc.
Has different PLIST as they are more likely to diverge in future.
Borrowed from ruby-puppet on the advice of jasper@.

OKs now?

Index: Makefile
===
RCS file: /cvs/ports/devel/jenkins/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile9 Apr 2013 13:28:02 -   1.13
+++ Makefile6 May 2013 01:19:56 -
@@ -1,42 +1,7 @@
-# $OpenBSD: Makefile,v 1.13 2013/04/09 13:28:02 jasper Exp $
+# $OpenBSD$
 
-COMMENT =  continuous integration server
+ SUBDIR =
+ SUBDIR += devel
+ SUBDIR += stable
 
-VERSION =  1.510
-DISTNAME = jenkins
-PKGNAME =  jenkins-${VERSION}
-DIST_SUBDIR =  jenkins-${VERSION}
-
-CATEGORIES =   devel
-
-HOMEPAGE = http://jenkins-ci.org/
-
-MAINTAINER =   Ian Darwin 
-
-# Code under MIT license, Artwork under Creative Commons
-PERMIT_PACKAGE_CDROM = Yes
-
-MASTER_SITES = http://mirrors.jenkins-ci.org/war/${VERSION}/
-EXTRACT_ONLY = # empty
-EXTRACT_SUFX = .war
-
-MODULES =  java
-MODJAVA_VER =  1.6+
-MODJAVA_JRE =  yes
-
-RUN_DEPENDS =  java/javaPathHelper
-
-NO_BUILD = Yes
-NO_TEST =  Yes
-
-HOMEDIR =  /var/jenkins
-WARDIR =   ${PREFIX}/share/jenkins
-BINDIR =   ${PREFIX}/bin
-
-SUBST_VARS +=  HOMEDIR
-
-do-install:
-   ${INSTALL_DATA_DIR} ${WARDIR}
-   ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/jenkins.war ${WARDIR}
-
-.include 
+.include 
Index: Makefile.inc
===
RCS file: Makefile.inc
diff -N Makefile.inc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ Makefile.inc6 May 2013 01:19:56 -
@@ -0,0 +1,40 @@
+# $OpenBSD: Makefile,v 1.12 2013/03/11 10:50:09 espie Exp $
+
+COMMENT =  continuous integration server
+
+DISTNAME = jenkins
+EXTRACT_SUFX = .war
+PKGNAME =  jenkins-${VERSION}
+FILESDIR ?=${.CURDIR}/../files
+PKGDIR ?=  ${.CURDIR}/../pkg
+PLIST ?=   ${.CURDIR}/pkg/PLIST
+
+CATEGORIES =   devel
+
+HOMEPAGE = http://jenkins-ci.org/
+
+MAINTAINER =   Ian Darwin 
+
+# Code under MIT license, Artwork under Creative Commons
+PERMIT_PACKAGE_CDROM = Yes
+
+EXTRACT_ONLY = # empty
+
+MODULES =  java
+MODJAVA_VER =  1.6+
+MODJAVA_JRE =  yes
+
+RUN_DEPENDS =  java/javaPathHelper
+
+NO_BUILD = Yes
+NO_TEST =  Yes
+
+HOMEDIR =  /var/jenkins
+WARDIR =   ${PREFIX}/share/jenkins
+BINDIR =   ${PREFIX}/bin
+
+SUBST_VARS +=  HOMEDIR
+
+do-install:
+   ${INSTALL_DATA_DIR} ${WARDIR}
+   ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/jenkins.war ${WARDIR}
Index: distinfo
===
RCS file: distinfo
diff -N distinfo
--- distinfo9 Apr 2013 13:28:02 -   1.5
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,2 +0,0 @@
-SHA256 (jenkins-1.510/jenkins.war) = 
LcG3iRw2urUOWV1nheKgvSI71ufhWKLPovlZP9opd64=
-SIZE (jenkins-1.510/jenkins.war) = 53863729
Index: devel/Makefile
===
RCS file: devel/Makefile
diff -N devel/Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ devel/Makefile  6 May 2013 01:19:56 -
@@ -0,0 +1,8 @@
+# $OpenBSD$
+
+VERSION =  1.514
+MASTER_SITES = http://mirrors.jenkins-ci.org/war/${VERSION}/
+DIST_SUBDIR =  jenkins-devel
+
+.include 
+
Index: devel/distinfo
===
RCS file: devel/distinfo
diff -N devel/distinfo
--- /dev/null   1 Jan 1970 00:00:00 -
+++ devel/distinfo  6 May 2013 01:19:56 -
@@ -0,0 +1,2 @@
+SHA256 (jenkins-devel/jenkins.war) = 
TkKoFVZd9nEXltPzNgriegpHunx0iJV4zjZwM/tpfKM=
+SIZE (jenkins-devel/jenkins.war) = 53880699
Index: stable/Makefile
===
RCS file: stable/Makefile
diff -N stable/Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ stable/Makefile 6 May 2013 01:19:56 -
@@ -0,0 +1,8 @@
+# $OpenBSD$
+
+VERSION =  1.480.3
+MASTER_SITES = http://mirrors.jenkins-ci.org/war-stable/${VERSION}/
+DIST_SUBDIR =  jenkins-stable
+
+.include 
+
Index: stable/distinfo
===
RCS file: stable/distinfo
diff -N stable/distinfo
--- /dev/null   1 Jan 1970 00:00:00 -
+++ stable/distinfo 6 May 2013 01:19:56 -
@@ -0,0 +1,2 @@
+SHA256 (jenkins-stable/jenkins.war) = 
DYvzwEOVG9D6u+dL3g9zfuXOSP/bXSMNFK9rgeL3Qx4=
+SIZE (jenkins-stable/jenkins.war) = 48310563
Index: devel/pkg/PLIST
===
RCS file: devel/pkg

jenkins split: stable and devel

2013-05-01 Thread Ian Darwin
As recently discussed, split suggested by Mark Prins, prompted by
Gonzalo's update for 1.513.

Improvements? OKs? 

Index: Makefile
===
RCS file: /cvs/ports/devel/jenkins/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile9 Apr 2013 13:28:02 -   1.13
+++ Makefile1 May 2013 15:27:28 -
@@ -1,42 +1,7 @@
-# $OpenBSD: Makefile,v 1.13 2013/04/09 13:28:02 jasper Exp $
+# $OpenBSD$
 
-COMMENT =  continuous integration server
+ SUBDIR =
+ SUBDIR += devel
+ SUBDIR += stable
 
-VERSION =  1.510
-DISTNAME = jenkins
-PKGNAME =  jenkins-${VERSION}
-DIST_SUBDIR =  jenkins-${VERSION}
-
-CATEGORIES =   devel
-
-HOMEPAGE = http://jenkins-ci.org/
-
-MAINTAINER =       Ian Darwin 
-
-# Code under MIT license, Artwork under Creative Commons
-PERMIT_PACKAGE_CDROM = Yes
-
-MASTER_SITES = http://mirrors.jenkins-ci.org/war/${VERSION}/
-EXTRACT_ONLY = # empty
-EXTRACT_SUFX = .war
-
-MODULES =  java
-MODJAVA_VER =  1.6+
-MODJAVA_JRE =  yes
-
-RUN_DEPENDS =  java/javaPathHelper
-
-NO_BUILD = Yes
-NO_TEST =  Yes
-
-HOMEDIR =  /var/jenkins
-WARDIR =   ${PREFIX}/share/jenkins
-BINDIR =   ${PREFIX}/bin
-
-SUBST_VARS +=  HOMEDIR
-
-do-install:
-   ${INSTALL_DATA_DIR} ${WARDIR}
-   ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/jenkins.war ${WARDIR}
-
-.include 
+.include 
Index: Makefile.inc
===
RCS file: Makefile.inc
diff -N Makefile.inc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ Makefile.inc1 May 2013 15:27:28 -
@@ -0,0 +1,37 @@
+# $OpenBSD: Makefile,v 1.12 2013/03/11 10:50:09 espie Exp $
+
+COMMENT =  continuous integration server
+
+DISTNAME = jenkins
+EXTRACT_SUFX = .war
+PKGNAME =  jenkins-${VERSION}
+
+CATEGORIES =   devel
+
+HOMEPAGE = http://jenkins-ci.org/
+
+MAINTAINER =       Ian Darwin 
+
+# Code under MIT license, Artwork under Creative Commons
+PERMIT_PACKAGE_CDROM = Yes
+
+EXTRACT_ONLY = # empty
+
+MODULES =  java
+MODJAVA_VER =  1.6+
+MODJAVA_JRE =  yes
+
+RUN_DEPENDS =  java/javaPathHelper
+
+NO_BUILD = Yes
+NO_TEST =  Yes
+
+HOMEDIR =  /var/jenkins
+WARDIR =   ${PREFIX}/share/jenkins
+BINDIR =   ${PREFIX}/bin
+
+SUBST_VARS +=  HOMEDIR
+
+do-install:
+   ${INSTALL_DATA_DIR} ${WARDIR}
+   ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/jenkins.war ${WARDIR}
Index: distinfo
===
RCS file: distinfo
diff -N distinfo
--- distinfo9 Apr 2013 13:28:02 -   1.5
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,2 +0,0 @@
-SHA256 (jenkins-1.510/jenkins.war) = 
LcG3iRw2urUOWV1nheKgvSI71ufhWKLPovlZP9opd64=
-SIZE (jenkins-1.510/jenkins.war) = 53863729
Index: devel/Makefile
===
RCS file: devel/Makefile
diff -N devel/Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ devel/Makefile  1 May 2013 15:27:28 -
@@ -0,0 +1,8 @@
+# $OpenBSD$
+
+VERSION =  1.513
+MASTER_SITES = http://mirrors.jenkins-ci.org/war/${VERSION}/
+DIST_SUBDIR =  jenkins-devel
+
+.include 
+
Index: devel/distinfo
===
RCS file: devel/distinfo
diff -N devel/distinfo
--- /dev/null   1 Jan 1970 00:00:00 -
+++ devel/distinfo  1 May 2013 15:27:28 -
@@ -0,0 +1,2 @@
+SHA256 (jenkins-devel/jenkins.war) = 
TkKoFVZd9nEXltPzNgriegpHunx0iJV4zjZwM/tpfKM=
+SIZE (jenkins-devel/jenkins.war) = 53880699
Index: devel/pkg/DESCR
===
RCS file: devel/pkg/DESCR
diff -N devel/pkg/DESCR
--- /dev/null   1 Jan 1970 00:00:00 -
+++ devel/pkg/DESCR 1 May 2013 15:27:28 -
@@ -0,0 +1,8 @@
+This is the development branch of Jenkins, a community continuation of Hudson,
+the continuous integration (CI) server (for information on CI see
+http://www.martinfowler.com/articles/continuousIntegration.html).
+Written in Java and with a web-based configuration interface, Jenkins
+can be run standalone (contains its own tiny web server) or in any
+standard Java-capable web server or application server.
+But not limited to Java: can test almost anything, particularly
+projects built with Make, Ant, Maven, or similar.
Index: devel/pkg/PLIST
===
RCS file: devel/pkg/PLIST
diff -N devel/pkg/PLIST
--- /dev/null   1 Jan 1970 00:00:00 -
+++ devel/pkg/PLIST 1 May 2013 15:27:28 -
@@ -0,0 +1,14 @@
+@comment $OpenBSD: PLIST,v 1.2 2011/03/26 00:44:53 ian Exp $
+@con

Re: UPDATE: Jenkins-1.513

2013-05-01 Thread Ian Darwin

On 2013-05-01 8:59 AM, Mark Prins wrote:


Not to comment on your or Ian's effort, but jenkins has one or two
releases every week, not sure if you can and want to keep up with this
tempo.

I think it makes sense to just have a port of the Stable / Long Term
Support Release (which is 1.480.3 atm) and has a cycle of one to two
months and has security fixes applied when needed.
Having the experience of running the weekly release on a test site for
about two years I would not run the weekly for any production site.



I will put together a diff for having stable and devel versions of this.



Re: openfire-3.7.0p5

2013-03-19 Thread Ian Darwin
> We dont ? www/tomcat/v6/pkg/tomcat.rc says otherwise, for example..
> dunno which one needs fixing, but a consensus should be reached :)

I sit corrected. Having done it the way I suggested in the past,
I assumed that was how we did it, and it's probably preferable,
but since both ports mentioned in the discussion now embed
absolute paths, I admit to being outvoted.



Re: openfire-3.7.0p5

2013-03-19 Thread Ian Darwin
On Tue, Mar 19, 2013 at 12:08:33PM -0400, mats.soderst...@mail.com wrote:
> In /etc/rc.d/openfire:
> 
> JAVACMD="$(javaPathHelper -c openfire)"
> JAVA_HOME="$(javaPathHelper -h openfire)"
> 
> Need to be:
> 
> JAVACMD="$(/usr/local/bin/javaPathHelper -c openfire)"
> JAVA_HOME="$(/usr/local/bin/javaPathHelper -h openfire)"

No, they don't. You need to add /usr/local/bin to the default path
in login.conf. We don't build absolute paths into scripts. 



Re: CVS: cvs.openbsd.org: ports

2013-02-19 Thread Ian Darwin

On 2013-02-19 12:50 PM, Jasper Lievisse Adriaanse wrote:

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2013/02/19 10:50:44

Modified files:
devel/jenkins  : Makefile distinfo

Log message:
- security update of jenkins to 1.502 which addresses three vulnerabilities,
as described in 
https://wiki.jenkins-ci.org/display/SECURITY/Jenkins+Security+Advisory+2013-02-16

ok aja@
(no response from maintainer as of yet, committing now to make sure it makes 
5.3)


I OK'd it yesterday, but the intertubes in Nunavut are pretty spotty :-)



Re: update: net/GeoIP

2012-07-08 Thread Ian Darwin

On 12-07-08 1:26 PM, Giovanni Bechis wrote:

Bugfix update to 1.4.8.
  Comments ? Ok ?
   Cheers
Giovanni

How about setting HOMEPAGE to http://www.maxmind.com/app/api
instead of just ripping it out?



Re: I really, really hate CUPS

2012-01-27 Thread Ian Darwin
If you can't figure this out on your own, go away, and just use packages.

> KDE4?doesn't need a no-cups flavor. It just needs to have the dependency on
> CUPS removed, and leave it up to the end user whether or not to install CUPS.
> ?
> Isn't CUPS stand-alone?
> ?
> What's all this crap you are COMPILING into everything else from CUPS,
> anyway, that we would need a special flavor just to get rid of it?

For any build dependency:

$Depends works better with $Dependency if it can use the $Dependency
API. For that, the $Dependency header files need to be installed
before $Depends is built.

The packages don't necessarily have to be there at run time, that
is the beauty of our build system: people that USE PACKAGES (yes,
that is a hint) don't have to deal with this stuff. There are no
packages for KDE4 for reasons that have already been explained here.

If you can't live without the bloatware that is KDE4, you'll have
to use a different operating system. Maybe kubuntu would suit your needs.



Re: [UPDATE] scribus 1.4.0 - new stable version

2012-01-06 Thread Ian Darwin
On Thu, Jan 05, 2012 at 10:00:42AM -0500, Jiri B wrote:
> Nobody?
> 
> On Mon, Jan 02, 2012 at 01:04:49PM -0500, Jiri B wrote:
> Hello,
> 
> scribus team finally release new stable version.
> 
> Tested on i386, works OK. Can anybody try to print from scribus?

Tested on amd64, works OK. Prints ok with CUPS but spews an extra
page at the end (probably a page size issue).



Re: [NEW] tomcat-7.0.22

2011-10-30 Thread Ian Darwin
Tested & OK ian@

Thanks



  1   2   3   4   >