pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/py-protobuf py-protobuf: updated to 3.7.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/f06851bb276f
branches: trunk
changeset: 331652:f06851bb276f
user: adam <adam%pkgsrc.org@localhost>
date: Thu Mar 21 21:29:08 2019 +0000
description:
py-protobuf: updated to 3.7.0
version 3.7.0:
Python
* Added Python 3.7 compatibility.
* Modified ParseFromString to return bytes parsed .
* Introduce Proto C API.
* FindFileContainingSymbol in descriptor pool is now able to find field and enum values.
* reflection.MakeClass() and reflection.ParseMessage() are deprecated.
* Added DescriptorPool.FindMethodByName() method in pure python (c extension alreay has it)
* Flipped proto3 to preserve unknown fields by default.
* Added support for memoryview in python3 proto message parsing.
* Added MergeFrom for repeated scalar fields in c extension (pure python already has it)
* Surrogates are now rejected at setters in python3.
* Added public unknown field API.
* RecursionLimit is also set to max if allow_oversize_protos is enabled.
* Disallow duplicate scalars in proto3 text_format parse.
* Fix some segment faults for c extension map field.
diffstat:
devel/py-protobuf/Makefile | 26 +-
devel/py-protobuf/PLIST | 137 +-------
devel/py-protobuf/distinfo | 21 +-
devel/py-protobuf/patches/patch-configure | 183 ----------
devel/py-protobuf/patches/patch-configure.ac | 15 -
devel/py-protobuf/patches/patch-m4_acx__check__suncc.m4 | 15 -
devel/py-protobuf/patches/patch-python_google_protobuf_pyext_descriptor.cc | 15 -
devel/py-protobuf/patches/patch-python_google_protobuf_pyext_descriptor_containers.cc | 15 -
devel/py-protobuf/patches/patch-python_google_protobuf_pyext_descriptor_pool.cc | 15 -
devel/py-protobuf/patches/patch-python_google_protobuf_pyext_extension_dict.cc | 15 -
devel/py-protobuf/patches/patch-python_google_protobuf_pyext_message.cc | 22 -
devel/py-protobuf/patches/patch-src_google_protobuf_message__lite.cc | 14 -
devel/py-protobuf/patches/patch-third__party_googletest_googlemock_configure | 24 -
devel/py-protobuf/patches/patch-third__party_googletest_googlemock_configure.ac | 24 -
14 files changed, 18 insertions(+), 523 deletions(-)
diffs (truncated from 658 to 300 lines):
diff -r 94372197660d -r f06851bb276f devel/py-protobuf/Makefile
--- a/devel/py-protobuf/Makefile Thu Mar 21 21:26:23 2019 +0000
+++ b/devel/py-protobuf/Makefile Thu Mar 21 21:29:08 2019 +0000
@@ -1,26 +1,24 @@
-# $NetBSD: Makefile,v 1.16 2019/01/08 05:56:19 markd Exp $
+# $NetBSD: Makefile,v 1.17 2019/03/21 21:29:08 adam Exp $
-.include "../../devel/protobuf/Makefile.common"
+DISTNAME= protobuf-3.7.0
+PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES= devel python
+MASTER_SITES= ${MASTER_SITE_PYPI:=p/protobuf/}
-DISTNAME= protobuf-python-${PROTOBUFVER}
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-python//}
-CATEGORIES+= python
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= https://developers.google.com/protocol-buffers/
+COMMENT= Python bindings for protobuf
+LICENSE= modified-bsd
-MAINTAINER= khorben%defora.org@localhost
-COMMENT= Python bindings for protobuf
+DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+DEPENDS+= ${PYPKGPREFIX}-six>=1.9:../../lang/py-six
USE_LANGUAGES+= c c++11
-CFLAGS+= -std=c++11 # NetBSD complains without this
-PYSETUPSUBDIR= python
+MAKE_ENV+= PROTOC=${PREFIX}/bin/protoc
PYSETUPBUILDARGS= --cpp_implementation
PYSETUPINSTALLARGS= --cpp_implementation
-DEPENDS+= ${PYPKGPREFIX}-cython-[0-9]*:../../devel/py-cython
-DEPENDS+= ${PYPKGPREFIX}-six>=1.9:../../lang/py-six
-
-EGG_NAME= protobuf-${PKGVERSION_NOREV}
-
.include "../../devel/protobuf/buildlink3.mk"
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 94372197660d -r f06851bb276f devel/py-protobuf/PLIST
--- a/devel/py-protobuf/PLIST Thu Mar 21 21:26:23 2019 +0000
+++ b/devel/py-protobuf/PLIST Thu Mar 21 21:29:08 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2019/01/06 11:21:06 markd Exp $
+@comment $NetBSD: PLIST,v 1.10 2019/03/21 21:29:08 adam Exp $
${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -52,9 +52,6 @@
${PYSITELIB}/google/protobuf/internal/_parameterized.py
${PYSITELIB}/google/protobuf/internal/_parameterized.pyc
${PYSITELIB}/google/protobuf/internal/_parameterized.pyo
-${PYSITELIB}/google/protobuf/internal/any_test_pb2.py
-${PYSITELIB}/google/protobuf/internal/any_test_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/any_test_pb2.pyo
${PYSITELIB}/google/protobuf/internal/api_implementation.py
${PYSITELIB}/google/protobuf/internal/api_implementation.pyc
${PYSITELIB}/google/protobuf/internal/api_implementation.pyo
@@ -64,129 +61,30 @@
${PYSITELIB}/google/protobuf/internal/decoder.py
${PYSITELIB}/google/protobuf/internal/decoder.pyc
${PYSITELIB}/google/protobuf/internal/decoder.pyo
-${PYSITELIB}/google/protobuf/internal/descriptor_database_test.py
-${PYSITELIB}/google/protobuf/internal/descriptor_database_test.pyc
-${PYSITELIB}/google/protobuf/internal/descriptor_database_test.pyo
-${PYSITELIB}/google/protobuf/internal/descriptor_pool_test.py
-${PYSITELIB}/google/protobuf/internal/descriptor_pool_test.pyc
-${PYSITELIB}/google/protobuf/internal/descriptor_pool_test.pyo
-${PYSITELIB}/google/protobuf/internal/descriptor_pool_test1_pb2.py
-${PYSITELIB}/google/protobuf/internal/descriptor_pool_test1_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/descriptor_pool_test1_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/descriptor_pool_test2_pb2.py
-${PYSITELIB}/google/protobuf/internal/descriptor_pool_test2_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/descriptor_pool_test2_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/descriptor_test.py
-${PYSITELIB}/google/protobuf/internal/descriptor_test.pyc
-${PYSITELIB}/google/protobuf/internal/descriptor_test.pyo
${PYSITELIB}/google/protobuf/internal/encoder.py
${PYSITELIB}/google/protobuf/internal/encoder.pyc
${PYSITELIB}/google/protobuf/internal/encoder.pyo
${PYSITELIB}/google/protobuf/internal/enum_type_wrapper.py
${PYSITELIB}/google/protobuf/internal/enum_type_wrapper.pyc
${PYSITELIB}/google/protobuf/internal/enum_type_wrapper.pyo
-${PYSITELIB}/google/protobuf/internal/factory_test1_pb2.py
-${PYSITELIB}/google/protobuf/internal/factory_test1_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/factory_test1_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/factory_test2_pb2.py
-${PYSITELIB}/google/protobuf/internal/factory_test2_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/factory_test2_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/file_options_test_pb2.py
-${PYSITELIB}/google/protobuf/internal/file_options_test_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/file_options_test_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/generator_test.py
-${PYSITELIB}/google/protobuf/internal/generator_test.pyc
-${PYSITELIB}/google/protobuf/internal/generator_test.pyo
-${PYSITELIB}/google/protobuf/internal/import_test_package/__init__.py
-${PYSITELIB}/google/protobuf/internal/import_test_package/__init__.pyc
-${PYSITELIB}/google/protobuf/internal/import_test_package/__init__.pyo
-${PYSITELIB}/google/protobuf/internal/import_test_package/inner_pb2.py
-${PYSITELIB}/google/protobuf/internal/import_test_package/inner_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/import_test_package/inner_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/import_test_package/outer_pb2.py
-${PYSITELIB}/google/protobuf/internal/import_test_package/outer_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/import_test_package/outer_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/json_format_test.py
-${PYSITELIB}/google/protobuf/internal/json_format_test.pyc
-${PYSITELIB}/google/protobuf/internal/json_format_test.pyo
-${PYSITELIB}/google/protobuf/internal/message_factory_test.py
-${PYSITELIB}/google/protobuf/internal/message_factory_test.pyc
-${PYSITELIB}/google/protobuf/internal/message_factory_test.pyo
${PYSITELIB}/google/protobuf/internal/message_listener.py
${PYSITELIB}/google/protobuf/internal/message_listener.pyc
${PYSITELIB}/google/protobuf/internal/message_listener.pyo
-${PYSITELIB}/google/protobuf/internal/message_set_extensions_pb2.py
-${PYSITELIB}/google/protobuf/internal/message_set_extensions_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/message_set_extensions_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/message_test.py
-${PYSITELIB}/google/protobuf/internal/message_test.pyc
-${PYSITELIB}/google/protobuf/internal/message_test.pyo
-${PYSITELIB}/google/protobuf/internal/missing_enum_values_pb2.py
-${PYSITELIB}/google/protobuf/internal/missing_enum_values_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/missing_enum_values_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/more_extensions_dynamic_pb2.py
-${PYSITELIB}/google/protobuf/internal/more_extensions_dynamic_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/more_extensions_dynamic_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/more_extensions_pb2.py
-${PYSITELIB}/google/protobuf/internal/more_extensions_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/more_extensions_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/more_messages_pb2.py
-${PYSITELIB}/google/protobuf/internal/more_messages_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/more_messages_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/no_package_pb2.py
-${PYSITELIB}/google/protobuf/internal/no_package_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/no_package_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/packed_field_test_pb2.py
-${PYSITELIB}/google/protobuf/internal/packed_field_test_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/packed_field_test_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/proto_builder_test.py
-${PYSITELIB}/google/protobuf/internal/proto_builder_test.pyc
-${PYSITELIB}/google/protobuf/internal/proto_builder_test.pyo
${PYSITELIB}/google/protobuf/internal/python_message.py
${PYSITELIB}/google/protobuf/internal/python_message.pyc
${PYSITELIB}/google/protobuf/internal/python_message.pyo
-${PYSITELIB}/google/protobuf/internal/reflection_test.py
-${PYSITELIB}/google/protobuf/internal/reflection_test.pyc
-${PYSITELIB}/google/protobuf/internal/reflection_test.pyo
-${PYSITELIB}/google/protobuf/internal/service_reflection_test.py
-${PYSITELIB}/google/protobuf/internal/service_reflection_test.pyc
-${PYSITELIB}/google/protobuf/internal/service_reflection_test.pyo
-${PYSITELIB}/google/protobuf/internal/symbol_database_test.py
-${PYSITELIB}/google/protobuf/internal/symbol_database_test.pyc
-${PYSITELIB}/google/protobuf/internal/symbol_database_test.pyo
-${PYSITELIB}/google/protobuf/internal/test_bad_identifiers_pb2.py
-${PYSITELIB}/google/protobuf/internal/test_bad_identifiers_pb2.pyc
-${PYSITELIB}/google/protobuf/internal/test_bad_identifiers_pb2.pyo
-${PYSITELIB}/google/protobuf/internal/test_util.py
-${PYSITELIB}/google/protobuf/internal/test_util.pyc
-${PYSITELIB}/google/protobuf/internal/test_util.pyo
${PYSITELIB}/google/protobuf/internal/testing_refleaks.py
${PYSITELIB}/google/protobuf/internal/testing_refleaks.pyc
${PYSITELIB}/google/protobuf/internal/testing_refleaks.pyo
-${PYSITELIB}/google/protobuf/internal/text_encoding_test.py
-${PYSITELIB}/google/protobuf/internal/text_encoding_test.pyc
-${PYSITELIB}/google/protobuf/internal/text_encoding_test.pyo
-${PYSITELIB}/google/protobuf/internal/text_format_test.py
-${PYSITELIB}/google/protobuf/internal/text_format_test.pyc
-${PYSITELIB}/google/protobuf/internal/text_format_test.pyo
${PYSITELIB}/google/protobuf/internal/type_checkers.py
${PYSITELIB}/google/protobuf/internal/type_checkers.pyc
${PYSITELIB}/google/protobuf/internal/type_checkers.pyo
-${PYSITELIB}/google/protobuf/internal/unknown_fields_test.py
-${PYSITELIB}/google/protobuf/internal/unknown_fields_test.pyc
-${PYSITELIB}/google/protobuf/internal/unknown_fields_test.pyo
${PYSITELIB}/google/protobuf/internal/well_known_types.py
${PYSITELIB}/google/protobuf/internal/well_known_types.pyc
${PYSITELIB}/google/protobuf/internal/well_known_types.pyo
-${PYSITELIB}/google/protobuf/internal/well_known_types_test.py
-${PYSITELIB}/google/protobuf/internal/well_known_types_test.pyc
-${PYSITELIB}/google/protobuf/internal/well_known_types_test.pyo
${PYSITELIB}/google/protobuf/internal/wire_format.py
${PYSITELIB}/google/protobuf/internal/wire_format.pyc
${PYSITELIB}/google/protobuf/internal/wire_format.pyo
-${PYSITELIB}/google/protobuf/internal/wire_format_test.py
-${PYSITELIB}/google/protobuf/internal/wire_format_test.pyc
-${PYSITELIB}/google/protobuf/internal/wire_format_test.pyo
${PYSITELIB}/google/protobuf/json_format.py
${PYSITELIB}/google/protobuf/json_format.pyc
${PYSITELIB}/google/protobuf/json_format.pyo
@@ -251,39 +149,6 @@
${PYSITELIB}/google/protobuf/type_pb2.py
${PYSITELIB}/google/protobuf/type_pb2.pyc
${PYSITELIB}/google/protobuf/type_pb2.pyo
-${PYSITELIB}/google/protobuf/unittest_arena_pb2.py
-${PYSITELIB}/google/protobuf/unittest_arena_pb2.pyc
-${PYSITELIB}/google/protobuf/unittest_arena_pb2.pyo
-${PYSITELIB}/google/protobuf/unittest_custom_options_pb2.py
-${PYSITELIB}/google/protobuf/unittest_custom_options_pb2.pyc
-${PYSITELIB}/google/protobuf/unittest_custom_options_pb2.pyo
-${PYSITELIB}/google/protobuf/unittest_import_pb2.py
-${PYSITELIB}/google/protobuf/unittest_import_pb2.pyc
-${PYSITELIB}/google/protobuf/unittest_import_pb2.pyo
-${PYSITELIB}/google/protobuf/unittest_import_public_pb2.py
-${PYSITELIB}/google/protobuf/unittest_import_public_pb2.pyc
-${PYSITELIB}/google/protobuf/unittest_import_public_pb2.pyo
-${PYSITELIB}/google/protobuf/unittest_mset_pb2.py
-${PYSITELIB}/google/protobuf/unittest_mset_pb2.pyc
-${PYSITELIB}/google/protobuf/unittest_mset_pb2.pyo
-${PYSITELIB}/google/protobuf/unittest_mset_wire_format_pb2.py
-${PYSITELIB}/google/protobuf/unittest_mset_wire_format_pb2.pyc
-${PYSITELIB}/google/protobuf/unittest_mset_wire_format_pb2.pyo
-${PYSITELIB}/google/protobuf/unittest_no_arena_import_pb2.py
-${PYSITELIB}/google/protobuf/unittest_no_arena_import_pb2.pyc
-${PYSITELIB}/google/protobuf/unittest_no_arena_import_pb2.pyo
-${PYSITELIB}/google/protobuf/unittest_no_arena_pb2.py
-${PYSITELIB}/google/protobuf/unittest_no_arena_pb2.pyc
-${PYSITELIB}/google/protobuf/unittest_no_arena_pb2.pyo
-${PYSITELIB}/google/protobuf/unittest_no_generic_services_pb2.py
-${PYSITELIB}/google/protobuf/unittest_no_generic_services_pb2.pyc
-${PYSITELIB}/google/protobuf/unittest_no_generic_services_pb2.pyo
-${PYSITELIB}/google/protobuf/unittest_pb2.py
-${PYSITELIB}/google/protobuf/unittest_pb2.pyc
-${PYSITELIB}/google/protobuf/unittest_pb2.pyo
-${PYSITELIB}/google/protobuf/unittest_proto3_arena_pb2.py
-${PYSITELIB}/google/protobuf/unittest_proto3_arena_pb2.pyc
-${PYSITELIB}/google/protobuf/unittest_proto3_arena_pb2.pyo
${PYSITELIB}/google/protobuf/util/__init__.py
${PYSITELIB}/google/protobuf/util/__init__.pyc
${PYSITELIB}/google/protobuf/util/__init__.pyo
diff -r 94372197660d -r f06851bb276f devel/py-protobuf/distinfo
--- a/devel/py-protobuf/distinfo Thu Mar 21 21:26:23 2019 +0000
+++ b/devel/py-protobuf/distinfo Thu Mar 21 21:29:08 2019 +0000
@@ -1,17 +1,6 @@
-$NetBSD: distinfo,v 1.15 2019/01/06 11:21:06 markd Exp $
+$NetBSD: distinfo,v 1.16 2019/03/21 21:29:08 adam Exp $
-SHA1 (protobuf-python-3.6.1.tar.gz) = 9170df4cde3ddb94bae7247d209e1cda4432967b
-RMD160 (protobuf-python-3.6.1.tar.gz) = ee9f8344a688f636cee409227b36a5161fa88c44
-SHA512 (protobuf-python-3.6.1.tar.gz) = 9cf80401fca3b58d41c7aa95988bf3763680c5a82009b90f85671762641c7a5a7fd1af691ab258d57fa43f790a9162fdfd96f29f63e888626083b2abe84bafff
-Size (protobuf-python-3.6.1.tar.gz) = 4748789 bytes
-SHA1 (patch-configure) = a35883ff62ba1db429a6cbc12b75714e78e28abf
-SHA1 (patch-configure.ac) = 208a5ce72905aa95ad73ee0f751d4a58f0c37f5f
-SHA1 (patch-m4_acx__check__suncc.m4) = faf96ee5d305c08d30e7c7d3578896971983e1dd
-SHA1 (patch-python_google_protobuf_pyext_descriptor.cc) = 32f3ddb90d3b52dd4b6919ec75047dcd2906a218
-SHA1 (patch-python_google_protobuf_pyext_descriptor_containers.cc) = 6aed9e2a5b5803fdecaf0d5a49a48ef219b5ca1f
-SHA1 (patch-python_google_protobuf_pyext_descriptor_pool.cc) = 9fe51dfd39f1e3af202a4cff586947b4ec8475a5
-SHA1 (patch-python_google_protobuf_pyext_extension_dict.cc) = 6fff247e007e7856442480600f98507712c80c69
-SHA1 (patch-python_google_protobuf_pyext_message.cc) = 30faea1052e097d976430e2224c97e98cadb5e75
-SHA1 (patch-src_google_protobuf_message__lite.cc) = 8f2ffe07b2710de5365148153978ad6d9939f522
-SHA1 (patch-third__party_googletest_googlemock_configure) = fe3b812e819130d87d99316144507d2454461cd1
-SHA1 (patch-third__party_googletest_googlemock_configure.ac) = dc06fc7aebaef02df536458e45f77386cc857261
+SHA1 (protobuf-3.7.0.tar.gz) = c3250d0cc74fadeffdbb0a01f0fe1512f923ef99
+RMD160 (protobuf-3.7.0.tar.gz) = 02a3188d33bb62463b2e6b5f85dfd50915142e33
+SHA512 (protobuf-3.7.0.tar.gz) = 03ab744215694eaa4bfe40ab0b3ebd39065ac865a7dd48c1b2c038c21a091a2f4ea02f8c21b888f96d0454f01e6fa5e5e0026c9cb5643e7df490a7cbedf98c6f
+Size (protobuf-3.7.0.tar.gz) = 255287 bytes
diff -r 94372197660d -r f06851bb276f devel/py-protobuf/patches/patch-configure
--- a/devel/py-protobuf/patches/patch-configure Thu Mar 21 21:26:23 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,183 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2019/01/08 05:56:19 markd Exp $
-
-Fix unportable test(1) operator.
-
---- configure.orig 2018-06-06 19:44:06.000000000 +0000
-+++ configure
-@@ -787,7 +787,6 @@ infodir
- docdir
- oldincludedir
- includedir
--runstatedir
- localstatedir
- sharedstatedir
- sysconfdir
-@@ -882,7 +881,6 @@ datadir='${datarootdir}'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
- localstatedir='${prefix}/var'
--runstatedir='${localstatedir}/run'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
- docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-@@ -1135,15 +1133,6 @@ do
- | -silent | --silent | --silen | --sile | --sil)
- silent=yes ;;
-
-- -runstatedir | --runstatedir | --runstatedi | --runstated \
-- | --runstate | --runstat | --runsta | --runst | --runs \
-- | --run | --ru | --r)
-- ac_prev=runstatedir ;;
-- -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-- | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-- | --run=* | --ru=* | --r=*)
-- runstatedir=$ac_optarg ;;
--
- -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
- ac_prev=sbindir ;;
- -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-@@ -1281,7 +1270,7 @@ fi
Home |
Main Index |
Thread Index |
Old Index