security/py-fail2ban: Update to 0.9.6

[lifanov]

Summary

Update fail2ban to version 0.9.6

Bugzilla: 215239
Submitted by: John W. O'Brien <[e-mail]>
Reviewed by: matthew
Approved by: [e-mail] (maintainer), matthew (mentor)
Differential revision: https://reviews.freebsd.org/D8917

Test Plan

• portlint: OK (no new warnings)
• poudriere: OK (10.3R amd64 with py27, py34, py35)

[matthew]

security/py-fail2ban/files/patch-setup.py

31 ↗

(On Diff #23279)

Hard-coding '/usr/local' as the value of $LOCALBASE should be avoided. One approach is
to insert a token like %%LOCALBASE%% via patch files, and then substitute in the value
of $LOCALBASE by using ${REINPLACE_CMD} in post-patch:

[matthew]

Hmmm... PR 215239 has been closed as a duplicate of PR 215354. I'd only mention 215354 in the commit log.

[matthew]

security/py-fail2ban/files/patch-setup.py

31 ↗

(On Diff #23279)

Also: /usr/local/usr/local -- that's clearly wrong, which is reflected in the
poudriere output:

====> Running Q/A tests (stage-qa)
====> Checking for pkg-plist issues (check-plist)
===> Parsing plist
===> Checking for items in STAGEDIR missing from pkg-plist
Error: Orphaned: @dir %%ETCDIR%%
Error: Orphaned: @dir usr/local/usr/local/%%ETCDIR%%/fail2ban.d
Error: Orphaned: @dir usr/local/usr/local/%%ETCDIR%%/jail.d
===> Checking for items in pkg-plist which are not in STAGEDIR
Error: Missing: @dir %%ETCDIR%%/fail2ban.d
Error: Missing: @dir %%ETCDIR%%/jail.d
===> Error: Plist issues found.
*** [check-plist] Error code 1

[lifanov]

OK, cool, thanks! I'll figure it out with the maintainer. The duplicate situation is that he said that he attached what was an identical patch to his PR, so I would like to give credit to the other submitter as well.

[matthew]

In D8917#184674, @lifanov wrote:

OK, cool, thanks! I'll figure it out with the maintainer. The duplicate situation is that he said that he attached what was an identical patch to his PR, so I would like to give credit to the other submitter as well.

You've mentioned his name in 'Submitted by' -- that should be fine.

[lifanov]

address matthew's feedback by using John W. O'Brien's version instead

Maintainer approved both submissions and this is the one that was
tested. I verified it myself and it works and plist is clean.

[lifanov]

inline comments addressed using a different patch

[matthew]

In D8917#184680, @lifanov wrote:

address matthew's feedback by using John W. O'Brien's version instead

Maintainer approved both submissions and this is the one that was
tested. I verified it myself and it works and plist is clean.

Yeah. Always test things yourself.

[lifanov]

Yep, will do going forward.

[matthew]

Looks good.

head/security/py-fail2ban/Makefile

  *     permissions:    755
  *     nlink:  58283552
  *     uid:    1001
  */
 
 #define DIR_METATABLE "directory iterator metatable"
 
 static int
+lua_dir_iter_pushtype(lua_State *L __unused, const struct dirent *ent __unused)
+{
+
+        /*
+         * This is a non-standard extension to luafilesystem for loader's
+         * benefit.  The extra stat() calls to determine the entry type can
+         * be quite expensive on some systems, so this speeds up enumeration of
+         * /boot greatly by providing the type up front.
+         *
+         * This extension is compatible enough with luafilesystem, in that we're
+         * just using an extra return value for the iterator.
+         */
+#ifdef _STANDALONE
+        lua_pushinteger(L, ent->d_type);
+        return 1;
+#else
+        return 0;
+#endif
+}
+
+static int
 lua_dir_iter_next(lua_State *L)
 {
         struct dirent *entry;
         DIR *dp, **dpp;
 
         dpp = (DIR **)luaL_checkudata(L, 1, DIR_METATABLE);
         dp = *dpp;
         luaL_argcheck(L, dp != NULL, 1, "closed directory");
 
 #ifdef _STANDALONE
         entry = readdirfd(dp->fd);
 #else
         entry = readdir(dp);
 #endif
         if (entry == NULL) {
                 closedir(dp);
                 *dpp = NULL;
                 return 0;
         }
 
         lua_pushstring(L, entry->d_name);
-        return 1;
+        return 1 + lua_dir_iter_pushtype(L, entry);
 }
 
 static int
 lua_dir_iter_close(lua_State *L)
 {
         DIR *dp, **dpp;
 
         dpp = (DIR **)lua_touserdata(L, 1);

 };
 #undef REG_SIMPLE
 
 int
 luaopen_lfs(lua_State *L)
 {
         register_metatable(L);
         luaL_newlib(L, fslib);
+#ifdef _STANDALONE
+        /* Non-standard extension for loader, used with lfs.dir(). */
+        lua_pushinteger(L, DT_DIR);
+        lua_setfield(L, -2, "DT_DIR");
+#endif
         return 1;
 }

head/security/py-fail2ban/distinfo

  *     permissions:    755
  *     nlink:  58283552
  *     uid:    1001
  */
 
 #define DIR_METATABLE "directory iterator metatable"
 
 static int
+lua_dir_iter_pushtype(lua_State *L __unused, const struct dirent *ent __unused)
+{
+
+        /*
+         * This is a non-standard extension to luafilesystem for loader's
+         * benefit.  The extra stat() calls to determine the entry type can
+         * be quite expensive on some systems, so this speeds up enumeration of
+         * /boot greatly by providing the type up front.
+         *
+         * This extension is compatible enough with luafilesystem, in that we're
+         * just using an extra return value for the iterator.
+         */
+#ifdef _STANDALONE
+        lua_pushinteger(L, ent->d_type);
+        return 1;
+#else
+        return 0;
+#endif
+}
+
+static int
 lua_dir_iter_next(lua_State *L)
 {
         struct dirent *entry;
         DIR *dp, **dpp;
 
         dpp = (DIR **)luaL_checkudata(L, 1, DIR_METATABLE);
         dp = *dpp;
         luaL_argcheck(L, dp != NULL, 1, "closed directory");
 
 #ifdef _STANDALONE
         entry = readdirfd(dp->fd);
 #else
         entry = readdir(dp);
 #endif
         if (entry == NULL) {
                 closedir(dp);
                 *dpp = NULL;
                 return 0;
         }
 
         lua_pushstring(L, entry->d_name);
-        return 1;
+        return 1 + lua_dir_iter_pushtype(L, entry);
 }
 
 static int
 lua_dir_iter_close(lua_State *L)
 {
         DIR *dp, **dpp;
 
         dpp = (DIR **)lua_touserdata(L, 1);

 };
 #undef REG_SIMPLE
 
 int
 luaopen_lfs(lua_State *L)
 {
         register_metatable(L);
         luaL_newlib(L, fslib);
+#ifdef _STANDALONE
+        /* Non-standard extension for loader, used with lfs.dir(). */
+        lua_pushinteger(L, DT_DIR);
+        lua_setfield(L, -2, "DT_DIR");
+#endif
         return 1;
 }

head/security/py-fail2ban/files/patch-config_filter.d_common.conf

  *     permissions:    755
  *     nlink:  58283552
  *     uid:    1001
  */
 
 #define DIR_METATABLE "directory iterator metatable"
 
 static int
+lua_dir_iter_pushtype(lua_State *L __unused, const struct dirent *ent __unused)
+{
+
+        /*
+         * This is a non-standard extension to luafilesystem for loader's
+         * benefit.  The extra stat() calls to determine the entry type can
+         * be quite expensive on some systems, so this speeds up enumeration of
+         * /boot greatly by providing the type up front.
+         *
+         * This extension is compatible enough with luafilesystem, in that we're
+         * just using an extra return value for the iterator.
+         */
+#ifdef _STANDALONE
+        lua_pushinteger(L, ent->d_type);
+        return 1;
+#else
+        return 0;
+#endif
+}
+
+static int
 lua_dir_iter_next(lua_State *L)
 {
         struct dirent *entry;
         DIR *dp, **dpp;
 
         dpp = (DIR **)luaL_checkudata(L, 1, DIR_METATABLE);
         dp = *dpp;
         luaL_argcheck(L, dp != NULL, 1, "closed directory");
 
 #ifdef _STANDALONE
         entry = readdirfd(dp->fd);
 #else
         entry = readdir(dp);
 #endif
         if (entry == NULL) {
                 closedir(dp);
                 *dpp = NULL;
                 return 0;
         }
 
         lua_pushstring(L, entry->d_name);
-        return 1;
+        return 1 + lua_dir_iter_pushtype(L, entry);
 }
 
 static int
 lua_dir_iter_close(lua_State *L)
 {
         DIR *dp, **dpp;
 
         dpp = (DIR **)lua_touserdata(L, 1);

 };
 #undef REG_SIMPLE
 
 int
 luaopen_lfs(lua_State *L)
 {
         register_metatable(L);
         luaL_newlib(L, fslib);
+#ifdef _STANDALONE
+        /* Non-standard extension for loader, used with lfs.dir(). */
+        lua_pushinteger(L, DT_DIR);
+        lua_setfield(L, -2, "DT_DIR");
+#endif
         return 1;
 }

head/security/py-fail2ban/files/patch-setup.py

  *     permissions:    755
  *     nlink:  58283552
  *     uid:    1001
  */
 
 #define DIR_METATABLE "directory iterator metatable"
 
 static int
+lua_dir_iter_pushtype(lua_State *L __unused, const struct dirent *ent __unused)
+{
+
+        /*
+         * This is a non-standard extension to luafilesystem for loader's
+         * benefit.  The extra stat() calls to determine the entry type can
+         * be quite expensive on some systems, so this speeds up enumeration of
+         * /boot greatly by providing the type up front.
+         *
+         * This extension is compatible enough with luafilesystem, in that we're
+         * just using an extra return value for the iterator.
+         */
+#ifdef _STANDALONE
+        lua_pushinteger(L, ent->d_type);
+        return 1;
+#else
+        return 0;
+#endif
+}
+
+static int
 lua_dir_iter_next(lua_State *L)
 {
         struct dirent *entry;
         DIR *dp, **dpp;
 
         dpp = (DIR **)luaL_checkudata(L, 1, DIR_METATABLE);
         dp = *dpp;
         luaL_argcheck(L, dp != NULL, 1, "closed directory");
 
 #ifdef _STANDALONE
         entry = readdirfd(dp->fd);
 #else
         entry = readdir(dp);
 #endif
         if (entry == NULL) {
                 closedir(dp);
                 *dpp = NULL;
                 return 0;
         }
 
         lua_pushstring(L, entry->d_name);
-        return 1;
+        return 1 + lua_dir_iter_pushtype(L, entry);
 }
 
 static int
 lua_dir_iter_close(lua_State *L)
 {
         DIR *dp, **dpp;
 
         dpp = (DIR **)lua_touserdata(L, 1);

 };
 #undef REG_SIMPLE
 
 int
 luaopen_lfs(lua_State *L)
 {
         register_metatable(L);
         luaL_newlib(L, fslib);
+#ifdef _STANDALONE
+        /* Non-standard extension for loader, used with lfs.dir(). */
+        lua_pushinteger(L, DT_DIR);
+        lua_setfield(L, -2, "DT_DIR");
+#endif
         return 1;
 }