CVS commit: pkgsrc/www/kore

["Frederic Cambus" <fcambus%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fcambus
Date:           Wed Sep  9 09:19:35 UTC 2020

Modified Files:
        pkgsrc/www/kore: Makefile distinfo
        pkgsrc/www/kore/patches: patch-Makefile patch-kodev_Makefile
Removed Files:
        pkgsrc/www/kore/patches: patch-src_cli.c patch-src_http.c

Log Message:
kore: update to 4.0.1.

ChangeLog:

This patch release fixes an issue with the accept lock and pulls in a few
patches from NetBSD and OpenBSD ports to make maintainer life a little bit
easier.

Important changes:

- Pull in NetBSD and OpenBSD ports patches
- Only reset accept_avail if we actually grabbed the accept lock
- Fixed building with multiple make jobs if PYTHON=1 was specified

Small changes:

- Added BEERS file
- Fixed a few typos
- Removed lingering x86 seccomp code (Linux)


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/kore/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/kore/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/kore/patches/patch-Makefile \
    pkgsrc/www/kore/patches/patch-kodev_Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/www/kore/patches/patch-src_cli.c \
    pkgsrc/www/kore/patches/patch-src_http.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/kore/Makefile
diff -u pkgsrc/www/kore/Makefile:1.8 pkgsrc/www/kore/Makefile:1.9
--- pkgsrc/www/kore/Makefile:1.8        Tue Sep  1 19:25:00 2020
+++ pkgsrc/www/kore/Makefile    Wed Sep  9 09:19:34 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2020/09/01 19:25:00 fcambus Exp $
+# $NetBSD: Makefile,v 1.9 2020/09/09 09:19:34 fcambus Exp $
 
-DISTNAME=      kore-4.0.0
+DISTNAME=      kore-4.0.1
 CATEGORIES=    www
 MASTER_SITES=  https://kore.io/releases/
 

Index: pkgsrc/www/kore/distinfo
diff -u pkgsrc/www/kore/distinfo:1.3 pkgsrc/www/kore/distinfo:1.4
--- pkgsrc/www/kore/distinfo:1.3        Tue Sep  1 19:25:00 2020
+++ pkgsrc/www/kore/distinfo    Wed Sep  9 09:19:34 2020
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.3 2020/09/01 19:25:00 fcambus Exp $
+$NetBSD: distinfo,v 1.4 2020/09/09 09:19:34 fcambus Exp $
 
-SHA1 (kore-4.0.0.tar.gz) = e141ab0c822670bb12f16444620d4d5dad0e032e
-RMD160 (kore-4.0.0.tar.gz) = 86633d5e576fd627cbf56e7fce18f00aa1b021dc
-SHA512 (kore-4.0.0.tar.gz) = 3890e22a5498ec9e4018609faaf613e386ac3bc93a71b7427e5a9f901c772b5cf7415fb987560b41163e238b362eeb2169abf7511014a3be689d56dd064bbdf8
-Size (kore-4.0.0.tar.gz) = 1064443 bytes
-SHA1 (patch-Makefile) = 5b5ec065b60bca4f84175c77ef08f536f8e3e21c
-SHA1 (patch-kodev_Makefile) = 770a08a92c59a58ebb6f67306489cd2c10a5d190
-SHA1 (patch-src_cli.c) = aa5a2947dc168041d8b87917de76334442bd3738
-SHA1 (patch-src_http.c) = 8f0415e01fda6e95fbd9396a44c444ff3eac696e
+SHA1 (kore-4.0.1.tar.gz) = 0842720f19199ea20c16b37c86df6afd276bd59e
+RMD160 (kore-4.0.1.tar.gz) = 537f1da0b5b409f81319f65201c799644bbca923
+SHA512 (kore-4.0.1.tar.gz) = 61c977bed18ddacd8ad5cc842047483c19d064d3c1ba9f5dafd732410c7acbd6e5c0bdf071ffa8d26da924f710e5a11c05ec3d9370134604995bf7f8351129b9
+Size (kore-4.0.1.tar.gz) = 1063050 bytes
+SHA1 (patch-Makefile) = 83da2bb0dde7f33c53ad16710abcc7c906709e7a
+SHA1 (patch-kodev_Makefile) = c8006dd903e424826453cd6f980e4d3ca455a6ec

Index: pkgsrc/www/kore/patches/patch-Makefile
diff -u pkgsrc/www/kore/patches/patch-Makefile:1.2 pkgsrc/www/kore/patches/patch-Makefile:1.3
--- pkgsrc/www/kore/patches/patch-Makefile:1.2  Tue Sep  1 19:25:00 2020
+++ pkgsrc/www/kore/patches/patch-Makefile      Wed Sep  9 09:19:35 2020
@@ -1,17 +1,9 @@
-$NetBSD: patch-Makefile,v 1.2 2020/09/01 19:25:00 fcambus Exp $
+$NetBSD: patch-Makefile,v 1.3 2020/09/09 09:19:35 fcambus Exp $
 
-Adapt install target for pkgsrc.
+Remove hardcoded optimizations.
 
 --- Makefile.orig      2020-08-26 07:20:35.000000000 +0000
 +++ Makefile
-@@ -1,6 +1,7 @@
- # Kore Makefile
- 
- CC?=cc
-+DESTDIR?=
- PREFIX?=/usr/local
- OBJDIR?=obj
- KORE=kore
 @@ -48,8 +49,6 @@ endif
  
  ifneq ("$(NOOPT)", "")
@@ -21,26 +13,3 @@ Adapt install target for pkgsrc.
  endif
  
  ifneq ("$(NOSENDFILE)", "")
-@@ -184,14 +183,14 @@ $(OBJDIR):
-       @mkdir -p $(OBJDIR)
- 
- install:
--      mkdir -p $(SHARE_DIR)
--      mkdir -p $(INCLUDE_DIR)
--      mkdir -p $(INSTALL_DIR)
--      mkdir -p $(MAN_DIR)/man1
--      install -m 644 share/man/kodev.1 $(MAN_DIR)/man1/kodev.1
--      install -m 555 $(KORE) $(INSTALL_DIR)/$(KORE)
--      install -m 644 kore.features $(SHARE_DIR)/features
--      install -m 644 include/kore/*.h $(INCLUDE_DIR)
-+      mkdir -p $(DESTDIR)$(SHARE_DIR)
-+      mkdir -p $(DESTDIR)$(INCLUDE_DIR)
-+      mkdir -p $(DESTDIR)$(INSTALL_DIR)
-+      mkdir -p $(DESTDIR)$(MAN_DIR)/man1
-+      install -m 644 share/man/kodev.1 $(DESTDIR)$(MAN_DIR)/man1/kodev.1
-+      install -m 555 $(KORE) $(DESTDIR)$(INSTALL_DIR)/$(KORE)
-+      install -m 644 kore.features $(DESTDIR)$(SHARE_DIR)/features
-+      install -m 644 include/kore/*.h $(DESTDIR)$(INCLUDE_DIR)
-       $(MAKE) -C kodev install
- 
- uninstall:
Index: pkgsrc/www/kore/patches/patch-kodev_Makefile
diff -u pkgsrc/www/kore/patches/patch-kodev_Makefile:1.2 pkgsrc/www/kore/patches/patch-kodev_Makefile:1.3
--- pkgsrc/www/kore/patches/patch-kodev_Makefile:1.2    Tue Sep  1 19:25:00 2020
+++ pkgsrc/www/kore/patches/patch-kodev_Makefile        Wed Sep  9 09:19:35 2020
@@ -1,17 +1,9 @@
-$NetBSD: patch-kodev_Makefile,v 1.2 2020/09/01 19:25:00 fcambus Exp $
+$NetBSD: patch-kodev_Makefile,v 1.3 2020/09/09 09:19:35 fcambus Exp $
 
 Adapt install target for pkgsrc.
 
 --- kodev/Makefile.orig        2020-08-26 07:20:35.000000000 +0000
 +++ kodev/Makefile
-@@ -4,6 +4,7 @@ CC?=cc
- PREFIX?=/usr/local
- OBJDIR?=obj
- KODEV=kodev
-+DESTDIR?=
- INSTALL_DIR=$(PREFIX)/bin
- 
- S_SRC=        ../src/cli.c
 @@ -16,8 +17,6 @@ LDFLAGS=-lcrypto
  
  ifneq ("$(NOOPT)", "")
@@ -21,14 +13,3 @@ Adapt install target for pkgsrc.
  endif
  
  ifneq ("$(MINIMAL)", "")
-@@ -42,8 +41,8 @@ $(OBJDIR):
-       @mkdir -p $(OBJDIR)
- 
- install: $(KODEV)
--      mkdir -p $(INSTALL_DIR)
--      install -m 555 $(KODEV) $(INSTALL_DIR)/$(KODEV)
-+      mkdir -p $(DESTDIR)$(INSTALL_DIR)
-+      install -m 555 $(KODEV) $(DESTDIR)$(INSTALL_DIR)/$(KODEV)
- 
- uninstall:
-       rm -f $(INSTALL_DIR)/$(KODEV)