Skip to content

Commit

Permalink
Framework: sync with upstream
Browse files Browse the repository at this point in the history
Taken from: HardenedBSD
  • Loading branch information
fichtner committed Jan 26, 2021
1 parent 45e0639 commit 8effc36
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 16 deletions.
4 changes: 4 additions & 0 deletions MOVED
Original file line number Diff line number Diff line change
Expand Up @@ -16020,3 +16020,7 @@ graphics/qt-avif-image-plugin|graphics/kf5-kimageformats|2021-01-18|Part of kima
archivers/libunrar5|archivers/libunrar6|2021-01-19|Renamed to match current major version of libunrar
devel/electron7|devel/electron9|2021-01-21|EOLed upstream, switch to newer major version
www/riot-web|www/element-web|2021-01-22|Project renamed
sysutils/bareos16-client|sysutils/bareos18-client|2021-01-24|Has expired: Unmaintained, please migrate to a newer version of bareos
sysutils/bareos16-client-static|sysutils/bareos18-client-static|2021-01-24|Has expired: Unmaintained, please migrate to a newer version of bareos
sysutils/bareos16-server|sysutils/bareos18-server|2021-01-24|Has expired: Unmaintained, please migrate to a newer version of bareos
www/bareos16-webui|www/bareos18-webui|2021-01-24|Has expired: Unmaintained, please migrate to a newer version of bareos
33 changes: 17 additions & 16 deletions Tools/scripts/chkversion.pl
Original file line number Diff line number Diff line change
Expand Up @@ -71,22 +71,22 @@
use File::Find;
use Cwd 'abs_path';

my $portsdir = $ENV{PORTSDIR} ? $ENV{PORTSDIR} : '/usr/ports';
my $versiondir = $ENV{VERSIONDIR} ? $ENV{VERSIONDIR} : '/var/db/chkversion';
my $svnblame = $ENV{SVNBLAME} ? 1 : 0;
my $allports = $ENV{ALLPORTS} ? 1 : 0;

my $watchre = $ENV{WATCH_REGEX} ? $ENV{WATCH_REGEX} : '';
my $watchmre = $ENV{WATCHM_REGEX} ? $ENV{WATCHM_REGEX} : '';
my $returnpath = $ENV{RETURNPATH} ? $ENV{RETURNPATH} : '';
my $h_from = $ENV{HEADER_FROM} ? $ENV{HEADER_FROM} : "$ENV{USER}\@$ENV{HOST}";
my $h_replyto = $ENV{HEADER_REPLYTO} ? $ENV{HEADER_REPLYTO} : $h_from;
my $rcpt_watch = $ENV{RCPT_WATCH} ? $ENV{RCPT_WATCH} : '';
my $rcpt_watchm = $ENV{RCPT_WATCHM} ? $ENV{RCPT_WATCHM} : '';
my $rcpt_orig = $ENV{RCPT_ORIGIN} ? $ENV{RCPT_ORIGIN} : '';
my $rcpt_vers = $ENV{RCPT_VERSION} ? $ENV{RCPT_VERSION} : '';
my $cc_author = $ENV{CC_AUTHOR} ? 1 : 0;
my $cc_mntnr = $ENV{CC_MAINTAINER} ? 1 : 0;
my $portsdir = $ENV{PORTSDIR} // '/usr/ports';
my $versiondir = $ENV{VERSIONDIR} // '/var/db/chkversion';
my $svnblame = exists $ENV{SVNBLAME};
my $allports = exists $ENV{ALLPORTS};

my $watchre = $ENV{WATCH_REGEX} // '';
my $watchmre = $ENV{WATCHM_REGEX} // '';
my $returnpath = $ENV{RETURNPATH} // '';
my $h_from = $ENV{HEADER_FROM} // $ENV{USER} . '@' . ($ENV{HOST} // `/bin/hostname`);
my $h_replyto = $ENV{HEADER_REPLYTO} // $h_from;
my $rcpt_watch = $ENV{RCPT_WATCH} // '';
my $rcpt_watchm = $ENV{RCPT_WATCHM} // '';
my $rcpt_orig = $ENV{RCPT_ORIGIN} // '';
my $rcpt_vers = $ENV{RCPT_VERSION} // '';
my $cc_author = exists $ENV{CC_AUTHOR};
my $cc_mntnr = exists $ENV{CC_MAINTAINER};

my $make = '/usr/bin/make';
my $svn = '/usr/local/bin/svn';
Expand Down Expand Up @@ -219,6 +219,7 @@ sub wanted {

my $result = $newversion eq $oldversion ? '=' : readfrom '',
$pkg_version, '-t', $newversion, $oldversion;
$result //= '';

$watched{$origin} = "$version -> $pkgname{$origin}"
if ($watch_re && $result ne '=' && $origin =~ /^(?:$watch_re)$/o);
Expand Down
12 changes: 12 additions & 0 deletions UPDATING
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.

20210124:
AFFECTS: users of net-mgmt/netbox
AUTHOR: [email protected]

The Django templating language (DTL) is no longer supported for export
templates. Please ensure that all export templates use Jinja2 before
upgrading.

Also the support for embedded graphs was completely removed and several
changes to the REST API were made. Please check the changelogs for
further details.

20210114:
AFFECTS: users of net-im/matterircd
AUTHOR: [email protected]
Expand Down

0 comments on commit 8effc36

Please sign in to comment.