Merge pull request #79 from essentialkaos/develop

Version 2.6.0
essentialkaos · Dec 17, 2019 · d602c41 · d602c41
2 parents 42f0b72 + a7fbb0a
commit d602c41
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 9 deletions.
diff --git a/SOURCES/conf/rpmmacros_centos6 b/SOURCES/conf/rpmmacros_centos6
@@ -12,7 +12,7 @@
 %__arch_install_post  /usr/lib/rpm/check-rpaths /usr/lib/rpm/check-buildroot
 
 # Use xz compression for payload by default
-%_source_payload  w7.xzdio
-%_binary_payload  w7.xzdio
+%_source_payload  w7T.xzdio
+%_binary_payload  w7T.xzdio
 
 ########################################################################################
diff --git a/SOURCES/conf/rpmmacros_centos7 b/SOURCES/conf/rpmmacros_centos7
@@ -18,7 +18,7 @@
 %dist  .el7
 
 # Use xz compression for payload by default
-%_source_payload  w7.xzdio
-%_binary_payload  w7.xzdio
+%_source_payload  w7T.xzdio
+%_binary_payload  w7T.xzdio
 
 ########################################################################################
diff --git a/SOURCES/conf/rpmmacros_centos8 b/SOURCES/conf/rpmmacros_centos8
@@ -18,7 +18,7 @@
 %dist  .el8
 
 # Use xz compression for payload by default
-%_source_payload  w7.xzdio
-%_binary_payload  w7.xzdio
+%_source_payload  w7T.xzdio
+%_binary_payload  w7T.xzdio
 
 ########################################################################################
diff --git a/SOURCES/libexec/sources-remote.shx b/SOURCES/libexec/sources-remote.shx
@@ -102,6 +102,11 @@ downloadSource() {
       show "cache feature in this case. Use -dc <path> or --dlcache <path>." $YELLOW
       show ""
     fi
+
+    if ! validateSourceFile "$dir/$file_name" ; then
+      error "Invalid file ${CL_BL_RED}${source_name}${CL_RED} - file type doesn't match to file content"
+      doExit $ERROR_SOURCE
+    fi
   fi
 }
 

diff --git a/SOURCES/rpmbuilder b/SOURCES/rpmbuilder
@@ -13,7 +13,7 @@ fi
 APP="RPMBuilder"
 
 # Utility version (String)
-VER="2.5.2"
+VER="2.6.0"
 
 ################################################################################
 

diff --git a/rpmbuilder-node.spec b/rpmbuilder-node.spec
@@ -52,7 +52,7 @@
 Summary:         Configuration package for rpmbuilder node
 Name:            rpmbuilder-node
 Version:         1.4.1
-Release:         1%{?dist}
+Release:         2%{?dist}
 License:         EKOL
 Group:           Development/Tools
 URL:             https://github.com/essentialkaos/rpmbuilder
@@ -170,6 +170,9 @@ fi
 ################################################################################
 
 %changelog
+* Mon Dec 16 2019 Anton Novojilov <[email protected]> - 1.4.1-2
+- Added threads usage for payload packing to rpmmacros files
+
 * Sat Nov 30 2019 Anton Novojilov <[email protected]> - 1.4.1-1
 - Added rpmmacros file for CentOS 8
 

diff --git a/rpmbuilder.spec b/rpmbuilder.spec
@@ -2,7 +2,7 @@
 
 Summary:         RPM package build helper
 Name:            rpmbuilder
-Version:         2.5.2
+Version:         2.6.0
 Release:         0%{?dist}
 License:         EKOL
 Group:           Development/Tools
@@ -55,6 +55,9 @@ rm -rf %{buildroot}
 ################################################################################
 
 %changelog
+* Fri Dec 13 2019 Anton Novojilov <[email protected]> - 2.6.0-0
+- Added validation for downloaded files
+
 * Wed Dec 04 2019 Anton Novojilov <[email protected]> - 2.5.2-0
 - Removed handler for script errors