sysutils/libdnf: Update 0.60.0 -> 0.60.1

Reported by:	portscout
This commit is contained in:
Yuri Victorovich 2021-04-14 13:12:54 -07:00
parent edffd8ead6
commit bc975bf259
4 changed files with 17 additions and 29 deletions

View file

@ -1,5 +1,5 @@
PORTNAME= libdnf
DISTVERSION= 0.60.0
DISTVERSION= 0.60.1
CATEGORIES= sysutils
MAINTAINER= yuri@FreeBSD.org

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1615148130
SHA256 (rpm-software-management-libdnf-0.60.0_GH0.tar.gz) = df60c15fdbea5b8594334cfe270b3eb84fc0d3cab4744f4dfc7dfeb47a78bea6
SIZE (rpm-software-management-libdnf-0.60.0_GH0.tar.gz) = 1065223
TIMESTAMP = 1618430096
SHA256 (rpm-software-management-libdnf-0.60.1_GH0.tar.gz) = a3c7253575c58b88146539bce633c3be63c880d5bed54a095f8aa302e9f2c394
SIZE (rpm-software-management-libdnf-0.60.1_GH0.tar.gz) = 1066173

View file

@ -1,22 +1,11 @@
--- libdnf/config.h.orig 2021-03-07 20:35:58 UTC
--- libdnf/config.h.orig 2021-04-12 15:10:19 UTC
+++ libdnf/config.h
@@ -18,7 +18,18 @@
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <bits/wordsize.h>
+//#include <bits/wordsize.h>
+
+#include <stdint.h>
+
+#ifndef __WORDSIZE
+# if defined(UINTPTR_MAX) && defined(UINT64_MAX) && (UINTPTR_MAX == UINT64_MAX)
+# define __WORDSIZE 64
+# else
+# define __WORDSIZE 32
+# endif
+#endif
+
#if __WORDSIZE == 32
#include "config-32.h"
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(__FreeBSD__)
#include <stdint.h>
#else
#include <bits/wordsize.h>

View file

@ -1,12 +1,11 @@
--- libdnf/hy-iutil.cpp.orig 2020-09-20 22:51:04 UTC
--- libdnf/hy-iutil.cpp.orig 2021-04-12 15:10:19 UTC
+++ libdnf/hy-iutil.cpp
@@ -22,7 +22,9 @@
@@ -22,7 +22,7 @@
#include <errno.h>
#include <dirent.h>
#include <fcntl.h>
+#if !defined(__FreeBSD__)
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(__FreeBSD__)
#include <limits.h>
#else
#include <linux/limits.h>
+#endif
#include <pwd.h>
#include <unistd.h>
#include <stdio.h>