Commit 2006f37a authored by HardenedBSD Sync Service's avatar HardenedBSD Sync Service
Browse files

Merge branch 'freebsd/main' into hardenedbsd/main

parents 885d3fa8 4787e5c9
# Created by: Brion Moss <brion@queeg.com>
PORTNAME= xtide
PORTVERSION= 2.15.4
PORTVERSION= 2.15.5
CATEGORIES= astro geography
MASTER_SITES= https://flaterco.com/files/xtide/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${DISTNAME_TCD}${EXTRACT_SUFX} \
${DISTNAME_HARM}${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
MAINTAINER= wen@FreeBSD.org
COMMENT= Harmonic tide clock and tide predictor
LICENSE= GPLv3
......
TIMESTAMP = 1644906838
SHA256 (xtide-2.15.4.tar.xz) = 726622969bc94adab52a8e060b21e2a2434d463febd0d6d2920b25a12ca5093c
SIZE (xtide-2.15.4.tar.xz) = 574580
TIMESTAMP = 1656933016
SHA256 (xtide-2.15.5.tar.xz) = b9460dcf167e8d9544dcb34a751516d14a97fc3f4aebc6a8bb5ca5f2710d7164
SIZE (xtide-2.15.5.tar.xz) = 574972
SHA256 (libtcd-2.2.7-r3.tar.xz) = e1dde9aafb771eab57c676a99b4b79d61c6800990a0e72782bc20057a8a2d877
SIZE (libtcd-2.2.7-r3.tar.xz) = 272284
SHA256 (harmonics-dwf-20210110-free.tar.xz) = af4550d36a1a1ca2e8c8b523c7d64b27845cb9dd8685c5fdfa5196b6cefa0c38
......
......@@ -63,7 +63,7 @@ lib/libtcd.so.1.0.2
lib/libxtide.a
lib/libxtide.so
lib/libxtide.so.1
lib/libxtide.so.1.0.4
lib/libxtide.so.1.0.5
man/man1/tide.1.gz
%%X11%%man/man1/xtide.1.gz
man/man8/xttpd.8.gz
......
# Created by: Sergey Skvortsov <skv@protey.ru>
PORTNAME= pgbouncer
PORTVERSION= 1.16.1
PORTVERSION= 1.17.0
CATEGORIES= databases
MASTER_SITES= https://pgbouncer.github.io/downloads/files/${PORTVERSION}/ \
http://pgbouncer.github.io/downloads/files/${PORTVERSION}/
......@@ -13,36 +13,37 @@ LICENSE= BSD2CLAUSE
LIB_DEPENDS= libevent.so:devel/libevent
USES= cpe gmake ssl pkgconfig
USES= cpe gmake pkgconfig ssl
USE_RC_SUBR= pgbouncer
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-evdns \
--with-libevent=${LOCALBASE}
CONFIGURE_ENV+= PTHREAD_LIBS="-lpthread"
PORTSCOUT= site:https://pgbouncer.github.io/downloads/
SUB_FILES= pkg-message
SUB_LIST+= PGBOUNCER_RUNDIR="${PGBOUNCER_RUNDIR}"
USERS= pgbouncer
GROUPS= pgbouncer
USE_RC_SUBR= pgbouncer
GNU_CONFIGURE= yes
PLIST_SUB+= PGBOUNCER_GROUP="${GROUPS}" \
PGBOUNCER_LOGDIR="${PGBOUNCER_LOGDIR}" \
PGBOUNCER_RUNDIR="${PGBOUNCER_RUNDIR}" \
PGBOUNCER_USER="${USERS}"
OPTIONS_DEFINE= CARES
CARES_LIB_DEPENDS= libcares.so:dns/c-ares
CARES_CONFIGURE_WITH= cares
CONFIGURE_ARGS= --with-libevent=${LOCALBASE} --enable-evdns
CONFIGURE_ENV+= PTHREAD_LIBS="-lpthread"
PGBOUNCER_USER?= pgbouncer
PGBOUNCER_GROUP?= pgbouncer
PGBOUNCER_USER?= pgbouncer
PGBOUNCER_RUNDIR?= /var/run/pgbouncer
PGBOUNCER_LOGDIR?= /var/log/pgbouncer
PLIST_SUB+= PGBOUNCER_USER="${USERS}" \
PGBOUNCER_GROUP="${GROUPS}" \
PGBOUNCER_LOGDIR="${PGBOUNCER_LOGDIR}" \
PGBOUNCER_RUNDIR="${PGBOUNCER_RUNDIR}"
SUB_LIST+= PGBOUNCER_RUNDIR="${PGBOUNCER_RUNDIR}"
SUB_FILES= pkg-message
post-patch:
@${REINPLACE_CMD} -e "s|= /etc/pgbouncer/userlist.txt|= ${PREFIX}/etc/pgbouncer.users|g" \
-e "s|= /var/log/pgbouncer/pgbouncer.log|= ${PGBOUNCER_LOGDIR}/pgbouncer.log|g" \
......
TIMESTAMP = 1644839246
SHA256 (pgbouncer-1.16.1.tar.gz) = 087477e9e4766d032b04b7b006c0c8d64160a54141a7bfc2c6e5ae7ae11bf7fc
SIZE (pgbouncer-1.16.1.tar.gz) = 591450
TIMESTAMP = 1656273426
SHA256 (pgbouncer-1.17.0.tar.gz) = 657309b7bc5c7a85cbf70a9a441b535f7824123081eabb7ba86d00349a256e23
SIZE (pgbouncer-1.17.0.tar.gz) = 598294
# Created by: Palle Girgensohn <girgen@FreeBSD.org>
PORTNAME= postgresql
PORTREVISION= 1
PORTREVISION= 0
COMMENT= PostgreSQL database (client)
......
# Created by: Marc G. Fournier <scrappy@FreeBSD.org>
PORTNAME?= postgresql
DISTVERSION?= 15beta1
DISTVERSION?= 15beta2
# PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
# not their own. Probably best to keep it at ?=0 when reset here too.
PORTREVISION?= 1
PORTREVISION?= 0
CATEGORIES?= databases
MASTER_SITES= PGSQL/source/v${DISTVERSION}
PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT}
......
TIMESTAMP = 1652896412
SHA256 (postgresql/postgresql-15beta1.tar.bz2) = 5dd8a466fb0c9eca11f10b1275524fc8f38d1699cac6a689780b49eac878f7af
SIZE (postgresql/postgresql-15beta1.tar.bz2) = 23518203
TIMESTAMP = 1656750071
SHA256 (postgresql/postgresql-15beta2.tar.bz2) = 2fedbc58b370f30e5f59fb0dcc8128a2ef9a922b50fa931b442e4fa27ca98830
SIZE (postgresql/postgresql-15beta2.tar.bz2) = 23511057
......@@ -2,7 +2,7 @@
PORTNAME= carbon
PORTVERSION= 1.1.10
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= databases python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
......
#!/bin/sh
# PROVIDE: carbon
# REQUIRE: LOGIN
# KEYWORD: shutdown
#
......@@ -114,4 +115,3 @@ carbon_stop()
}
run_rc_command "$1"
PORTNAME= got
PORTVERSION= 0.72
PORTREVISION= 1
PORTVERSION= 0.73
CATEGORIES= devel
MASTER_SITES= https://gameoftrees.org/releases/
......
TIMESTAMP = 1655574650
SHA256 (got-0.72.tar.gz) = 8be46f3184ab0abcd4d8be9659e791a6a764e7e00abc320e66bd63b580e303fc
SIZE (got-0.72.tar.gz) = 622448
TIMESTAMP = 1656945056
SHA256 (got-0.73.tar.gz) = 9b2046c6989d914ff93a042df7f5e97f81de7337d3bc8a8e9ef91784c2090c48
SIZE (got-0.73.tar.gz) = 644344
......@@ -17,6 +17,8 @@
#include <stdlib.h>
#include <string.h>
void freezero(void *, size_t);
void
freezero(void *ptr, size_t sz)
{
......
......@@ -21,6 +21,8 @@
#include <string.h>
#include <unistd.h>
void *recallocarray(void *, size_t, size_t, size_t);
/*
* This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX
* if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW
......
--- gotadmin/Makefile.orig 2021-10-04 10:08:55 UTC
--- gotadmin/Makefile.orig 2022-07-03 11:08:45 UTC
+++ gotadmin/Makefile
@@ -24,8 +24,4 @@ DPADD = ${LIBZ} ${LIBUTIL}
@@ -25,8 +25,4 @@ DPADD = ${LIBZ} ${LIBUTIL}
NOMAN = Yes
.endif
......
--- lib/sigs.c.orig 2022-07-04 14:54:12 UTC
+++ lib/sigs.c
@@ -206,7 +206,7 @@ got_tag_write_signed_data(BUF *buf, struct got_tag_obj
got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
got_object_tag_get_tagger_gmtoff(tag));
if (asprintf(&tagger, "%s %lld %s", got_object_tag_get_tagger(tag),
- got_object_tag_get_tagger_time(tag), gmtoff) == -1) {
+ (long long)got_object_tag_get_tagger_time(tag), gmtoff) == -1) {
err = got_error_from_errno("asprintf");
goto done;
}
--- libexec/got-read-pack/got-read-pack.c.orig 2022-06-19 18:47:42 UTC
--- libexec/got-read-pack/got-read-pack.c.orig 2022-07-04 14:48:30 UTC
+++ libexec/got-read-pack/got-read-pack.c
@@ -14,6 +14,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
......@@ -8,7 +8,7 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/queue.h>
@@ -1646,6 +1647,11 @@ main(int argc, char *argv[])
@@ -1917,6 +1918,11 @@ main(int argc, char *argv[])
/* revoke access to most system calls */
if (pledge("stdio recvfd", NULL) == -1) {
err = got_error_from_errno("pledge");
......
--- libexec/got-read-patch/got-read-patch.c.orig 2022-06-19 18:47:42 UTC
--- libexec/got-read-patch/got-read-patch.c.orig 2022-07-04 14:48:30 UTC
+++ libexec/got-read-patch/got-read-patch.c
@@ -35,6 +35,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
......@@ -8,7 +8,7 @@
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/uio.h>
@@ -487,6 +488,11 @@ main(int argc, char **argv)
@@ -578,6 +579,11 @@ main(int argc, char **argv)
/* revoke access to most system calls */
if (pledge("stdio recvfd", NULL) == -1) {
err = got_error_from_errno("pledge");
......
--- regress/cmdline/Makefile.orig 2021-10-04 10:11:31 UTC
--- regress/cmdline/Makefile.orig 2022-05-10 11:21:59 UTC
+++ regress/cmdline/Makefile
@@ -93,4 +93,6 @@ cleanup:
@@ -97,4 +97,6 @@ cleanup:
./cleanup.sh -q -r "$(GOT_TEST_ROOT)"
......
--- regress/cmdline/commit.sh.orig 2022-02-08 10:47:01 UTC
--- regress/cmdline/commit.sh.orig 2022-07-02 13:23:44 UTC
+++ regress/cmdline/commit.sh
@@ -1376,7 +1376,7 @@ test_commit_prepared_logmsg() {
@@ -1380,7 +1380,7 @@ test_commit_prepared_logmsg() {
cat > $testroot/editor.sh <<EOF
#!/bin/sh
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment