FreeBSD Bugzilla – Attachment 203650 Details for
Bug 237266
security/denyhosts: Make compatible with python 3
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
python 3
denyhosts-2.6_8 (text/plain), 6.05 KB, created by
Muhammad Moinur Rahman
on 2019-04-13 19:29:16 UTC
(
hide
)
Description:
python 3
Filename:
MIME Type:
Creator:
Muhammad Moinur Rahman
Created:
2019-04-13 19:29:16 UTC
Size:
6.05 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 498614) >+++ Makefile (working copy) >@@ -3,9 +3,10 @@ > > PORTNAME= denyhosts > PORTVERSION= 2.6 >-PORTREVISION= 7 >+PORTREVISION= 8 > CATEGORIES= security > MASTER_SITES= SF >+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} > DISTNAME= DenyHosts-${PORTVERSION} > > MAINTAINER= sunpoet@FreeBSD.org >@@ -13,15 +14,16 @@ > > LICENSE= GPLv2 > >-OPTIONS_DEFINE= DOCS >+USES= cpe python shebangfix >+USE_PYTHON= autoplist distutils >+USE_RC_SUBR= denyhosts > >-USES= cpe python:2.7 shebangfix > REINPLACE_ARGS= -i '' >-USE_PYTHON= autoplist distutils >-USE_RC_SUBR= denyhosts > CPE_VENDOR= phil_schwartz > NO_ARCH= yes > >+OPTIONS_DEFINE= DOCS >+ > PORTDOCS= CHANGELOG.txt LICENSE.txt README.txt > SUB_FILES= pkg-message > SUB_LIST= PYTHON=${PYTHON_CMD} >@@ -34,6 +36,13 @@ > env_OLD_CMD= /bin/env > env_CMD= ${SETENV} > >+.include <bsd.port.pre.mk> >+pre-build: >+.if ${PYTHON_REL} >= 3000 >+ @${LOCALBASE}/bin/2to3-${PYTHON_VER} --no-diffs --nobackups --verbose --write \ >+ ${WRKSRC}/ >+.endif >+ > post-patch: > @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/daemon-control-dist ${WRKSRC}/denyhosts.cfg-dist ${WRKSRC}/setup.py > @${FIND} ${WRKSRC} -type f -name '*.bak' -o -name '*.orig' -delete >@@ -43,4 +52,4 @@ > ${MKDIR} ${STAGEDIR}${DOCSDIR}/ > cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ > >-.include <bsd.port.mk> >+.include <bsd.port.post.mk> >Index: files/patch-DenyHosts__regex.py >=================================================================== >--- files/patch-DenyHosts__regex.py (revision 498614) >+++ files/patch-DenyHosts__regex.py (working copy) >@@ -1,8 +1,8 @@ > # Patch shaped from http://seclists.org/oss-sec/2013/q4/535 > =================================================================== >---- ./DenyHosts/regex.py.orig 2006-12-07 20:47:04.000000000 +0100 >-+++ ./DenyHosts/regex.py 2013-12-23 17:17:42.000000000 +0100 >-@@ -6,22 +6,22 @@ >+--- DenyHosts/regex.py.orig 2006-12-07 19:47:04 UTC >++++ DenyHosts/regex.py >+@@ -6,22 +6,22 @@ import re > > #DATE_FORMAT_REGEX = re.compile(r"""(?P<month>[A-z]{3,3})\s*(?P<day>\d+)""") > >@@ -33,7 +33,7 @@ > > > # these are reserved for future versions >-@@ -42,7 +42,7 @@ >+@@ -42,7 +42,7 @@ for i in FAILED_ENTRY_REGEX_RANGE: > FAILED_ENTRY_REGEX_MAP[i] = rx > > >Index: files/patch-daemon-control-dist >=================================================================== >--- files/patch-daemon-control-dist (revision 498614) >+++ files/patch-daemon-control-dist (working copy) >@@ -1,4 +1,4 @@ >---- daemon-control-dist.orig >+--- daemon-control-dist.orig 2019-04-12 21:50:37 UTC > +++ daemon-control-dist > @@ -11,9 +11,9 @@ > #### Edit these to suit your configuration #### >@@ -11,5 +11,5 @@ > +DENYHOSTS_LOCK = "/var/run/denyhosts" > +DENYHOSTS_CFG = "%%PREFIX%%/share/denyhosts/denyhosts.cfg" > >+ PYTHON_BIN = "/usr/bin/env python" > >- ############################################### >Index: files/patch-denyhosts.cfg-dist >=================================================================== >--- files/patch-denyhosts.cfg-dist (revision 498614) >+++ files/patch-denyhosts.cfg-dist (working copy) >@@ -1,4 +1,4 @@ >---- denyhosts.cfg-dist.orig >+--- denyhosts.cfg-dist.orig 2006-08-20 14:09:57 UTC > +++ denyhosts.cfg-dist > @@ -9,10 +9,10 @@ > # argument >@@ -13,7 +13,7 @@ > # > # SuSE: > #SECURE_LOG = /var/log/messages >-@@ -31,7 +31,7 @@ >+@@ -31,7 +31,7 @@ SECURE_LOG = /var/log/secure > # HOSTS_DENY: the file which contains restricted host access information > # > # Most operating systems: >@@ -22,7 +22,7 @@ > # > # Some BSD (FreeBSD) Unixes: > #HOSTS_DENY = /etc/hosts.allow >-@@ -90,7 +90,7 @@ >+@@ -90,7 +90,7 @@ PURGE_DENY = > # To block all services for the offending host: > #BLOCK_SERVICE = ALL > # To block only sshd: >@@ -31,7 +31,7 @@ > # To only record the offending host and nothing else (if using > # an auxilary file to list the hosts). Refer to: > # http://denyhosts.sourceforge.net/faq.html#aux >-@@ -150,7 +150,7 @@ >+@@ -150,7 +150,7 @@ DENY_THRESHOLD_RESTRICTED = 1 > # Note: it is recommended that you use an absolute pathname > # for this value (eg. /home/foo/denyhosts/data) > # >@@ -40,7 +40,7 @@ > # > ####################################################################### > >-@@ -176,7 +176,7 @@ >+@@ -176,7 +176,7 @@ SUSPICIOUS_LOGIN_REPORT_ALLOWED_HOSTS=YES > # the corresponding hostname will be looked up and reported as well > # (if available). > # >@@ -49,7 +49,7 @@ > # > ###################################################################### > >-@@ -192,10 +192,10 @@ >+@@ -192,10 +192,10 @@ HOSTNAME_LOOKUP=YES > # running at a time. > # > # Redhat/Fedora: >@@ -63,7 +63,7 @@ > # > # Misc > #LOCK_FILE = /tmp/denyhosts.lock >-@@ -414,7 +414,9 @@ >+@@ -414,7 +414,9 @@ AGE_RESET_INVALID=10d > # See this faq entry for more details: > # http://denyhosts.sf.net/faq.html#userdef_regex > # >Index: files/patch-scripts__restricted_from_passwd.py >=================================================================== >--- files/patch-scripts__restricted_from_passwd.py (revision 498614) >+++ files/patch-scripts__restricted_from_passwd.py (working copy) >@@ -1,5 +1,5 @@ >---- ./scripts/restricted_from_passwd.py.orig 2013-12-28 18:51:41.000000000 +0100 >-+++ ./scripts/restricted_from_passwd.py 2013-12-28 18:51:41.000000000 +0100 >+--- scripts/restricted_from_passwd.py.orig 2019-04-12 21:50:37 UTC >++++ scripts/restricted_from_passwd.py > @@ -12,6 +12,7 @@ > ############################################################################ > >Index: files/patch-setup.py >=================================================================== >--- files/patch-setup.py (revision 498614) >+++ files/patch-setup.py (working copy) >@@ -1,6 +1,6 @@ >---- setup.py.orig >+--- setup.py.orig 2006-04-04 23:53:02 UTC > +++ setup.py >-@@ -8,7 +8,7 @@ >+@@ -8,7 +8,7 @@ import sys > from glob import glob > > >@@ -9,7 +9,7 @@ > scriptspath = "%s/scripts" % libpath > pluginspath = "%s/plugins" % libpath > >-@@ -26,11 +26,8 @@ >+@@ -26,11 +26,8 @@ setup(name="DenyHosts", > data_files=[(libpath, glob("denyhosts.cfg-dist")), > (libpath, glob("setup.py")), > (libpath, glob("daemon-control-dist")),
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 237266
: 203650 |
206922