Andreas Wacknitz
2023-12-31 2468468642fde45332a69dc287d7681fbdbf6392
libnet: update to 1.3 & drop 32 bit

5 files modified
70 ■■■■■ changed files
components/library/libnet/Makefile 15 ●●●●● patch | view | raw | blame | history
components/library/libnet/libnet.p5m 37 ●●●● patch | view | raw | blame | history
components/library/libnet/manifests/sample-manifest.p5m 7 ●●●● patch | view | raw | blame | history
components/library/libnet/patches/libnet-structures.h.patch 10 ●●●● patch | view | raw | blame | history
components/library/libnet/pkg5 1 ●●●● patch | view | raw | blame | history
components/library/libnet/Makefile
@@ -24,35 +24,32 @@
# Copyright (c) 2023, Friedrich Kink
#
BUILD_BITS=    64_and_32
BUILD_BITS=    64
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=        libnet
COMPONENT_VERSION=    1.2
COMPONENT_VERSION=    1.3
COMPONENT_SUMMARY=    libnet - a library for portable network packet construction
COMPONENT_DESCRIPTION=    the libnet network packet construction library
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_PROJECT_URL=    https://github.com/libnet/libnet
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH=    \
    sha256:caa4868157d9e5f32e9c7eac9461efeff30cb28357f7f6bf07e73933fb4edaa7
COMPONENT_ARCHIVE_HASH= sha256:ad1e2dd9b500c58ee462acd839d0a0ea9a2b9248a1287840bc601e774fb6b28f
COMPONENT_ARCHIVE_URL=    https://github.com/libnet/$(COMPONENT_NAME)/releases/download/v$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_FMRI=        system/library/libnet
COMPONENT_BUGDB=    library/libnet
COMPONENT_CLASSIFICATION=
COMPONENT_LICENSE=    BSD
COMPONENT_LICENSE_FILE=    LICENSE
TEST_TARGET= $(NO_TESTS)
include $(WS_MAKE_RULES)/common.mk
COMPONENT_PRE_CONFIGURE_ACTION = \
    ($(CLONEY) $(SOURCE_DIR) $(@D))
COMPONENT_PRE_CONFIGURE_ACTION= ( $(CLONEY) $(SOURCE_DIR) $(@D) )
CONFIGURE_OPTIONS += --disable-static
CONFIGURE_OPTIONS += --disable-doxygen-html
CONFIGURE_OPTIONS += --enable-doxygen-pdf
test:        $(NO_TESTS)
# Auto-generated dependencies
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += system/library
components/library/libnet/libnet.p5m
@@ -1,30 +1,18 @@
#
# CDDL HEADER START
# This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL"), version 1.0.
# You may only use this file in accordance with the terms of version
# 1.0 of the CDDL.
#
# The contents of this file are subject to the terms of the
# Common Development and Distribution License (the "License").
# You may not use this file except in compliance with the License.
# A full copy of the text of the CDDL should have accompanied this
# source.  A copy of the CDDL is also available via the Internet at
# http://www.illumos.org/license/CDDL.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
# If applicable, add the following below this CDDL HEADER, with the
# fields enclosed by brackets "[]" replaced with your own identifying
# information: Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
#
# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2023, Friedrich Kink
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
<transform file path=usr/demo/libnet/(.+[.-].+)$ -> set action.hash $(MACH32)/sample/%<\1> >
<transform dir file link hardlink path=usr/demo -> default facet.devel true>
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
@@ -36,7 +24,8 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
file path=usr/bin/$(MACH32)/libnet-config
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
file path=usr/bin/libnet-config
file path=usr/include/libnet.h
file path=usr/include/libnet/libnet-asn1.h
@@ -49,16 +38,12 @@
link path=usr/lib/$(MACH64)/libnet.so.9 target=libnet.so.9.0.0
file path=usr/lib/$(MACH64)/libnet.so.9.0.0
file path=usr/lib/$(MACH64)/pkgconfig/libnet.pc
link path=usr/lib/libnet.so target=libnet.so.9.0.0
link path=usr/lib/libnet.so.9 target=libnet.so.9.0.0
file path=usr/lib/libnet.so.9.0.0
file path=usr/lib/pkgconfig/libnet.pc
file path=usr/share/doc/libnet/ChangeLog.md
file path=usr/share/doc/libnet/LICENSE
file path=usr/share/doc/libnet/MIGRATION.md
file path=usr/share/doc/libnet/RAWSOCKET.md
file path=usr/share/doc/libnet/README.md
file path=usr/share/man/man3/libnet-config.3
file path=usr/share/man/man1/libnet-config.1
file path=usr/share/man/man3/libnet-functions.3
file path=usr/share/man/man3/libnet-macros.3
file path=usr/share/man/man3/libnet.3
components/library/libnet/manifests/sample-manifest.p5m
@@ -23,7 +23,6 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
file path=usr/bin/$(MACH32)/libnet-config
file path=usr/bin/libnet-config
file path=usr/include/libnet.h
file path=usr/include/libnet/libnet-asn1.h
@@ -36,16 +35,12 @@
link path=usr/lib/$(MACH64)/libnet.so.9 target=libnet.so.9.0.0
file path=usr/lib/$(MACH64)/libnet.so.9.0.0
file path=usr/lib/$(MACH64)/pkgconfig/libnet.pc
link path=usr/lib/libnet.so target=libnet.so.9.0.0
link path=usr/lib/libnet.so.9 target=libnet.so.9.0.0
file path=usr/lib/libnet.so.9.0.0
file path=usr/lib/pkgconfig/libnet.pc
file path=usr/share/doc/libnet/ChangeLog.md
file path=usr/share/doc/libnet/LICENSE
file path=usr/share/doc/libnet/MIGRATION.md
file path=usr/share/doc/libnet/RAWSOCKET.md
file path=usr/share/doc/libnet/README.md
file path=usr/share/man/man3/libnet-config.3
file path=usr/share/man/man1/libnet-config.1
file path=usr/share/man/man3/libnet-functions.3
file path=usr/share/man/man3/libnet-macros.3
file path=usr/share/man/man3/libnet.3
components/library/libnet/patches/libnet-structures.h.patch
@@ -1,5 +1,5 @@
--- libnet-1.2/include/libnet/libnet-structures.h    2019-10-08 20:58:28.000000000 +0200
+++ libnet-1.2/include/libnet/libnet-structures.h.new    2023-02-26 17:28:20.539832478 +0100
--- libnet-1.3/include/libnet/libnet-structures.h.orig    2023-10-02 18:48:48.000000000 +0200
+++ libnet-1.3/include/libnet/libnet-structures.h    2023-12-31 15:56:46.567687377 +0100
@@ -49,9 +49,15 @@
 /* libnet statistics structure */
 struct libnet_stats
@@ -9,9 +9,9 @@
+    uint64_t packet_errors;            /* packets errors */
+    uint64_t bytes_written;            /* bytes written */
+#else
     __int64_t packets_sent;               /* packets sent */
     __int64_t packet_errors;              /* packets errors */
     __int64_t bytes_written;              /* bytes written */
     int64_t packets_sent;               /* packets sent */
     int64_t packet_errors;              /* packets errors */
     int64_t bytes_written;              /* bytes written */
+#endif
 };
 
components/library/libnet/pkg5
@@ -1,6 +1,5 @@
{
    "dependencies": [
        "SUNWcs",
        "shell/ksh93",
        "system/library"
    ],