Skip to content

Commit

Permalink
Release 22.0 (#23)
Browse files Browse the repository at this point in the history
* updated version string to "21.2-testing"

* #784: removed expired root certificate

 from ca root certificate store: certificate “DST Root CA X3” used by
Lets Encrypt

* daemon:connect: don't use FIPS_mode_set with OpenSSL 3 (#3)

This function has been removed in OpenSSL 3, replaced by
EVP_default_properties_enable_fips. See
https://www.openssl.org/docs/man3.0/man7/migration_guide.html

Co-authored-by: ureyNZB <urey.by@gmail.com>

* Feature windows build fix (#9)

* fix build for windows

code fixes and add regex lib files to project

* vcxproj for all platforms build

#define ZLIB_WINAPI commented due to win32 zlib linking error

* move regex to lib directory

* Add windows build workflow (#11)

* Test windows runner

* Add build-nzbget-vs22.bat. Update nzbget.vcxproj.

* Add build stage on runner

* Add upload artifacts

* Update success exit code

* Update hardcoded windows resource directory

* Update include and lib file paths

* Add version detect from nzbget.vcxproj

* Update branches for build

---------

Co-authored-by: phnzb <139914799+phnzb@users.noreply.github.com>

* Add linux build workflow. Update linux version. Modify rules for build workflows (#12)

* Add linux build workflow

* Update linux version to 22.0

* Update build workflows

* Return back LARGE_OFF_T definition

* Update workflow rules and linux build command

* update version fixes (#19)

UI and web links fixes

Co-authored-by: ureyNZB <yuriy@nzbget.com>

* Changed the progress-block class to use a calculated width of 8.5rem (#17)

Original PR link: nzbget/nzbget#724
Author: @acidDrain

Changed

progress-block class in webui/styles.css

What Changed

Set the width property to a calculate 8.5rem instead of fixed 120px.

/******************

    webui/style.css *
    *****************/
    1117 / BEGIN: Progress bars */
    1118 .progress-block {
    1119 position: relative;

    1120 width: 120px;

    1120 width: calc(8.5rem);
    1121 }
    1122
    1123 .progress {
    1124 margin-bottom: 0px;
    1125 background: #f0f0f0;

Why

Progressbar text in the Downloads view becomes unreadable; text is crammed and overlapping for large files (e.g. 18.42GB)
Validation

I tested using:

Mozilla Firefox 83 (x86_64) - default font settings: 16px

lsb_release -a output

$ lsb_release -a
Distributor ID: Debian
Description: Debian GNU/Linux 10 (buster)
Release: 10
Codename: buster

uname output

$ uname -a | awk '{ for (i=1; i<= NF; i++) if ($i != $2) printf("%s ", $i); print "\n"}'
Linux 5.8.0-0.bpo.2-amd64 #1 SMP Debian 5.8.10-1~bpo10+1 (2020-09-26) x86_64 GNU/Linux

native resolution 3440x1440
Web Developer Tools to simulate mobile (iPhone 8) device in portrait and landscape mode
xrandr --query output

$ xrandr --query
DP-1 connected primary 3440x1440+0+0 (normal left inverted right x axis y axis) 800mm x 335mm

xrdb -query output

$ xrdb -query
Xft.antialias: true
Xft.

autohint: true
Xft.dpi: 120
Xft.hinting: true
Xft.hintstyle: hintslight
Xft.lcdfilter: lcddefault
Xft.rgba: rgba

I did not observe any adverse effects on the surrounding elements or the overall layout.

* Download time with empty minutes and seconds (#16)

orig PR: nzbget/nzbget#800

Calculation of
Total time
Download time
Verification time
Repair time
Unpack time
was broken for python3. Everything except hours

def format_time_sec_orig(sec):
Hour = sec / 3600
Min = (sec - (sec / 3600) * 3600) / 60
Sec = (sec - (sec / 3600) * 3600) % 60
return '%d:%02d:%02d' % (Hour, Min, Sec)

def format_time_sec_new(sec):
Hour = sec / 3600
Min = (sec % 3600) / 60
Sec = (sec % 60)
return '%d:%02d:%02d' % (Hour, Min, Sec)

print("Orig: " + format_time_sec_orig(int(7199)))
print("New: " + format_time_sec_new(int(7199)))

Output:

1:00:00
1:59:59

Process finished with exit code 0

* add version key to windows registry (#14)

* change nzbget.net to nzbget.com (#13)

* fix according to discription (#10)

issue nzbget/nzbget#693. need testing

* fix python 3.x script execution windows support (#8)

* fix python 3.x script execution windows support

python 3.x has %L (unprocessable) in command string format windows registry key instead of %1(processable) in 2.x python. So we can just check and replace.

* fix for Debug configuration

* Update pubkey.pem. Update windows build script to include pubkey.pem. (#20)

* Change CI/CD to target main branch on release build (#22)

* change nzbget.net to nzbget.com part 2 (#21)

* change nzbget.net to nzbget.com part 2

fix missing changes nzbget.net to nzbget.com

* Updating site links

---------

Co-authored-by: alexabenti <alex@nzbget.com>

* update changelog (#24)

* update changelog

* update changelog

---------

Co-authored-by: Andrey Prygunkov <hugbug@users.sourceforge.net>
Co-authored-by: ureyNZB <urey.by@gmail.com>
Co-authored-by: phnzb <139914799+phnzb@users.noreply.github.com>
Co-authored-by: alexabenti <alex@nzbget.com>
  • Loading branch information
5 people committed Sep 21, 2023
1 parent b0d35f9 commit 4e4d9f5
Show file tree
Hide file tree
Showing 233 changed files with 11,950 additions and 351 deletions.
38 changes: 38 additions & 0 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Build and upload NZBGet for Linux

on:
push:
branches:
- develop
- main
workflow_dispatch:

jobs:
build:
runs-on: [self-hosted, linux]

steps:

- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Build
run: |
rm -rf /build/nzbget
cp -r . /build/nzbget
cd /build
docker run -e ALL_ARCHS="i686 x86_64 armhf armel" -v /build:/build nzbget-build /build/scripts/build-nzbget-ci.sh
- name: Upload build artifacts
uses: actions/upload-artifact@v3
with:
name: nzbget-linux-installers
path: /build/output/*.run
retention-days: 5

- name: Cleanup
run: |
rm -rf /build/nzbget
rm -rf /build/output
28 changes: 28 additions & 0 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Build and upload NZBGet for Windows

on:
push:
branches:
- develop
- main
workflow_dispatch:

jobs:
build:
runs-on: [self-hosted, windows]

steps:

- name: Checkout
uses: actions/checkout@v3

- name: Build
run: |
.\windows\build-nzbget-vs22.bat
- name: Upload build artifacts
uses: actions/upload-artifact@v3
with:
name: nzbget-windows-installers
path: C:\nzbget\build\output\*.exe
retention-days: 5
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,5 @@ code_revision.cpp
*.temp
*.pyc
pytest.ini
.cache
.cache
/.idea
30 changes: 27 additions & 3 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@
nzbget-22.0
- Add NZBGet version to Windows registry during installation so version displays in programm list.
https://github.com/nzbgetcom/nzbget/pull/14
- Enabled FIPS servers using OpenSSL 3.
https://github.com/nzbgetcom/nzbget/pull/3
- Change progress bar width to calculated instead of fixed.
https://github.com/nzbgetcom/nzbget/pull/17
- Fix Download time with empty minutes and seconds in email sended via EMail.py
https://github.com/nzbgetcom/nzbget/pull/16
- UI and web links fixes, temporary disable testing/develop update channels
https://github.com/nzbgetcom/nzbget/pull/19
- Fixed negative values for ThreadCount in json-rpc
https://github.com/nzbget/nzbget/issues/696
https://github.com/nzbgetcom/nzbget/pull/10
- Fix python 3.x script execution windows support
https://github.com/nzbgetcom/nzbget/pull/8
- regex library moved directly to project for windows build
- removed one certificate from cacert.pem that caused error message
- build scripts files updated

nzbget-21.2-testing:
- please see repository change log at
https://github.com/nzbget/nzbget/commits/develop

nzbget-21.1:
- fixed crash on systems with 64-bit time;
- corrected icon in Windows "uninstall program" list;
Expand Down Expand Up @@ -1472,7 +1496,7 @@ nzbget-13.0:
work well with hibernation mode on synology);
- pp-script "EMail.py" now takes the status of previous pp-scripts
into account and report a failure if any of the scripts has failed;
- updated all links to go to new domain (nzbget.net);
- updated all links to go to new domain (nzbget.com);
- impoved error reporting if unpacker or par-renamer fail to move files;
- removed libpar2-patches from NZBGet source tree; the documentation
now suggests to use the libpar2 version maintained by Debian/Ubuntu
Expand Down Expand Up @@ -1626,7 +1650,7 @@ nzbget-12.0:
- duplicate properties (dupekey, dupescore and dupemode) can now
be viewed and changed in download-edit-dialog and
history-edit-dialog via new button "Dupe";
- for full documentation see http://nzbget.net/RSS#Duplicates;
- for full documentation see https://nzbget.com/documentation/rss/#duplicates;
- created NZBGet.app - NZBGet is now a user friendly Mac OS X application
with easy installation and seamless integration into OS UI:
works in background, is controlled from a web-browser, few
Expand Down Expand Up @@ -1662,7 +1686,7 @@ nzbget-12.0:
for platform;
- the script is then called by NZBGet when user clicks on install-button;
- the script must download and install new version;
- for more info visit http://nzbget.net/Packaging;
- for more info visit https://nzbget.com/documentation/packaging/;
- news servers can now be temporarily disabled via speed limit dialog
without reloading of the program:
- new option "ServerX.Active" to disable servers via settings;
Expand Down
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is part of nzbget. See <http://nzbget.net>.
# This file is part of nzbget. See <https://nzbget.com>.
#
# Copyright (C) 2008-2019 Andrey Prygunkov <hugbug@users.sourceforge.net>
#
Expand Down
2 changes: 1 addition & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
@SET_MAKE@

#
# This file is part of nzbget. See <http://nzbget.net>.
# This file is part of nzbget. See <https://nzbget.com>.
#
# Copyright (C) 2008-2019 Andrey Prygunkov <hugbug@users.sourceforge.net>
#
Expand Down
4 changes: 2 additions & 2 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

This is a short documentation. For more information please
visit NZBGet home page at
http://nzbget.net
https://nzbget.com

Contents
--------
Expand Down Expand Up @@ -501,7 +501,7 @@ Additional exemption: compiling, linking, and/or using OpenSSL is allowed.

If you encounter any problem, feel free to use the forum

nzbget.net/forum
nzbget.com/forum

or contact me at

Expand Down
34 changes: 17 additions & 17 deletions configure
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for nzbget 21.1.
# Generated by GNU Autoconf 2.69 for nzbget 22.0.
#
# Report bugs to <hugbug@users.sourceforge.net>.
# Report bugs to <nzbget@nzbget.com>.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -267,7 +267,7 @@ fi
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
$as_echo "$0: Please tell bug-autoconf@gnu.org and
$0: hugbug@users.sourceforge.net about your system,
$0: nzbget@nzbget.com about your system,
$0: including any error possibly output before this
$0: message. Then install a modern shell, or manually run
$0: the script under such a shell if you do have one."
Expand Down Expand Up @@ -580,9 +580,9 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='nzbget'
PACKAGE_TARNAME='nzbget'
PACKAGE_VERSION='21.1'
PACKAGE_STRING='nzbget 21.1'
PACKAGE_BUGREPORT='hugbug@users.sourceforge.net'
PACKAGE_VERSION='22.0'
PACKAGE_STRING='nzbget 22.0'
PACKAGE_BUGREPORT='nzbget@nzbget.com'
PACKAGE_URL=''

ac_unique_file="daemon/main/nzbget.cpp"
Expand Down Expand Up @@ -1348,7 +1348,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures nzbget 21.1 to adapt to many kinds of systems.
\`configure' configures nzbget 22.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1419,7 +1419,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of nzbget 21.1:";;
short | recursive ) echo "Configuration of nzbget 22.0:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1521,7 +1521,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
Report bugs to <hugbug@users.sourceforge.net>.
Report bugs to <nzbget@nzbget.com>.
_ACEOF
ac_status=$?
fi
Expand Down Expand Up @@ -1584,7 +1584,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
nzbget configure 21.1
nzbget configure 22.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1744,7 +1744,7 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
( $as_echo "## ------------------------------------------- ##
## Report this to hugbug@users.sourceforge.net ##
## Report this to nzbget@nzbget.com ##
## ------------------------------------------- ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
Expand Down Expand Up @@ -2053,7 +2053,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by nzbget $as_me 21.1, which was
It was created by nzbget $as_me 22.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -3026,7 +3026,7 @@ fi
# Define the identity of the package.
PACKAGE='nzbget'
VERSION='21.1'
VERSION='22.0'
cat >>confdefs.h <<_ACEOF
Expand Down Expand Up @@ -5367,7 +5367,7 @@ $as_echo "#define HAVE_CXX14 1" >>confdefs.h
fi
if test "$HAVE_CXX14" != "1"; then
as_fn_error $? "\"A compiler with support for C++14 language features is required. For details visit http://nzbget.net/cpp14\"" "$LINENO" 5
as_fn_error $? "\"A compiler with support for C++14 language features is required. For details visit http://nzbget.com/cpp14\"" "$LINENO" 5
fi
fi
Expand Down Expand Up @@ -9163,7 +9163,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by nzbget $as_me 21.1, which was
This file was extended by nzbget $as_me 22.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -9223,13 +9223,13 @@ $config_headers
Configuration commands:
$config_commands
Report bugs to <hugbug@users.sourceforge.net>."
Report bugs to <nzbget@nzbget.com>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
nzbget config.status 21.1
nzbget config.status 22.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down
6 changes: 3 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is part of nzbget. See <http://nzbget.net>.
# This file is part of nzbget. See <https://nzbget.com>.
#
# Copyright (C) 2008-2021 Andrey Prygunkov <hugbug@users.sourceforge.net>
#
Expand All @@ -21,7 +21,7 @@
# Process this file with autoconf to produce a configure script.

AC_PREREQ(2.65)
AC_INIT(nzbget, 21.1, hugbug@users.sourceforge.net)
AC_INIT(nzbget, 22.0, nzbget@nzbget.com)
AC_CONFIG_AUX_DIR(posix)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE([foreign subdir-objects])
Expand Down Expand Up @@ -58,7 +58,7 @@ AC_MSG_RESULT($ENABLECPPCHECK)
if test "$ENABLECPPCHECK" = "yes"; then
AX_CXX_COMPILE_STDCXX(14,,[optional])
if test "$HAVE_CXX14" != "1"; then
AC_MSG_ERROR("A compiler with support for C++14 language features is required. For details visit http://nzbget.net/cpp14")
AC_MSG_ERROR("A compiler with support for C++14 language features is required. For details visit https://nzbget.com/documentation/prerequisites-for-c++-compiler/")
fi
fi

Expand Down
2 changes: 1 addition & 1 deletion daemon/connect/Connection.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* This file is part of nzbget. See <http://nzbget.net>.
* This file is part of nzbget. See <https://nzbget.com>.
*
* Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
* Copyright (C) 2007-2019 Andrey Prygunkov <hugbug@users.sourceforge.net>
Expand Down
2 changes: 1 addition & 1 deletion daemon/connect/Connection.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* This file is part of nzbget. See <http://nzbget.net>.
* This file is part of nzbget. See <https://nzbget.com>.
*
* Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
* Copyright (C) 2007-2017 Andrey Prygunkov <hugbug@users.sourceforge.net>
Expand Down

0 comments on commit 4e4d9f5

Please sign in to comment.