summaryrefslogtreecommitdiffstats
path: root/source/n
diff options
context:
space:
mode:
Diffstat (limited to 'source/n')
-rwxr-xr-xsource/n/getmail/getmail.SlackBuild20
-rw-r--r--source/n/getmail/getmail.url3
-rw-r--r--source/n/net-snmp/net-snmp-5.7.2-autoreconf.patch10
-rw-r--r--source/n/net-snmp/net-snmp-5.7.2-pie.patch24
-rw-r--r--source/n/net-snmp/net-snmp-5.8-agentx-disconnect-crash.patch12
-rw-r--r--source/n/net-snmp/net-snmp-5.8-autofs-skip.patch199
-rw-r--r--source/n/net-snmp/net-snmp-5.8-cflags.patch112
-rw-r--r--source/n/net-snmp/net-snmp-5.8-dir-fix.patch12
-rw-r--r--source/n/net-snmp/net-snmp-5.8-libnetsnmptrapd-against-MYSQL_LIBS.patch12
-rw-r--r--source/n/net-snmp/net-snmp-5.8-python3.patch720
-rw-r--r--source/n/net-snmp/net-snmp-5.8-test-debug.patch30
-rwxr-xr-xsource/n/net-snmp/net-snmp.SlackBuild32
-rwxr-xr-xsource/n/ntp/ntp.SlackBuild2
-rwxr-xr-xsource/n/php/php.SlackBuild2
14 files changed, 26 insertions, 1164 deletions
diff --git a/source/n/getmail/getmail.SlackBuild b/source/n/getmail/getmail.SlackBuild
index b42a760d4..1830c241d 100755
--- a/source/n/getmail/getmail.SlackBuild
+++ b/source/n/getmail/getmail.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2017, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=getmail
-VERSION=${VERSION:-$(echo getmail-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo getmail6-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
@@ -50,16 +50,13 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
-rm -rf getmail-$VERSION
-tar xvf $CWD/getmail-$VERSION.tar.?z || exit 1
-chown -R root:root getmail-$VERSION
-cd getmail-$VERSION || exit 1
+rm -rf getmail6-$VERSION
+tar xvf $CWD/getmail6-$VERSION.tar.?z || exit 1
+chown -R root:root getmail6-$VERSION
+cd getmail6-$VERSION || exit 1
-# Fix shebang in a couple files
-sed -i -e "s|#![ ]*/usr/bin/env python2.3|#!/usr/bin/env python2|" $(find . -name '*.py')
-
-python setup.py build || exit 1
-python setup.py install --root=$PKG || exit 1
+python3 setup.py build || exit 1
+python3 setup.py install --root=$PKG || exit 1
( cd $PKG/usr/share
mv man ..
@@ -76,4 +73,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
# Build the package:
cd $PKG
/sbin/makepkg -l y -c n $TMP/getmail-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/n/getmail/getmail.url b/source/n/getmail/getmail.url
index 0cfbf0ed4..f88c99e52 100644
--- a/source/n/getmail/getmail.url
+++ b/source/n/getmail/getmail.url
@@ -1 +1,2 @@
-http://pyropus.ca/software/getmail
+#http://pyropus.ca/software/getmail
+https://github.com/getmail6/getmail6
diff --git a/source/n/net-snmp/net-snmp-5.7.2-autoreconf.patch b/source/n/net-snmp/net-snmp-5.7.2-autoreconf.patch
deleted file mode 100644
index a5618e8b1..000000000
--- a/source/n/net-snmp/net-snmp-5.7.2-autoreconf.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-926223 - net-snmp: Does not support aarch64 in f19 and rawhide
-
-Update autoconf version to make the test suite happy.
-
-diff -up net-snmp-5.7.2/dist/autoconf-version.autoreconf net-snmp-5.7.2/dist/autoconf-version
---- net-snmp-5.7.2/dist/autoconf-version.autoreconf 2013-03-25 13:00:15.002745347 +0100
-+++ net-snmp-5.7.2/dist/autoconf-version 2013-03-25 13:00:17.207736442 +0100
-@@ -1 +1 @@
--2.68
-+2.69
diff --git a/source/n/net-snmp/net-snmp-5.7.2-pie.patch b/source/n/net-snmp/net-snmp-5.7.2-pie.patch
deleted file mode 100644
index ee02001b3..000000000
--- a/source/n/net-snmp/net-snmp-5.7.2-pie.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up net-snmp-5.7.2/agent/Makefile.in.pie net-snmp-5.7.2/agent/Makefile.in
---- net-snmp-5.7.2/agent/Makefile.in.pie 2012-10-10 00:28:58.000000000 +0200
-+++ net-snmp-5.7.2/agent/Makefile.in 2012-10-18 09:45:13.298613099 +0200
-@@ -294,7 +294,7 @@ getmibstat.o: mibgroup/kernel_sunos5.c
- $(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $?
-
- snmpd$(EXEEXT): ${LAGENTOBJS} $(USELIBS) $(AGENTLIB) $(HELPERLIB) $(MIBLIB) $(LIBTARG)
-- $(LINK) $(CFLAGS) -o $@ ${LAGENTOBJS} ${LDFLAGS} ${OUR_AGENT_LIBS}
-+ $(LINK) $(CFLAGS) -o $@ -pie ${LAGENTOBJS} ${LDFLAGS} ${OUR_AGENT_LIBS}
-
- libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} $(USELIBS)
- $(LIB_LD_CMD) $(AGENTLIB) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} @LD_NO_UNDEFINED@ $(LDFLAGS) $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) @AGENTLIBS@
-diff -up net-snmp-5.7.2/apps/Makefile.in.pie net-snmp-5.7.2/apps/Makefile.in
---- net-snmp-5.7.2/apps/Makefile.in.pie 2012-10-10 00:28:58.000000000 +0200
-+++ net-snmp-5.7.2/apps/Makefile.in 2012-10-18 09:44:27.827774580 +0200
-@@ -170,7 +170,7 @@ snmptest$(EXEEXT): snmptest.$(OSUFFIX
- $(LINK) ${CFLAGS} -o $@ snmptest.$(OSUFFIX) ${LDFLAGS} ${LIBS}
-
- snmptrapd$(EXEEXT): $(TRAPD_OBJECTS) $(USETRAPLIBS) $(INSTALLLIBS)
-- $(LINK) ${CFLAGS} -o $@ $(TRAPD_OBJECTS) $(INSTALLLIBS) ${LDFLAGS} ${TRAPLIBS}
-+ $(LINK) ${CFLAGS} -o $@ -pie $(TRAPD_OBJECTS) $(INSTALLLIBS) ${LDFLAGS} ${TRAPLIBS}
-
- snmptrap$(EXEEXT): snmptrap.$(OSUFFIX) $(USELIBS)
- $(LINK) ${CFLAGS} -o $@ snmptrap.$(OSUFFIX) ${LDFLAGS} ${LIBS}
diff --git a/source/n/net-snmp/net-snmp-5.8-agentx-disconnect-crash.patch b/source/n/net-snmp/net-snmp-5.8-agentx-disconnect-crash.patch
deleted file mode 100644
index da8431355..000000000
--- a/source/n/net-snmp/net-snmp-5.8-agentx-disconnect-crash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp a/agent/mibgroup/agentx/master.c b/agent/mibgroup/agentx/master.c
---- a/agent/mibgroup/agentx/master.c 2018-07-18 12:13:49.953014652 +0200
-+++ b/agent/mibgroup/agentx/master.c 2018-07-18 12:20:23.537626773 +0200
-@@ -221,7 +221,7 @@ agentx_got_response(int operation,
- /* response is too late, free the cache */
- if (magic)
- netsnmp_free_delegated_cache((netsnmp_delegated_cache*) magic);
-- return 0;
-+ return 1;
- }
- requests = cache->requests;
-
diff --git a/source/n/net-snmp/net-snmp-5.8-autofs-skip.patch b/source/n/net-snmp/net-snmp-5.8-autofs-skip.patch
deleted file mode 100644
index e6de4f313..000000000
--- a/source/n/net-snmp/net-snmp-5.8-autofs-skip.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-diff -urNp b/agent/mibgroup/hardware/fsys/fsys_mntctl.c net-snmp-5.8/agent/mibgroup/hardware/fsys/fsys_mntctl.c
---- b/agent/mibgroup/hardware/fsys/fsys_mntctl.c 2018-07-18 16:12:20.674499629 +0200
-+++ net-snmp-5.8/agent/mibgroup/hardware/fsys/fsys_mntctl.c 2018-07-18 16:15:46.782859398 +0200
-@@ -43,8 +43,9 @@ _fsys_type( int type)
-
- case MNT_NFS:
- case MNT_NFS3:
-- case MNT_AUTOFS:
- return NETSNMP_FS_TYPE_NFS;
-+ case MNT_AUTOFS:
-+ return NETSNMP_FS_TYPE_AUTOFS;
-
- /*
- * The following code covers selected filesystems
-@@ -156,10 +157,12 @@ netsnmp_fsys_arch_load( void )
-
- /*
- * Optionally skip retrieving statistics for remote mounts
-+ * AUTOFS is skipped by default
- */
-- if ( (entry->flags & NETSNMP_FS_FLAG_REMOTE) &&
-+ if ( ((entry->flags & NETSNMP_FS_FLAG_REMOTE) &&
- netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
-- NETSNMP_DS_AGENT_SKIPNFSINHOSTRESOURCES))
-+ NETSNMP_DS_AGENT_SKIPNFSINHOSTRESOURCES)) ||
-+ entry->type == (NETSNMP_FS_TYPE_AUTOFS))
- continue;
-
- if ( statfs( entry->path, &stat_buf ) < 0 ) {
-diff -urNp b/agent/mibgroup/hardware/fsys/fsys_mntent.c net-snmp-5.8/agent/mibgroup/hardware/fsys/fsys_mntent.c
---- b/agent/mibgroup/hardware/fsys/fsys_mntent.c 2018-07-18 16:12:20.674499629 +0200
-+++ net-snmp-5.8/agent/mibgroup/hardware/fsys/fsys_mntent.c 2018-07-18 16:15:46.782859398 +0200
-@@ -150,6 +150,13 @@ _fsys_type( char *typename )
- !strcmp(typename, MNTTYPE_LOFS))
- return NETSNMP_FS_TYPE_OTHER;
-
-+ /* Detection of AUTOFS.
-+ * This file system will be ignored by default
-+ */
-+ else if ( !strcmp(typename, MNTTYPE_AUTOFS))
-+ return NETSNMP_FS_TYPE_AUTOFS;
-+
-+
- /*
- * All other types are silently skipped
- */
-@@ -239,6 +246,10 @@ netsnmp_fsys_arch_load( void )
- NETSNMP_DS_AGENT_SKIPNFSINHOSTRESOURCES))
- continue;
-
-+ /* Skip AUTOFS enteries */
-+ if ( entry->type == (NETSNMP_FS_TYPE_AUTOFS))
-+ continue;
-+
- #ifdef irix6
- if ( NSFS_STATFS( entry->path, &stat_buf, sizeof(struct statfs), 0) < 0 )
- #else
-diff -urNp b/agent/mibgroup/hardware/fsys/mnttypes.h net-snmp-5.8/agent/mibgroup/hardware/fsys/mnttypes.h
---- b/agent/mibgroup/hardware/fsys/mnttypes.h 2018-07-18 16:12:20.674499629 +0200
-+++ net-snmp-5.8/agent/mibgroup/hardware/fsys/mnttypes.h 2018-07-18 16:15:46.782859398 +0200
-@@ -165,6 +165,9 @@
- #ifndef MNTTYPE_APP
- #define MNTTYPE_APP "app"
- #endif
-+#ifndef MNTTYPE_AUTOFS
-+#define MNTTYPE_AUTOFS "autofs"
-+#endif
- #ifndef MNTTYPE_DEVPTS
- #define MNTTYPE_DEVPTS "devpts"
- #endif
-diff -urNp b/agent/mibgroup/host/hr_filesys.c net-snmp-5.8/agent/mibgroup/host/hr_filesys.c
---- b/agent/mibgroup/host/hr_filesys.c 2018-07-18 16:12:20.668499652 +0200
-+++ net-snmp-5.8/agent/mibgroup/host/hr_filesys.c 2018-07-18 16:15:46.783859399 +0200
-@@ -834,6 +834,27 @@ Check_HR_FileSys_NFS (void)
- return 0; /* no NFS file system */
- }
-
-+/* This function checks whether current file system is an AutoFs
-+ * HRFS_entry must be valid prior to calling this function
-+ * return 1 if AutoFs, 0 otherwise
-+ */
-+int
-+Check_HR_FileSys_AutoFs (void)
-+{
-+#if HAVE_GETFSSTAT
-+ if ( HRFS_entry->HRFS_type != NULL &&
-+#if defined(MNTTYPE_AUTOFS)
-+ !strcmp( HRFS_entry->HRFS_type, MNTTYPE_AUTOFS)
-+#else
-+ !strcmp( HRFS_entry->HRFS_type, "autofs")
-+#endif
-+ )
-+#endif /* HAVE_GETFSSTAT */
-+ return 1; /* AUTOFS */
-+
-+ return 0; /* no AUTOFS */
-+}
-+
- void
- End_HR_FileSys(void)
- {
-diff -urNp b/agent/mibgroup/host/hr_filesys.h net-snmp-5.8/agent/mibgroup/host/hr_filesys.h
---- b/agent/mibgroup/host/hr_filesys.h 2018-07-18 16:12:20.669499648 +0200
-+++ net-snmp-5.8/agent/mibgroup/host/hr_filesys.h 2018-07-18 16:15:46.784859400 +0200
-@@ -10,6 +10,7 @@ extern void Init_HR_FileSys(void);
- extern FindVarMethod var_hrfilesys;
- extern int Get_Next_HR_FileSys(void);
- extern int Check_HR_FileSys_NFS(void);
-+extern int Check_HR_FileSys_AutoFs(void);
-
- extern int Get_FSIndex(char *);
- extern long Get_FSSize(char *); /* Temporary */
-diff -urNp b/agent/mibgroup/host/hrh_filesys.c net-snmp-5.8/agent/mibgroup/host/hrh_filesys.c
---- b/agent/mibgroup/host/hrh_filesys.c 2018-07-18 16:12:20.668499652 +0200
-+++ net-snmp-5.8/agent/mibgroup/host/hrh_filesys.c 2018-07-18 16:15:46.785859402 +0200
-@@ -429,3 +429,9 @@ Check_HR_FileSys_NFS (void)
- {
- return (HRFS_entry->flags & NETSNMP_FS_FLAG_REMOTE) ? 1 : 0;
- }
-+
-+int
-+Check_HR_FileSys_AutoFs (void)
-+{
-+ return (HRFS_entry->type == (NETSNMP_FS_TYPE_AUTOFS)) ? 1 : 0;
-+}
-diff -urNp b/agent/mibgroup/host/hrh_filesys.h net-snmp-5.8/agent/mibgroup/host/hrh_filesys.h
---- b/agent/mibgroup/host/hrh_filesys.h 2018-07-18 16:12:20.669499648 +0200
-+++ net-snmp-5.8/agent/mibgroup/host/hrh_filesys.h 2018-07-18 16:15:46.785859402 +0200
-@@ -10,6 +10,7 @@ extern void Init_HR_FileSys(void);
- extern FindVarMethod var_hrhfilesys;
- extern int Get_Next_HR_FileSys(void);
- extern int Check_HR_FileSys_NFS(void);
-+extern int Check_HR_FileSys_AutoFs(void);
-
- extern int Get_FSIndex(char *);
- extern long Get_FSSize(char *); /* Temporary */
-diff -urNp b/agent/mibgroup/host/hrh_storage.c net-snmp-5.8/agent/mibgroup/host/hrh_storage.c
---- b/agent/mibgroup/host/hrh_storage.c 2018-07-18 16:12:20.668499652 +0200
-+++ net-snmp-5.8/agent/mibgroup/host/hrh_storage.c 2018-07-18 16:15:46.786859402 +0200
-@@ -367,9 +367,10 @@ really_try_next:
- store_idx = name[ HRSTORE_ENTRY_NAME_LENGTH ];
- if (HRFS_entry &&
- store_idx > NETSNMP_MEM_TYPE_MAX &&
-- netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
-+ ((netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
- NETSNMP_DS_AGENT_SKIPNFSINHOSTRESOURCES) &&
-- Check_HR_FileSys_NFS())
-+ Check_HR_FileSys_NFS()) ||
-+ Check_HR_FileSys_AutoFs()))
- return NULL;
- if (store_idx <= NETSNMP_MEM_TYPE_MAX ) {
- mem = (netsnmp_memory_info*)ptr;
-@@ -508,7 +509,8 @@ Get_Next_HR_Store(void)
- if (HRS_index >= 0) {
- if (!(netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
- NETSNMP_DS_AGENT_SKIPNFSINHOSTRESOURCES) &&
-- Check_HR_FileSys_NFS())) {
-+ Check_HR_FileSys_NFS()) &&
-+ !Check_HR_FileSys_AutoFs()) {
- return HRS_index + NETSNMP_MEM_TYPE_MAX;
- }
- } else {
-diff -urNp b/agent/mibgroup/host/hr_storage.c net-snmp-5.8/agent/mibgroup/host/hr_storage.c
---- b/agent/mibgroup/host/hr_storage.c 2018-07-18 16:12:20.670499644 +0200
-+++ net-snmp-5.8/agent/mibgroup/host/hr_storage.c 2018-07-18 16:15:46.786859402 +0200
-@@ -540,9 +540,10 @@ really_try_next:
-
- store_idx = name[ HRSTORE_ENTRY_NAME_LENGTH ];
- if (store_idx > NETSNMP_MEM_TYPE_MAX ) {
-- if ( netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
-+ if ( (netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
- NETSNMP_DS_AGENT_SKIPNFSINHOSTRESOURCES) &&
-- Check_HR_FileSys_NFS())
-+ Check_HR_FileSys_NFS()) ||
-+ Check_HR_FileSys_AutoFs())
- return NULL; /* or goto try_next; */
- if (HRFS_statfs(HRFS_entry->HRFS_mount, &stat_buf) < 0) {
- snmp_log_perror(HRFS_entry->HRFS_mount);
-@@ -683,7 +684,8 @@ Get_Next_HR_Store(void)
- if (HRS_index >= 0) {
- if (!(netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
- NETSNMP_DS_AGENT_SKIPNFSINHOSTRESOURCES) &&
-- Check_HR_FileSys_NFS())) {
-+ Check_HR_FileSys_NFS()) &&
-+ !Check_HR_FileSys_AutoFs()) {
- return HRS_index + NETSNMP_MEM_TYPE_MAX;
- }
- } else {
-diff -urNp b/include/net-snmp/agent/hardware/fsys.h net-snmp-5.8/include/net-snmp/agent/hardware/fsys.h
---- b/include/net-snmp/agent/hardware/fsys.h 2018-07-18 16:12:20.649499726 +0200
-+++ net-snmp-5.8/include/net-snmp/agent/hardware/fsys.h 2018-07-18 16:19:33.994918912 +0200
-@@ -41,6 +41,7 @@ typedef struct netsnmp_fsys_info_s netsn
- #define NETSNMP_FS_TYPE_SYSFS (4 | _NETSNMP_FS_TYPE_LOCAL | _NETSNMP_FS_TYPE_SKIP_BIT)
- #define NETSNMP_FS_TYPE_TMPFS (5 | _NETSNMP_FS_TYPE_LOCAL)
- #define NETSNMP_FS_TYPE_USBFS (6 | _NETSNMP_FS_TYPE_LOCAL)
-+#define NETSNMP_FS_TYPE_AUTOFS (7 | _NETSNMP_FS_TYPE_LOCAL | _NETSNMP_FS_TYPE_SKIP_BIT)
-
- #define NETSNMP_FS_FLAG_ACTIVE 0x01
- #define NETSNMP_FS_FLAG_REMOTE 0x02
diff --git a/source/n/net-snmp/net-snmp-5.8-cflags.patch b/source/n/net-snmp/net-snmp-5.8-cflags.patch
deleted file mode 100644
index 180972607..000000000
--- a/source/n/net-snmp/net-snmp-5.8-cflags.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff -urNp a/net-snmp-config.in b/net-snmp-config.in
---- a/net-snmp-config.in 2018-07-18 13:43:12.264426052 +0200
-+++ b/net-snmp-config.in 2018-07-18 13:52:06.917089518 +0200
-@@ -140,10 +140,10 @@ else
- ;;
- #################################################### compile
- --base-cflags)
-- echo @CFLAGS@ @CPPFLAGS@ -I${NSC_INCLUDEDIR}
-+ echo -I${NSC_INCLUDEDIR}
- ;;
- --cflags|--cf*)
-- echo @CFLAGS@ @DEVFLAGS@ @CPPFLAGS@ -I. -I${NSC_INCLUDEDIR}
-+ echo @DEVFLAGS@ -I. -I${NSC_INCLUDEDIR}
- ;;
- --srcdir)
- echo $NSC_SRCDIR
-diff -urNp a/perl/agent/default_store/Makefile.PL b/perl/agent/default_store/Makefile.PL
---- a/perl/agent/default_store/Makefile.PL 2018-07-18 13:43:12.170426290 +0200
-+++ b/perl/agent/default_store/Makefile.PL 2018-07-18 13:51:31.812176486 +0200
-@@ -83,7 +83,7 @@ sub AgentDefaultStoreInitMakeParams {
- " " . $Params{'LIBS'};
- $Params{'CCFLAGS'} = "-I../../../include " . $Params{'CCFLAGS'};
- }
-- $Params{'CCFLAGS'} =~ s/ -W(all|inline|strict-prototypes|write-strings|cast-qual|no-char-subscripts)//g; # ignore developer warnings
-+ $Params{'CCFLAGS'} =~ s/ -W(inline|strict-prototypes|write-strings|cast-qual|no-char-subscripts)//g; # ignore developer warnings
- $Params{'CCFLAGS'} .= ' -Wformat';
- if ($Params{'LIBS'} eq "" || $Params{'CCFLAGS'} eq "") {
- die "You need to install net-snmp first (I can't find net-snmp-config)";
-diff -urNp a/perl/agent/Makefile.PL b/perl/agent/Makefile.PL
---- a/perl/agent/Makefile.PL 2018-07-18 13:43:12.169426292 +0200
-+++ b/perl/agent/Makefile.PL 2018-07-18 13:52:53.884973275 +0200
-@@ -98,7 +98,7 @@ sub AgentInitMakeParams {
- $Params{'LIBS'} = `$opts->{'nsconfig'} --libdir` . $Params{'LIBS'};
- # $Params{'PREREQ_PM'} = {'NetSNMP::OID' => '0.1'};
- }
-- $Params{'CCFLAGS'} =~ s/ -W(all|inline|strict-prototypes|write-strings|cast-qual|no-char-subscripts)//g; # ignore developer warnings
-+ $Params{'CCFLAGS'} =~ s/ -W(inline|strict-prototypes|write-strings|cast-qual|no-char-subscripts)//g; # ignore developer warnings
- $Params{'CCFLAGS'} .= ' -Wformat';
- if ($Params{'LIBS'} eq "" || $Params{'CCFLAGS'} eq "") {
- die "You need to install net-snmp first (I can't find net-snmp-config)";
-diff -urNp a/perl/agent/Support/Makefile.PL b/perl/agent/Support/Makefile.PL
---- a/perl/agent/Support/Makefile.PL 2018-07-18 13:43:12.169426292 +0200
-+++ b/perl/agent/Support/Makefile.PL 2018-07-18 13:53:11.414929921 +0200
-@@ -90,7 +90,7 @@ sub SupportInitMakeParams {
- " " . $Params{'LIBS'};
- $Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'};
- }
-- $Params{'CCFLAGS'} =~ s/ -W(all|inline|strict-prototypes|write-strings|cast-qual|no-char-subscripts)//g; # ignore developer warnings
-+ $Params{'CCFLAGS'} =~ s/ -W(inline|strict-prototypes|write-strings|cast-qual|no-char-subscripts)//g; # ignore developer warnings
- $Params{'CCFLAGS'} .= ' -Wformat';
- if ($Params{'LIBS'} eq "" || $Params{'CCFLAGS'} eq "") {
- die "You need to install net-snmp first (I can't find net-snmp-config)";
-diff -urNp a/perl/ASN/Makefile.PL b/perl/ASN/Makefile.PL
---- a/perl/ASN/Makefile.PL 2018-07-18 13:43:12.171426287 +0200
-+++ b/perl/ASN/Makefile.PL 2018-07-18 13:53:46.652842822 +0200
-@@ -93,7 +93,7 @@ sub AsnInitMakeParams {
- " " . $Params{'LIBS'};
- $Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'};
- }
-- $Params{'CCFLAGS'} =~ s/ -W(all|inline|strict-prototypes|write-strings|cast-qual|no-char-subscripts)//g; # ignore developer warnings
-+ $Params{'CCFLAGS'} =~ s/ -W(inline|strict-prototypes|write-strings|cast-qual|no-char-subscripts)//g; # ignore developer warnings
- $Params{'CCFLAGS'} .= ' -Wformat';
- if ($Params{'LIBS'} eq "" || $Params{'CCFLAGS'} eq "") {
- die "You need to install net-snmp first (I can't find net-snmp-config)";
-diff -urNp a/perl/default_store/Makefile.PL b/perl/default_store/Makefile.PL
---- a/perl/default_store/Makefile.PL 2018-07-18 13:43:12.175426277 +0200
-+++ b/perl/default_store/Makefile.PL 2018-07-18 13:54:20.814758441 +0200
-@@ -83,7 +83,7 @@ sub DefaultStoreInitMakeParams {
- " " . $Params{'LIBS'};
- $Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'};
- }
-- $Params{'CCFLAGS'} =~ s/ -W(all|inline|strict-prototypes|write-strings|cast-qual|no-char-subscripts)//g; # ignore developer warnings
-+ $Params{'CCFLAGS'} =~ s/ -W(inline|strict-prototypes|write-strings|cast-qual|no-char-subscripts)//g; # ignore developer warnings
- $Params{'CCFLAGS'} .= ' -Wformat';
- if ($Params{'LIBS'} eq "" || $Params{'CCFLAGS'} eq "") {
- die "You need to install net-snmp first (I can't find net-snmp-config)";
-diff -urNp a/perl/OID/Makefile.PL b/perl/OID/Makefile.PL
---- a/perl/OID/Makefile.PL 2018-07-18 13:43:12.175426277 +0200
-+++ b/perl/OID/Makefile.PL 2018-07-18 13:54:43.348702811 +0200
-@@ -90,7 +90,7 @@ sub OidInitMakeParams {
- # } else {
- # $Params{'PREREQ_PM'} = {'SNMP' => '5.0'};
- }
-- $Params{'CCFLAGS'} =~ s/ -W(all|inline|strict-prototypes|write-strings|cast-qual|no-char-subscripts)//g; # ignore developer warnings
-+ $Params{'CCFLAGS'} =~ s/ -W(inline|strict-prototypes|write-strings|cast-qual|no-char-subscripts)//g; # ignore developer warnings
- $Params{'CCFLAGS'} .= ' -Wformat';
- if ($Params{'LIBS'} eq "" || $Params{'CCFLAGS'} eq "") {
- die "You need to install net-snmp first (I can't find net-snmp-config)";
-diff -urNp a/perl/SNMP/Makefile.PL b/perl/SNMP/Makefile.PL
---- a/perl/SNMP/Makefile.PL 2018-07-18 13:43:12.173426282 +0200
-+++ b/perl/SNMP/Makefile.PL 2018-07-18 13:55:07.220643903 +0200
-@@ -103,7 +103,7 @@ sub SnmpInitMakeParams {
- # } else {
- # $Params{'PREREQ_PM'} = { 'NetSNMP::default_store' => 0.01 };
- }
-- $Params{'CCFLAGS'} =~ s/ -W(all|inline|strict-prototypes|write-strings|cast-qual|no-char-subscripts)//g; # ignore developer warnings
-+ $Params{'CCFLAGS'} =~ s/ -W(inline|strict-prototypes|write-strings|cast-qual|no-char-subscripts)//g; # ignore developer warnings
- $Params{'CCFLAGS'} .= ' -Wformat';
- if (!$ENV{'NETSNMP_PREFIX'}) {
- $prefix = `$opts->{'nsconfig'} --prefix`;
-diff -urNp a/perl/TrapReceiver/Makefile.PL b/perl/TrapReceiver/Makefile.PL
---- a/perl/TrapReceiver/Makefile.PL 2018-07-18 13:43:12.172426285 +0200
-+++ b/perl/TrapReceiver/Makefile.PL 2018-07-18 13:55:43.100647233 +0200
-@@ -132,7 +132,7 @@ sub TrapReceiverInitMakeParams {
- $Params{'LIBS'} = `$opts->{'nsconfig'} --libdir` . " $Params{'LIBS'}";
- }
-
-- $Params{'CCFLAGS'} =~ s/ -W(all|inline|strict-prototypes|write-strings|cast-qual|no-char-subscripts)//g; # ignore developer warnings
-+ $Params{'CCFLAGS'} =~ s/ -W(inline|strict-prototypes|write-strings|cast-qual|no-char-subscripts)//g; # ignore developer warnings
- $Params{'CCFLAGS'} .= ' -Wformat';
- if ($Params{'CCFLAGS'} eq "") {
- die "You need to install net-snmp first (I can't find net-snmp-config)";
diff --git a/source/n/net-snmp/net-snmp-5.8-dir-fix.patch b/source/n/net-snmp/net-snmp-5.8-dir-fix.patch
deleted file mode 100644
index 2c47d524a..000000000
--- a/source/n/net-snmp/net-snmp-5.8-dir-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp a/net-snmp-create-v3-user.in b/net-snmp-create-v3-user.in
---- a/net-snmp-create-v3-user.in 2018-07-18 11:11:53.227015237 +0200
-+++ b/net-snmp-create-v3-user.in 2018-07-18 11:12:13.375010176 +0200
-@@ -137,7 +137,7 @@ fi
- echo $line >> $outfile
- prefix="@prefix@"
- datarootdir="@datarootdir@"
--outfile="@datadir@/snmp/snmpd.conf"
-+outfile="/etc/snmp/snmpd.conf"
- line="$token $user"
- echo "adding the following line to $outfile:"
- echo " " $line
diff --git a/source/n/net-snmp/net-snmp-5.8-libnetsnmptrapd-against-MYSQL_LIBS.patch b/source/n/net-snmp/net-snmp-5.8-libnetsnmptrapd-against-MYSQL_LIBS.patch
deleted file mode 100644
index d835ee54a..000000000
--- a/source/n/net-snmp/net-snmp-5.8-libnetsnmptrapd-against-MYSQL_LIBS.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp a/apps/Makefile.in b/apps/Makefile.in
---- a/apps/Makefile.in 2018-07-18 15:39:28.069251000 +0200
-+++ b/apps/Makefile.in 2018-07-18 15:54:52.261943123 +0200
-@@ -230,7 +230,7 @@ snmppcap$(EXEEXT): snmppcap.$(OSUFFIX
- $(LINK) ${CFLAGS} -o $@ snmppcap.$(OSUFFIX) ${LDFLAGS} ${LIBS} -lpcap
-
- libnetsnmptrapd.$(LIB_EXTENSION)$(LIB_VERSION): $(LLIBTRAPD_OBJS)
-- $(LIB_LD_CMD) $@ ${LLIBTRAPD_OBJS} $(MIBLIB) $(USELIBS) $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS)
-+ $(LIB_LD_CMD) $@ ${LLIBTRAPD_OBJS} $(MIBLIB) $(USELIBS) $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) $(MYSQL_LIB)
- $(RANLIB) $@
-
- snmpinforminstall:
diff --git a/source/n/net-snmp/net-snmp-5.8-python3.patch b/source/n/net-snmp/net-snmp-5.8-python3.patch
deleted file mode 100644
index 8edab40dc..000000000
--- a/source/n/net-snmp/net-snmp-5.8-python3.patch
+++ /dev/null
@@ -1,720 +0,0 @@
-diff -urNp a/configure b/configure
---- a/configure 2018-07-18 17:11:53.178147565 +0200
-+++ b/configure 2018-07-18 17:14:01.254774416 +0200
-@@ -7742,8 +7742,8 @@ $as_echo "no" >&6; }
- fi
-
-
--# Extract the first word of "python", so it can be a program name with args.
--set dummy python; ac_word=$2
-+# Extract the first word of "python3", so it can be a program name with args.
-+set dummy python3; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- if ${ac_cv_path_PYTHONPROG+:} false; then :
-diff -urNp a/configure.d/config_os_progs b/configure.d/config_os_progs
---- a/configure.d/config_os_progs 2018-07-18 17:11:53.197147510 +0200
-+++ b/configure.d/config_os_progs 2018-07-18 17:14:29.963690646 +0200
-@@ -57,7 +57,7 @@ AC_PATH_PROG(AUTOCONF, autoconf, [:
- AC_PATH_PROG(AUTOHEADER, autoheader, [:])
- AC_PATH_PROG([PERLPROG], perl)
- AC_PATH_PROG([PSPROG], ps)
--AC_PATH_PROG([PYTHONPROG],python)
-+AC_PATH_PROG([PYTHONPROG],python3)
-
- AC_PATH_PROG([UNAMEPROG], uname)
- AC_DEFINE_UNQUOTED(UNAMEPROG,"$UNAMEPROG", [Where is the uname command])
-diff -urNp a/Makefile.in b/Makefile.in
---- a/Makefile.in 2018-07-18 17:11:53.175147574 +0200
-+++ b/Makefile.in 2018-07-18 17:16:21.331365317 +0200
-@@ -226,7 +226,7 @@ perlcleanfeatures:
-
- # python specific build rules
- #
--PYMAKE=$(PYTHON) setup.py $(PYTHONARGS)
-+PYMAKE=/usr/bin/python3 setup.py $(PYTHONARGS)
- pythonmodules: subdirs
- @(dir=`pwd`; cd python; $(PYMAKE) build --basedir=$$dir) ; \
- if test $$? != 0 ; then \
-diff -urNp a/python/netsnmp/client_intf.c b/python/netsnmp/client_intf.c
---- a/python/netsnmp/client_intf.c 2018-07-18 17:11:53.262147321 +0200
-+++ b/python/netsnmp/client_intf.c 2018-07-18 17:33:16.495712833 +0200
-@@ -1,11 +1,5 @@
- #include <Python.h>
-
--#if PY_VERSION_HEX < 0x02050000
--typedef int Py_ssize_t;
--#define PY_SSIZE_T_MAX INT_MAX
--#define PY_SSIZE_T_MIN INT_MIN
--#endif
--
- #include <net-snmp/net-snmp-config.h>
- #include <net-snmp/net-snmp-includes.h>
- #include <sys/types.h>
-@@ -852,8 +846,40 @@ py_netsnmp_attr_string(PyObject *obj, ch
- if (obj && attr_name && PyObject_HasAttrString(obj, attr_name)) {
- PyObject *attr = PyObject_GetAttrString(obj, attr_name);
- if (attr) {
-+ *val = PyUnicode_AsUTF8AndSize(attr, len);
-+ Py_DECREF(attr);
-+ return 0;
-+ }
-+ }
-+
-+ return -1;
-+}
-+
-+static int
-+py_netsnmp_attr_set_bytes(PyObject *obj, char *attr_name,
-+ char *val, size_t len)
-+{
-+ int ret = -1;
-+ if (obj && attr_name) {
-+ PyObject* val_obj = (val ?
-+ PyBytes_FromStringAndSize(val, len) :
-+ Py_BuildValue(""));
-+ ret = PyObject_SetAttrString(obj, attr_name, val_obj);
-+ Py_DECREF(val_obj);
-+ }
-+ return ret;
-+}
-+
-+static int
-+py_netsnmp_attr_bytes(PyObject *obj, char * attr_name, char **val,
-+ Py_ssize_t *len)
-+{
-+ *val = NULL;
-+ if (obj && attr_name && PyObject_HasAttrString(obj, attr_name)) {
-+ PyObject *attr = PyObject_GetAttrString(obj, attr_name);
-+ if (attr) {
- int retval;
-- retval = PyString_AsStringAndSize(attr, val, len);
-+ retval = PyBytes_AsStringAndSize(attr, val, len);
- Py_DECREF(attr);
- return retval;
- }
-@@ -870,7 +896,7 @@ py_netsnmp_attr_long(PyObject *obj, char
- if (obj && attr_name && PyObject_HasAttrString(obj, attr_name)) {
- PyObject *attr = PyObject_GetAttrString(obj, attr_name);
- if (attr) {
-- val = PyInt_AsLong(attr);
-+ val = PyLong_AsLong(attr);
- Py_DECREF(attr);
- }
- }
-@@ -955,13 +981,13 @@ __py_netsnmp_update_session_errors(PyObj
-
- py_netsnmp_attr_set_string(session, "ErrorStr", err_str, STRLEN(err_str));
-
-- tmp_for_conversion = PyInt_FromLong(err_num);
-+ tmp_for_conversion = PyLong_FromLong(err_num);
- if (!tmp_for_conversion)
- return; /* nothing better to do? */
- PyObject_SetAttrString(session, "ErrorNum", tmp_for_conversion);
- Py_DECREF(tmp_for_conversion);
-
-- tmp_for_conversion = PyInt_FromLong(err_ind);
-+ tmp_for_conversion = PyLong_FromLong(err_ind);
- if (!tmp_for_conversion)
- return; /* nothing better to do? */
- PyObject_SetAttrString(session, "ErrorInd", tmp_for_conversion);
-@@ -1323,7 +1349,7 @@ netsnmp_get(PyObject *self, PyObject *ar
-
- ss = (SnmpSession *)py_netsnmp_attr_void_ptr(session, "sess_ptr");
-
-- if (py_netsnmp_attr_string(session, "ErrorStr", &tmpstr, &tmplen) < 0) {
-+ if (py_netsnmp_attr_bytes(session, "ErrorStr", &tmpstr, &tmplen) < 0) {
- goto done;
- }
-
-@@ -2015,7 +2041,7 @@ netsnmp_walk(PyObject *self, PyObject *a
- vars, tp, type, sprintval_flag);
- str_buf[len] = '\0';
-
-- py_netsnmp_attr_set_string(varbind, "val", (char *) str_buf,
-+ py_netsnmp_attr_set_bytes(varbind, "val", (char *) str_buf,
- len);
-
- /* push the varbind onto the return varbinds */
-@@ -2266,7 +2292,7 @@ netsnmp_getbulk(PyObject *self, PyObject
-
- __get_type_str(type, type_str);
-
-- py_netsnmp_attr_set_string(varbind, "type", type_str,
-+ py_netsnmp_attr_set_bytes(varbind, "type", type_str,
- strlen(type_str));
-
- len = __snprint_value((char **)&str_buf, &str_buf_len,
-@@ -2409,7 +2435,7 @@ netsnmp_set(PyObject *self, PyObject *ar
- }
- }
-
-- if (py_netsnmp_attr_string(varbind, "val", &val, &tmplen) < 0) {
-+ if (py_netsnmp_attr_bytes(varbind, "val", &val, &tmplen) < 0) {
- snmp_free_pdu(pdu);
- goto done;
- }
-@@ -2467,7 +2493,6 @@ netsnmp_set(PyObject *self, PyObject *ar
- return (ret ? ret : Py_BuildValue(""));
- }
-
--
- static PyMethodDef ClientMethods[] = {
- {"session", netsnmp_create_session, METH_VARARGS,
- "create a netsnmp session."},
-@@ -2490,10 +2515,23 @@ static PyMethodDef ClientMethods[] = {
- {NULL, NULL, 0, NULL} /* Sentinel */
- };
-
-+static struct PyModuleDef ModuleDefinition = {
-+ PyModuleDef_HEAD_INIT,
-+ "client_intf",
-+ NULL,
-+ -1,
-+ ClientMethods,
-+ NULL,
-+ NULL,
-+ NULL,
-+ NULL
-+};
-+
- PyMODINIT_FUNC
--initclient_intf(void)
-+PyInit_client_intf(void)
- {
-- (void) Py_InitModule("client_intf", ClientMethods);
-+ PyObject *module = PyModule_Create(&ModuleDefinition);
-+ return module;
- }
-
-
-diff -urNp a/python/netsnmp/client.py b/python/netsnmp/client.py
---- a/python/netsnmp/client.py 2018-07-18 17:11:53.262147321 +0200
-+++ b/python/netsnmp/client.py 2018-07-18 17:37:10.489221397 +0200
-@@ -34,12 +34,12 @@ def _parse_session_args(kargs):
- 'TheirHostname':'',
- 'TrustCert':''
- }
-- keys = kargs.keys()
-+ keys = list(kargs.keys())
- for key in keys:
-- if sessArgs.has_key(key):
-+ if key in sessArgs:
- sessArgs[key] = kargs[key]
- else:
-- print >>stderr, "ERROR: unknown key", key
-+ print("ERROR: unknown key", key, file=stderr)
- return sessArgs
-
- def STR(obj):
-@@ -55,7 +55,7 @@ class Varbind(object):
- def __init__(self, tag=None, iid=None, val=None, type_arg=None):
- self.tag = STR(tag)
- self.iid = STR(iid)
-- self.val = STR(val)
-+ self.val = val
- self.type = STR(type_arg)
- # parse iid out of tag if needed
- if iid is None and tag is not None:
-@@ -65,7 +65,10 @@ class Varbind(object):
- (self.tag, self.iid) = match.group(1, 2)
-
- def __setattr__(self, name, val):
-- self.__dict__[name] = STR(val)
-+ if name == 'val':
-+ self.__dict__[name] = val
-+ else:
-+ self.__dict__[name] = STR(val)
-
- def __str__(self):
- return obj_to_str(self)
-@@ -132,7 +135,7 @@ class Session(object):
-
- sess_args = _parse_session_args(args)
-
-- for k, v in sess_args.items():
-+ for k, v in list(sess_args.items()):
- self.__dict__[k] = v
-
-
-diff -urNp a/python/netsnmp/__init__.py b/python/netsnmp/__init__.py
---- a/python/netsnmp/__init__.py 2018-07-18 17:11:53.262147321 +0200
-+++ b/python/netsnmp/__init__.py 2018-07-18 17:37:32.553172525 +0200
-@@ -1 +1 @@
--from client import *
-+from .client import *
-diff -urNp a/python/netsnmp/tests/test.py b/python/netsnmp/tests/test.py
---- a/python/netsnmp/tests/test.py 2018-07-18 17:11:53.263147318 +0200
-+++ b/python/netsnmp/tests/test.py 2018-07-18 17:38:21.272063355 +0200
-@@ -12,7 +12,7 @@ def snmp_dest(**kwargs):
- 'DestHost': 'localhost:' + os.environ.get("SNMP_SNMPD_PORT", 161),
- 'Community': 'public',
- }
-- for key, value in kwargs.iteritems():
-+ for key, value in kwargs.items():
- dest[key] = value
- return dest
-
-@@ -62,107 +62,107 @@ class BasicTests(unittest.TestCase):
- self.assertEqual(var.iid, '')
-
- def test_v1_get(self):
-- print "\n"
-- print "---v1 GET tests -------------------------------------\n"
-+ print("\n")
-+ print("---v1 GET tests -------------------------------------\n")
- var = netsnmp.Varbind('.1.3.6.1.2.1.1.1', '0')
- res = netsnmp.snmpget(var, **snmp_dest())
-
-- print "v1 snmpget result: ", res, "\n"
-+ print("v1 snmpget result: ", res, "\n")
- self.assertEqual(len(res), 1)
-
-- print "v1 get var: ", var.tag, var.iid, "=", var.val, '(', var.type, ')'
-+ print("v1 get var: ", var.tag, var.iid, "=", var.val, '(', var.type, ')')
- self.assertEqual(var.tag, 'sysDescr')
- self.assertEqual(var.iid, '0')
- self.assertEqual(var.val, res[0])
- self.assertEqual(var.type, 'OCTETSTR')
-
- def test_v1_getnext(self):
-- print "\n"
-- print "---v1 GETNEXT tests-------------------------------------\n"
-+ print("\n")
-+ print("---v1 GETNEXT tests-------------------------------------\n")
- var = netsnmp.Varbind('.1.3.6.1.2.1.1.1', '0')
- res = netsnmp.snmpgetnext(var, **snmp_dest())
-
-- print "v1 snmpgetnext result: ", res, "\n"
-+ print("v1 snmpgetnext result: ", res, "\n")
- self.assertEqual(len(res), 1)
-
-- print "v1 getnext var: ", var.tag, var.iid, "=", var.val, '(', var.type, ')'
-+ print("v1 getnext var: ", var.tag, var.iid, "=", var.val, '(', var.type, ')')
- self.assertTrue(var.tag is not None)
- self.assertTrue(var.iid is not None)
- self.assertTrue(var.val is not None)
- self.assertTrue(var.type is not None)
-
- def test_v1_set(self):
-- print "\n"
-- print "---v1 SET tests-------------------------------------\n"
-+ print("\n")
-+ print("---v1 SET tests-------------------------------------\n")
- var = netsnmp.Varbind('sysLocation', '0', 'my new location')
- res = netsnmp.snmpset(var, **snmp_dest())
-
-- print "v1 snmpset result: ", res, "\n"
-+ print("v1 snmpset result: ", res, "\n")
- self.assertEqual(res, 1)
-
-- print "v1 set var: ", var.tag, var.iid, "=", var.val, '(', var.type, ')'
-+ print("v1 set var: ", var.tag, var.iid, "=", var.val, '(', var.type, ')')
- self.assertEqual(var.tag, 'sysLocation')
- self.assertEqual(var.iid, '0')
- self.assertEqual(var.val, 'my new location')
- self.assertTrue(var.type is None)
-
- def test_v1_walk(self):
-- print "\n"
-- print "---v1 walk tests-------------------------------------\n"
-+ print("\n")
-+ print("---v1 walk tests-------------------------------------\n")
- varlist = netsnmp.VarList(netsnmp.Varbind('system'))
-
-- print "v1 varlist walk in: "
-+ print("v1 varlist walk in: ")
- for var in varlist:
-- print " ", var.tag, var.iid, "=", var.val, '(', var.type, ')'
-+ print(" ", var.tag, var.iid, "=", var.val, '(', var.type, ')')
-
- res = netsnmp.snmpwalk(varlist, **snmp_dest())
-- print "v1 snmpwalk result: ", res, "\n"
-+ print("v1 snmpwalk result: ", res, "\n")
- self.assertTrue(len(res) > 0)
-
- for var in varlist:
-- print var.tag, var.iid, "=", var.val, '(', var.type, ')'
-+ print(var.tag, var.iid, "=", var.val, '(', var.type, ')')
-
- def test_v1_walk_2(self):
-- print "\n"
-- print "---v1 walk 2-------------------------------------\n"
-+ print("\n")
-+ print("---v1 walk 2-------------------------------------\n")
-
-- print "v1 varbind walk in: "
-+ print("v1 varbind walk in: ")
- var = netsnmp.Varbind('system')
- self.assertEqual(var.tag, 'system')
- self.assertEqual(var.iid, '')
- self.assertEqual(var.val, None)
- self.assertEqual(var.type, None)
- res = netsnmp.snmpwalk(var, **snmp_dest())
-- print "v1 snmpwalk result (should be = orig): ", res, "\n"
-+ print("v1 snmpwalk result (should be = orig): ", res, "\n")
- self.assertTrue(len(res) > 0)
-
-- print var.tag, var.iid, "=", var.val, '(', var.type, ')'
-+ print(var.tag, var.iid, "=", var.val, '(', var.type, ')')
- self.assertEqual(var.tag, 'system')
- self.assertEqual(var.iid, '')
- self.assertEqual(var.val, None)
- self.assertEqual(var.type, None)
-
- def test_v1_mv_get(self):
-- print "\n"
-- print "---v1 multi-varbind test-------------------------------------\n"
-+ print("\n")
-+ print("---v1 multi-varbind test-------------------------------------\n")
- sess = setup_v1()
-
- varlist = netsnmp.VarList(netsnmp.Varbind('sysUpTime', 0),
- netsnmp.Varbind('sysContact', 0),
- netsnmp.Varbind('sysLocation', 0))
- vals = sess.get(varlist)
-- print "v1 sess.get result: ", vals, "\n"
-+ print("v1 sess.get result: ", vals, "\n")
- self.assertTrue(len(vals) > 0)
-
- for var in varlist:
-- print var.tag, var.iid, "=", var.val, '(', var.type, ')'
-+ print(var.tag, var.iid, "=", var.val, '(', var.type, ')')
-
- vals = sess.getnext(varlist)
-- print "v1 sess.getnext result: ", vals, "\n"
-+ print("v1 sess.getnext result: ", vals, "\n")
- self.assertTrue(len(vals) > 0)
-
- for var in varlist:
-- print var.tag, var.iid, "=", var.val, '(', var.type, ')'
-+ print(var.tag, var.iid, "=", var.val, '(', var.type, ')')
-
- varlist = netsnmp.VarList(netsnmp.Varbind('sysUpTime'),
- netsnmp.Varbind('sysORLastChange'),
-@@ -171,71 +171,71 @@ class BasicTests(unittest.TestCase):
- netsnmp.Varbind('sysORUpTime'))
-
- vals = sess.getbulk(2, 8, varlist)
-- print "v1 sess.getbulk result: ", vals, "\n"
-+ print("v1 sess.getbulk result: ", vals, "\n")
- self.assertEqual(vals, None) # GetBulk is not supported for v1
-
- for var in varlist:
-- print var.tag, var.iid, "=", var.val, '(', var.type, ')'
-+ print(var.tag, var.iid, "=", var.val, '(', var.type, ')')
-
- def test_v1_set_2(self):
-- print "\n"
-- print "---v1 set2-------------------------------------\n"
-+ print("\n")
-+ print("---v1 set2-------------------------------------\n")
-
- sess = setup_v1()
- varlist = netsnmp.VarList(
- netsnmp.Varbind('sysLocation', '0', 'my newer location'))
- res = sess.set(varlist)
-- print "v1 sess.set result: ", res, "\n"
-+ print("v1 sess.set result: ", res, "\n")
-
- def test_v1_walk_3(self):
-- print "\n"
-- print "---v1 walk3-------------------------------------\n"
-+ print("\n")
-+ print("---v1 walk3-------------------------------------\n")
-
- sess = setup_v1()
- varlist = netsnmp.VarList(netsnmp.Varbind('system'))
-
- vals = sess.walk(varlist)
-- print "v1 sess.walk result: ", vals, "\n"
-+ print("v1 sess.walk result: ", vals, "\n")
- self.assertTrue(len(vals) > 0)
-
- for var in varlist:
-- print " ", var.tag, var.iid, "=", var.val, '(', var.type, ')'
-+ print(" ", var.tag, var.iid, "=", var.val, '(', var.type, ')')
-
- def test_v2c_get(self):
-- print "\n"
-- print "---v2c get-------------------------------------\n"
-+ print("\n")
-+ print("---v2c get-------------------------------------\n")
-
- sess = setup_v2()
- varlist = netsnmp.VarList(netsnmp.Varbind('sysUpTime', 0),
- netsnmp.Varbind('sysContact', 0),
- netsnmp.Varbind('sysLocation', 0))
- vals = sess.get(varlist)
-- print "v2 sess.get result: ", vals, "\n"
-+ print("v2 sess.get result: ", vals, "\n")
- self.assertEqual(len(vals), 3)
-
- def test_v2c_getnext(self):
-- print "\n"
-- print "---v2c getnext-------------------------------------\n"
-+ print("\n")
-+ print("---v2c getnext-------------------------------------\n")
-
- sess = setup_v2()
- varlist = netsnmp.VarList(netsnmp.Varbind('sysUpTime', 0),
- netsnmp.Varbind('sysContact', 0),
- netsnmp.Varbind('sysLocation', 0))
- for var in varlist:
-- print var.tag, var.iid, "=", var.val, '(', var.type, ')'
-- print "\n"
-+ print(var.tag, var.iid, "=", var.val, '(', var.type, ')')
-+ print("\n")
-
- vals = sess.getnext(varlist)
-- print "v2 sess.getnext result: ", vals, "\n"
-+ print("v2 sess.getnext result: ", vals, "\n")
- self.assertTrue(len(vals) > 0)
-
- for var in varlist:
-- print var.tag, var.iid, "=", var.val, '(', var.type, ')'
-- print "\n"
-+ print(var.tag, var.iid, "=", var.val, '(', var.type, ')')
-+ print("\n")
-
- def test_v2c_getbulk(self):
-- print "\n"
-- print "---v2c getbulk-------------------------------------\n"
-+ print("\n")
-+ print("---v2c getbulk-------------------------------------\n")
-
- sess = setup_v2()
- varlist = netsnmp.VarList(netsnmp.Varbind('sysUpTime'),
-@@ -245,16 +245,16 @@ class BasicTests(unittest.TestCase):
- netsnmp.Varbind('sysORUpTime'))
-
- vals = sess.getbulk(2, 8, varlist)
-- print "v2 sess.getbulk result: ", vals, "\n"
-+ print("v2 sess.getbulk result: ", vals, "\n")
- self.assertTrue(len(vals) > 0)
-
- for var in varlist:
-- print var.tag, var.iid, "=", var.val, '(', var.type, ')'
-- print "\n"
-+ print(var.tag, var.iid, "=", var.val, '(', var.type, ')')
-+ print("\n")
-
- def test_v2c_set(self):
-- print "\n"
-- print "---v2c set-------------------------------------\n"
-+ print("\n")
-+ print("---v2c set-------------------------------------\n")
-
- sess = setup_v2()
-
-@@ -262,54 +262,54 @@ class BasicTests(unittest.TestCase):
- netsnmp.Varbind('sysLocation', '0', 'my even newer location'))
-
- res = sess.set(varlist)
-- print "v2 sess.set result: ", res, "\n"
-+ print("v2 sess.set result: ", res, "\n")
- self.assertEqual(res, 1)
-
- def test_v2c_walk(self):
-- print "\n"
-- print "---v2c walk-------------------------------------\n"
-+ print("\n")
-+ print("---v2c walk-------------------------------------\n")
-
- sess = setup_v2()
-
- varlist = netsnmp.VarList(netsnmp.Varbind('system'))
-
- vals = sess.walk(varlist)
-- print "v2 sess.walk result: ", vals, "\n"
-+ print("v2 sess.walk result: ", vals, "\n")
- self.assertTrue(len(vals) > 0)
-
- for var in varlist:
-- print " ", var.tag, var.iid, "=", var.val, '(', var.type, ')'
-+ print(" ", var.tag, var.iid, "=", var.val, '(', var.type, ')')
-
- def test_v3_get(self):
-- print "\n"
-+ print("\n")
- sess = setup_v3();
- varlist = netsnmp.VarList(netsnmp.Varbind('sysUpTime', 0),
- netsnmp.Varbind('sysContact', 0),
- netsnmp.Varbind('sysLocation', 0))
-- print "---v3 get-------------------------------------\n"
-+ print("---v3 get-------------------------------------\n")
- vals = sess.get(varlist)
-- print "v3 sess.get result: ", vals, "\n"
-+ print("v3 sess.get result: ", vals, "\n")
- self.assertTrue(len(vals) > 0)
-
- for var in varlist:
-- print var.tag, var.iid, "=", var.val, '(', var.type, ')'
-- print "\n"
-+ print(var.tag, var.iid, "=", var.val, '(', var.type, ')')
-+ print("\n")
-
- def test_v3_getnext(self):
-- print "\n"
-- print "---v3 getnext-------------------------------------\n"
-+ print("\n")
-+ print("---v3 getnext-------------------------------------\n")
-
- sess = setup_v3();
- varlist = netsnmp.VarList(netsnmp.Varbind('sysUpTime', 0),
- netsnmp.Varbind('sysContact', 0),
- netsnmp.Varbind('sysLocation', 0))
- vals = sess.getnext(varlist)
-- print "v3 sess.getnext result: ", vals, "\n"
-+ print("v3 sess.getnext result: ", vals, "\n")
- self.assertTrue(len(vals) > 0)
-
- for var in varlist:
-- print var.tag, var.iid, "=", var.val, '(', var.type, ')'
-- print "\n"
-+ print(var.tag, var.iid, "=", var.val, '(', var.type, ')')
-+ print("\n")
-
- def test_v3_getbulk(self):
- sess = setup_v3();
-@@ -320,47 +320,47 @@ class BasicTests(unittest.TestCase):
- netsnmp.Varbind('sysORUpTime'))
-
- vals = sess.getbulk(2, 8, varlist)
-- print "v3 sess.getbulk result: ", vals, "\n"
-+ print("v3 sess.getbulk result: ", vals, "\n")
- self.assertTrue(len(vals) > 0)
-
- for var in varlist:
-- print var.tag, var.iid, "=", var.val, '(', var.type, ')'
-- print "\n"
-+ print(var.tag, var.iid, "=", var.val, '(', var.type, ')')
-+ print("\n")
-
- def test_v3_set(self):
-- print "\n"
-- print "---v3 set-------------------------------------\n"
-+ print("\n")
-+ print("---v3 set-------------------------------------\n")
-
- sess = setup_v3();
- varlist = netsnmp.VarList(
- netsnmp.Varbind('sysLocation', '0', 'my final destination'))
- res = sess.set(varlist)
-- print "v3 sess.set result: ", res, "\n"
-+ print("v3 sess.set result: ", res, "\n")
- self.assertEqual(res, 1)
-
- def test_v3_walk(self):
-- print "\n"
-- print "---v3 walk-------------------------------------\n"
-+ print("\n")
-+ print("---v3 walk-------------------------------------\n")
- sess = setup_v3();
- varlist = netsnmp.VarList(netsnmp.Varbind('system'))
-
- vals = sess.walk(varlist)
-- print "v3 sess.walk result: ", vals, "\n"
-+ print("v3 sess.walk result: ", vals, "\n")
- self.assertTrue(len(vals) > 0)
-
- for var in varlist:
-- print " ", var.tag, var.iid, "=", var.val, '(', var.type, ')'
-+ print(" ", var.tag, var.iid, "=", var.val, '(', var.type, ')')
-
-
- class SetTests(unittest.TestCase):
- """SNMP set tests for the Net-SNMP Python interface"""
- def testFuncs(self):
- """Test code"""
-- print "\n-------------- SET Test Start ----------------------------\n"
-+ print("\n-------------- SET Test Start ----------------------------\n")
-
- var = netsnmp.Varbind('sysUpTime', '0')
- res = netsnmp.snmpget(var, **snmp_dest())
-- print "uptime = ", res[0]
-+ print("uptime = ", res[0])
- self.assertEqual(len(res), 1)
-
-
-@@ -370,19 +370,19 @@ class SetTests(unittest.TestCase):
-
- var = netsnmp.Varbind('sysUpTime', '0')
- res = netsnmp.snmpget(var, **snmp_dest())
-- print "uptime = ", res[0]
-+ print("uptime = ", res[0])
- self.assertEqual(len(res), 1)
-
- var = netsnmp.Varbind('nsCacheEntry')
- res = netsnmp.snmpgetnext(var, **snmp_dest())
-- print "var = ", var.tag, var.iid, "=", var.val, '(', var.type, ')'
-+ print("var = ", var.tag, var.iid, "=", var.val, '(', var.type, ')')
- self.assertEqual(len(res), 1)
-
- var.val = 65
- res = netsnmp.snmpset(var, **snmp_dest())
- self.assertEqual(res, 1)
- res = netsnmp.snmpget(var, **snmp_dest())
-- print "var = ", var.tag, var.iid, "=", var.val, '(', var.type, ')'
-+ print("var = ", var.tag, var.iid, "=", var.val, '(', var.type, ')')
- self.assertEqual(len(res), 1)
- self.assertEqual(res[0], '65');
-
-@@ -394,7 +394,7 @@ class SetTests(unittest.TestCase):
- netsnmp.Varbind('.1.3.6.1.6.3.12.1.2.1.9.116.101.115.116', '', 4))
- res = sess.set(varlist)
-
-- print "res = ", res
-+ print("res = ", res)
- self.assertEqual(res, 1)
-
- varlist = netsnmp.VarList(netsnmp.Varbind('snmpTargetAddrTDomain'),
-@@ -414,15 +414,15 @@ class SetTests(unittest.TestCase):
- self.assertEqual(varlist[2].val, '3')
-
- for var in varlist:
-- print var.tag, var.iid, "=", var.val, '(', var.type, ')'
-- print "\n"
-+ print(var.tag, var.iid, "=", var.val, '(', var.type, ')')
-+ print("\n")
-
- varlist = netsnmp.VarList(
- netsnmp.Varbind('.1.3.6.1.6.3.12.1.2.1.9.116.101.115.116', '', 6))
-
- res = sess.set(varlist)
-
-- print "res = ", res
-+ print("res = ", res)
- self.assertEqual(res, 1)
-
- varlist = netsnmp.VarList(netsnmp.Varbind('snmpTargetAddrTDomain'),
-@@ -436,10 +436,10 @@ class SetTests(unittest.TestCase):
- self.assertNotEqual(varlist[2].tag, 'snmpTargetAddrRowStatus')
-
- for var in varlist:
-- print var.tag, var.iid, "=", var.val, '(', var.type, ')'
-- print "\n"
-+ print(var.tag, var.iid, "=", var.val, '(', var.type, ')')
-+ print("\n")
-
-- print "\n-------------- SET Test End ----------------------------\n"
-+ print("\n-------------- SET Test End ----------------------------\n")
-
-
- if __name__ == '__main__':
-diff -urNp a/python/setup.py b/python/setup.py
---- a/python/setup.py 2018-07-18 17:11:53.262147321 +0200
-+++ b/python/setup.py 2018-07-18 17:40:36.922751382 +0200
-@@ -9,9 +9,9 @@ intree=0
-
- args = sys.argv[:]
- for arg in args:
-- if string.find(arg,'--basedir=') == 0:
-- basedir = string.split(arg,'=')[1]
-- sys.argv.remove(arg)
-+ if arg.find('--basedir=') == 0:
-+ basedir = arg.split('=')[1]
-+ sys.argv.remove(arg) #tabs
- intree=1
-
- if intree:
diff --git a/source/n/net-snmp/net-snmp-5.8-test-debug.patch b/source/n/net-snmp/net-snmp-5.8-test-debug.patch
deleted file mode 100644
index 1ecd2abd1..000000000
--- a/source/n/net-snmp/net-snmp-5.8-test-debug.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Don't check tests which depend on DNS - it's disabled in Koji
-
-diff -urNp a/testing/fulltests/default/T070com2sec_simple b/testing/fulltests/default/T070com2sec_simple
---- a/testing/fulltests/default/T070com2sec_simple 2018-07-18 11:52:56.081185545 +0200
-+++ b/testing/fulltests/default/T070com2sec_simple 2018-07-18 11:54:18.843968880 +0200
-@@ -134,6 +134,10 @@ SAVECHECKAGENT '<"c406a", 255.255.255.25
- SAVECHECKAGENT 'line 30: Error:' # msg from h_strerror so it varies
- SAVECHECKAGENT 'line 31: Error:' # msg from h_strerror so it varies
-
-+FINISHED
-+
-+# don't test the rest, it depends on DNS, which is not available in Koji
-+
- CHECKAGENT '<"c408a"'
- if [ "$snmp_last_test_result" -eq 0 ] ; then
- CHECKAGENT 'line 32: Error:'
-diff -urNp a/testing/fulltests/default/T071com2sec6_simple b/testing/fulltests/default/T071com2sec6_simple
---- a/testing/fulltests/default/T071com2sec6_simple 2018-07-18 11:52:56.080185548 +0200
-+++ b/testing/fulltests/default/T071com2sec6_simple 2018-07-18 11:55:17.779818732 +0200
-@@ -132,6 +132,10 @@ SAVECHECKAGENT '<"c606a", ffff:ffff:ffff
- SAVECHECKAGENT 'line 27: Error:'
- SAVECHECKAGENT 'line 28: Error:'
-
-+FINISHED
-+
-+# don't test the rest, it depends on DNS, which is not available in Koji
-+
- # 608
- CHECKAGENT '<"c608a"'
- if [ "$snmp_last_test_result" -eq 0 ] ; then
diff --git a/source/n/net-snmp/net-snmp.SlackBuild b/source/n/net-snmp/net-snmp.SlackBuild
index a138c357c..2582c2f92 100755
--- a/source/n/net-snmp/net-snmp.SlackBuild
+++ b/source/n/net-snmp/net-snmp.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2014, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2014, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=net-snmp
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-6}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -63,6 +63,8 @@ else
LIBDIRSUFFIX=""
fi
+NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "}
+
cd $TMP
rm -rf ${PKGNAM}-${VERSION}
tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1
@@ -76,23 +78,12 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-zcat $CWD/net-snmp-5.7.2-pie.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/net-snmp-5.8-dir-fix.patch.gz | patch -p1 --verbose || exit 1
zcat $CWD/net-snmp-5.8-multilib.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/net-snmp-5.8-test-debug.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/net-snmp-5.7.2-autoreconf.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/net-snmp-5.8-agentx-disconnect-crash.patch.gz | patch -p1 --verbose || exit 1
zcat $CWD/net-snmp-5.7.2-cert-path.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/net-snmp-5.8-cflags.patch.gz | patch -p1 --verbose || exit 1
zcat $CWD/net-snmp-5.8-Remove-U64-typedef.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/net-snmp-5.8-libnetsnmptrapd-against-MYSQL_LIBS.patch.gz | patch -p1 --verbose || exit 1
zcat $CWD/net-snmp-5.7.3-iterator-fix.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/net-snmp-5.8-autofs-skip.patch.gz | patch -p1 --verbose || exit 1
zcat $CWD/net-snmp-5.8-modern-rpm-api.patch.gz | patch -p1 --verbose || exit 1
-# Not sure about this one?
-#zcat $CWD/net-snmp-5.8-python3.patch.gz | patch -p1 --verbose || exit 1
-
# Fix destdir for python modules
#sed -i "s|\$(PYMAKE) install|\$(PYMAKE) install --root=$PKG|" \
# Makefile.in
@@ -123,8 +114,7 @@ CFLAGS="$SLKCFLAGS" \
--build=$ARCH-slackware-linux || exit 1
# Build and install:
-# This seems to not play well with "-j N"...
-make INSTALLDIRS=vendor || exit 1
+make $NUMJOBS INSTALLDIRS=vendor || exit 1
make install INSTALLDIRS=vendor DESTDIR=$PKG || exit 1
# Don't ship .la files:
@@ -137,8 +127,6 @@ if [ -d $PKG/usr/share/man/man3 ]; then
rmdir $PKG/usr/share/man/man3 $PKG/usr/share/man
fi
mkdir -p $PKG/usr
-mv $PKG/usr/share/man $PKG/usr
-
mkdir -p $PKG/var/lib/net-snmp/{cert,mib}_indexes
mkdir -p $PKG/etc/snmp
zcat $CWD/snmpd.conf.gz > $PKG/etc/snmp/snmpd.conf.new
@@ -188,7 +176,7 @@ done
# Add a documentation directory:
mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
cp -a \
- AGENT.txt CHANGES COPYING* CodingStyle EXAMPLE* FAQ \
+ AGENT* CHANGES ChangeLog COPYING* CodingStyle EXAMPLE* FAQ \
INSTALL NEWS PORTING README* TODO \
$PKG/usr/doc/${PKGNAM}-$VERSION
@@ -200,6 +188,14 @@ if [ -r ChangeLog ]; then
touch -r ChangeLog $DOCSDIR/ChangeLog
fi
+# If there's a CHANGES file, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r CHANGES ]; then
+ DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+ cat CHANGES | head -n 1000 > $DOCSDIR/CHANGES
+ touch -r CHANGES $DOCSDIR/CHANGES
+fi
+
mkdir -p $PKG/install
zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/n/ntp/ntp.SlackBuild b/source/n/ntp/ntp.SlackBuild
index 7d2955388..84365398d 100755
--- a/source/n/ntp/ntp.SlackBuild
+++ b/source/n/ntp/ntp.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=ntp
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/n/php/php.SlackBuild b/source/n/php/php.SlackBuild
index 99caf8b78..424f9193b 100755
--- a/source/n/php/php.SlackBuild
+++ b/source/n/php/php.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=php
VERSION=${VERSION:-$(echo php-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
ALPINE=2.23.2
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
generated by cgit v1.2.3 (git 2.26.2) at 2024-04-16 18:10:42 +0000