Page MenuHomeFreeBSD
Differential D19879

devel/elfio: Updated from 1.0.3 to 3.3
ClosedPublic
Actions

Authored by james.wright_digital-chaos.com on Apr 10 2019, 8:29 PM.
Tags
Referenced Files
F114896768: D19879.id56201.diff
Fri, Apr 18, 6:27 AM
Unknown Object (File)
Thu, Apr 17, 2:12 PM
Unknown Object (File)
Sat, Apr 12, 4:33 PM
Unknown Object (File)
Tue, Mar 25, 6:44 PM
Unknown Object (File)
Mon, Mar 24, 3:13 AM
Unknown Object (File)
Feb 24 2025, 6:44 PM
Unknown Object (File)
Feb 20 2025, 4:31 PM
Unknown Object (File)
Feb 13 2025, 10:44 PM
View All Files
Subscribers
mat
tobik

Details

Reviewers
tcberner
tobik
Group Reviewers
Contributor Reviewers (ports)
Commits
rP498999: devel/elfio: Update to 3.3
Summary

Updated ELFIO from 1.0.3 to 3.3. It is not backwards compatible, but no other ports seem to use it.

Bugzilla Ticket:
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=237224

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

james.wright_digital-chaos.com created this revision.Apr 10 2019, 8:29 PM
Herald added a subscriber: mat. · View Herald TranscriptApr 10 2019, 8:29 PM
james.wright_digital-chaos.com edited the summary of this revision. (Show Details)Apr 12 2019, 2:12 PM
james.wright_digital-chaos.com updated this revision to Diff 56182.Apr 13 2019, 8:38 PM

Added elfio3 directory to devel/Makefile
Added myself as maintainer

james.wright_digital-chaos.com added a reviewer: tcberner.Apr 13 2019, 8:39 PM
tobik added a subscriber: tobik.Apr 14 2019, 6:15 AM

Added a new port for ELFIO v3.x as it is incompatible with the existing v1.x.x

devel/elfio is unmaintained and no ports depend on it. Why not update it to 3.x instead of adding a new port? Is there a reason devel/elfio needs to stay at 1.x?

devel/elfio3/Makefile
10 ↗(On Diff #56182)

Bad COMMENT (drop "ELFIO is a"). See 5.6. COMMENT.

tobik requested changes to this revision.Apr 14 2019, 6:15 AM
This revision now requires changes to proceed.Apr 14 2019, 6:15 AM
james.wright_digital-chaos.com added a comment.Apr 14 2019, 2:54 PM
In D19879#427686, @tobik wrote:

Added a new port for ELFIO v3.x as it is incompatible with the existing v1.x.x

devel/elfio is unmaintained and no ports depend on it. Why not update it to 3.x instead of adding a new port? Is there a reason devel/elfio needs to stay at 1.x?

Wasn't sure if that was the recommended approach or not, so leaned on the side of caution. I'll update devel/efio instead.

james.wright_digital-chaos.com updated this revision to Diff 56201.EditedApr 14 2019, 3:24 PM
james.wright_digital-chaos.com retitled this revision from Added port for devel/elfio3 to devel/elfio: Updated from 1.0.3 to 3.3.
james.wright_digital-chaos.com edited the summary of this revision. (Show Details)

Updated existing devel/elfio port rather than creating a new one (devel/elfio3).

tcberner added inline comments.Apr 14 2019, 3:31 PM
devel/elfio/Makefile
1

^ you may (unfortunately) not remove that line unless you have permission by 'ijliao'

tobik requested changes to this revision.Apr 14 2019, 6:45 PM
tobik added inline comments.
devel/elfio/Makefile
25

Can you install the example source code too like before? IMHO it's more useful than compiled example programs.

The example programs are already installed by the build itself just in the wrong directory, so something is not quite right yet.

$ make check-plist
====> Checking for pkg-plist issues (check-plist)
===> Parsing plist
===> Checking for items in STAGEDIR missing from pkg-plist
Error: Orphaned: bin/anonymizer
Error: Orphaned: bin/elfdump
Error: Orphaned: bin/tutorial
Error: Orphaned: bin/write_obj
Error: Orphaned: bin/writer
===> Checking for items in pkg-plist which are not in STAGEDIR
===> Error: Plist issues found.

Maybe set

CONFIGURE_ARGS=        --bindir=${EXAMPLESDIR}

instead.

This revision now requires changes to proceed.Apr 14 2019, 6:45 PM
james.wright_digital-chaos.com updated this revision to Diff 56212.EditedApr 14 2019, 11:13 PM

Updated Makefile based on suggestions;

Reinstated #CreatedBy header

Fixed install directory of examples binaries with CONFIGURE_ARGS= --bindir=${EXAMPLESDIR}

Now installs examples source code in addition to the example binaries

james.wright_digital-chaos.com marked an inline comment as done.Apr 14 2019, 11:16 PM
tobik accepted this revision.Apr 15 2019, 8:01 AM
This revision is now accepted and ready to land.Apr 15 2019, 8:01 AM
Closed by commit rP498999: devel/elfio: Update to 3.3 (authored by tobik). · Explain WhyApr 15 2019, 8:10 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
devel/
elfio/
34 lines
5 lines
files/
18 lines
17 lines
12 lines
33 lines

Diff 56201

View Options

devel/elfio/Makefile

Show First 20 Lines • Show All 74 Lines • ▼ Show 20 Lines
#include <netipsec/key.h> #include <netipsec/key.h>
#include <netipsec/key_debug.h> #include <netipsec/key_debug.h>
#include <opencrypto/cryptodev.h> #include <opencrypto/cryptodev.h>
#include <opencrypto/xform.h> #include <opencrypto/xform.h>
VNET_DEFINE(int, esp_enable) = 1; VNET_DEFINE(int, esp_enable) = 1;
VNET_DEFINE_STATIC(int, esp_ctr_compatibility) = 1;
#define V_esp_ctr_compatibility VNET(esp_ctr_compatibility)
VNET_PCPUSTAT_DEFINE(struct espstat, espstat); VNET_PCPUSTAT_DEFINE(struct espstat, espstat);
VNET_PCPUSTAT_SYSINIT(espstat); VNET_PCPUSTAT_SYSINIT(espstat);
#ifdef VIMAGE #ifdef VIMAGE
VNET_PCPUSTAT_SYSUNINIT(espstat); VNET_PCPUSTAT_SYSUNINIT(espstat);
#endif /* VIMAGE */ #endif /* VIMAGE */
SYSCTL_DECL(_net_inet_esp); SYSCTL_DECL(_net_inet_esp);
SYSCTL_INT(_net_inet_esp, OID_AUTO, esp_enable, SYSCTL_INT(_net_inet_esp, OID_AUTO, esp_enable,
CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(esp_enable), 0, ""); CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(esp_enable), 0, "");
SYSCTL_INT(_net_inet_esp, OID_AUTO, ctr_compatibility,
CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(esp_ctr_compatibility), 0,
"Align AES-CTR encrypted transmitted frames to blocksize");
SYSCTL_VNET_PCPUSTAT(_net_inet_esp, IPSECCTL_STATS, stats, SYSCTL_VNET_PCPUSTAT(_net_inet_esp, IPSECCTL_STATS, stats,
struct espstat, espstat, struct espstat, espstat,
"ESP statistics (struct espstat, netipsec/esp_var.h"); "ESP statistics (struct espstat, netipsec/esp_var.h");
static int esp_input_cb(struct cryptop *op); static int esp_input_cb(struct cryptop *op);
static int esp_output_cb(struct cryptop *crp); static int esp_output_cb(struct cryptop *crp);
size_t size_t
▲ Show 20 Lines • Show All 548 Lines • ▼ Show 20 Linesesp_output(struct mbuf *m, struct secpolicy *sp, struct secasvar *sav,
if (sav->flags & SADB_X_EXT_OLD) if (sav->flags & SADB_X_EXT_OLD)
hlen = sizeof (struct esp) + sav->ivlen; hlen = sizeof (struct esp) + sav->ivlen;
else else
hlen = sizeof (struct newesp) + sav->ivlen; hlen = sizeof (struct newesp) + sav->ivlen;
rlen = m->m_pkthdr.len - skip; /* Raw payload length. */ rlen = m->m_pkthdr.len - skip; /* Raw payload length. */
/* /*
* RFC4303 2.4 Requires 4 byte alignment. * RFC4303 2.4 Requires 4 byte alignment.
* Old versions of FreeBSD can't decrypt partial blocks encrypted
* with AES-CTR. Align payload to native_blocksize (16 bytes)
* in order to preserve compatibility.
*/ */
blks = MAX(4, espx->blocksize); /* Cipher blocksize */ if (SAV_ISCTR(sav) && V_esp_ctr_compatibility)
blks = MAX(4, espx->native_blocksize); /* Cipher blocksize */
else
blks = MAX(4, espx->blocksize);
/* XXX clamp padding length a la KAME??? */ /* XXX clamp padding length a la KAME??? */
padding = ((blks - ((rlen + 2) % blks)) % blks) + 2; padding = ((blks - ((rlen + 2) % blks)) % blks) + 2;
alen = xform_ah_authsize(esph); alen = xform_ah_authsize(esph);
ESPSTAT_INC(esps_output); ESPSTAT_INC(esps_output);
▲ Show 20 Lines • Show All 303 Lines • Show Last 20 Lines
View Options

devel/elfio/distinfo

Show First 20 Lines • Show All 74 Lines • ▼ Show 20 Lines
#include <netipsec/key.h> #include <netipsec/key.h>
#include <netipsec/key_debug.h> #include <netipsec/key_debug.h>
#include <opencrypto/cryptodev.h> #include <opencrypto/cryptodev.h>
#include <opencrypto/xform.h> #include <opencrypto/xform.h>
VNET_DEFINE(int, esp_enable) = 1; VNET_DEFINE(int, esp_enable) = 1;
VNET_DEFINE_STATIC(int, esp_ctr_compatibility) = 1;
#define V_esp_ctr_compatibility VNET(esp_ctr_compatibility)
VNET_PCPUSTAT_DEFINE(struct espstat, espstat); VNET_PCPUSTAT_DEFINE(struct espstat, espstat);
VNET_PCPUSTAT_SYSINIT(espstat); VNET_PCPUSTAT_SYSINIT(espstat);
#ifdef VIMAGE #ifdef VIMAGE
VNET_PCPUSTAT_SYSUNINIT(espstat); VNET_PCPUSTAT_SYSUNINIT(espstat);
#endif /* VIMAGE */ #endif /* VIMAGE */
SYSCTL_DECL(_net_inet_esp); SYSCTL_DECL(_net_inet_esp);
SYSCTL_INT(_net_inet_esp, OID_AUTO, esp_enable, SYSCTL_INT(_net_inet_esp, OID_AUTO, esp_enable,
CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(esp_enable), 0, ""); CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(esp_enable), 0, "");
SYSCTL_INT(_net_inet_esp, OID_AUTO, ctr_compatibility,
CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(esp_ctr_compatibility), 0,
"Align AES-CTR encrypted transmitted frames to blocksize");
SYSCTL_VNET_PCPUSTAT(_net_inet_esp, IPSECCTL_STATS, stats, SYSCTL_VNET_PCPUSTAT(_net_inet_esp, IPSECCTL_STATS, stats,
struct espstat, espstat, struct espstat, espstat,
"ESP statistics (struct espstat, netipsec/esp_var.h"); "ESP statistics (struct espstat, netipsec/esp_var.h");
static int esp_input_cb(struct cryptop *op); static int esp_input_cb(struct cryptop *op);
static int esp_output_cb(struct cryptop *crp); static int esp_output_cb(struct cryptop *crp);
size_t size_t
▲ Show 20 Lines • Show All 548 Lines • ▼ Show 20 Linesesp_output(struct mbuf *m, struct secpolicy *sp, struct secasvar *sav,
if (sav->flags & SADB_X_EXT_OLD) if (sav->flags & SADB_X_EXT_OLD)
hlen = sizeof (struct esp) + sav->ivlen; hlen = sizeof (struct esp) + sav->ivlen;
else else
hlen = sizeof (struct newesp) + sav->ivlen; hlen = sizeof (struct newesp) + sav->ivlen;
rlen = m->m_pkthdr.len - skip; /* Raw payload length. */ rlen = m->m_pkthdr.len - skip; /* Raw payload length. */
/* /*
* RFC4303 2.4 Requires 4 byte alignment. * RFC4303 2.4 Requires 4 byte alignment.
* Old versions of FreeBSD can't decrypt partial blocks encrypted
* with AES-CTR. Align payload to native_blocksize (16 bytes)
* in order to preserve compatibility.
*/ */
blks = MAX(4, espx->blocksize); /* Cipher blocksize */ if (SAV_ISCTR(sav) && V_esp_ctr_compatibility)
blks = MAX(4, espx->native_blocksize); /* Cipher blocksize */
else
blks = MAX(4, espx->blocksize);
/* XXX clamp padding length a la KAME??? */ /* XXX clamp padding length a la KAME??? */
padding = ((blks - ((rlen + 2) % blks)) % blks) + 2; padding = ((blks - ((rlen + 2) % blks)) % blks) + 2;
alen = xform_ah_authsize(esph); alen = xform_ah_authsize(esph);
ESPSTAT_INC(esps_output); ESPSTAT_INC(esps_output);
▲ Show 20 Lines • Show All 303 Lines • Show Last 20 Lines
View Options

devel/elfio/files/patch-ELFIO_Makefile.am

Show First 20 Lines • Show All 74 Lines • ▼ Show 20 Lines
#include <netipsec/key.h> #include <netipsec/key.h>
#include <netipsec/key_debug.h> #include <netipsec/key_debug.h>
#include <opencrypto/cryptodev.h> #include <opencrypto/cryptodev.h>
#include <opencrypto/xform.h> #include <opencrypto/xform.h>
VNET_DEFINE(int, esp_enable) = 1; VNET_DEFINE(int, esp_enable) = 1;
VNET_DEFINE_STATIC(int, esp_ctr_compatibility) = 1;
#define V_esp_ctr_compatibility VNET(esp_ctr_compatibility)
VNET_PCPUSTAT_DEFINE(struct espstat, espstat); VNET_PCPUSTAT_DEFINE(struct espstat, espstat);
VNET_PCPUSTAT_SYSINIT(espstat); VNET_PCPUSTAT_SYSINIT(espstat);
#ifdef VIMAGE #ifdef VIMAGE
VNET_PCPUSTAT_SYSUNINIT(espstat); VNET_PCPUSTAT_SYSUNINIT(espstat);
#endif /* VIMAGE */ #endif /* VIMAGE */
SYSCTL_DECL(_net_inet_esp); SYSCTL_DECL(_net_inet_esp);
SYSCTL_INT(_net_inet_esp, OID_AUTO, esp_enable, SYSCTL_INT(_net_inet_esp, OID_AUTO, esp_enable,
CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(esp_enable), 0, ""); CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(esp_enable), 0, "");
SYSCTL_INT(_net_inet_esp, OID_AUTO, ctr_compatibility,
CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(esp_ctr_compatibility), 0,
"Align AES-CTR encrypted transmitted frames to blocksize");
SYSCTL_VNET_PCPUSTAT(_net_inet_esp, IPSECCTL_STATS, stats, SYSCTL_VNET_PCPUSTAT(_net_inet_esp, IPSECCTL_STATS, stats,
struct espstat, espstat, struct espstat, espstat,
"ESP statistics (struct espstat, netipsec/esp_var.h"); "ESP statistics (struct espstat, netipsec/esp_var.h");
static int esp_input_cb(struct cryptop *op); static int esp_input_cb(struct cryptop *op);
static int esp_output_cb(struct cryptop *crp); static int esp_output_cb(struct cryptop *crp);
size_t size_t
▲ Show 20 Lines • Show All 548 Lines • ▼ Show 20 Linesesp_output(struct mbuf *m, struct secpolicy *sp, struct secasvar *sav,
if (sav->flags & SADB_X_EXT_OLD) if (sav->flags & SADB_X_EXT_OLD)
hlen = sizeof (struct esp) + sav->ivlen; hlen = sizeof (struct esp) + sav->ivlen;
else else
hlen = sizeof (struct newesp) + sav->ivlen; hlen = sizeof (struct newesp) + sav->ivlen;
rlen = m->m_pkthdr.len - skip; /* Raw payload length. */ rlen = m->m_pkthdr.len - skip; /* Raw payload length. */
/* /*
* RFC4303 2.4 Requires 4 byte alignment. * RFC4303 2.4 Requires 4 byte alignment.
* Old versions of FreeBSD can't decrypt partial blocks encrypted
* with AES-CTR. Align payload to native_blocksize (16 bytes)
* in order to preserve compatibility.
*/ */
blks = MAX(4, espx->blocksize); /* Cipher blocksize */ if (SAV_ISCTR(sav) && V_esp_ctr_compatibility)
blks = MAX(4, espx->native_blocksize); /* Cipher blocksize */
else
blks = MAX(4, espx->blocksize);
/* XXX clamp padding length a la KAME??? */ /* XXX clamp padding length a la KAME??? */
padding = ((blks - ((rlen + 2) % blks)) % blks) + 2; padding = ((blks - ((rlen + 2) % blks)) % blks) + 2;
alen = xform_ah_authsize(esph); alen = xform_ah_authsize(esph);
ESPSTAT_INC(esps_output); ESPSTAT_INC(esps_output);
▲ Show 20 Lines • Show All 303 Lines • Show Last 20 Lines
View Options

devel/elfio/files/patch-configure.in

Show First 20 Lines • Show All 74 Lines • ▼ Show 20 Lines
#include <netipsec/key.h> #include <netipsec/key.h>
#include <netipsec/key_debug.h> #include <netipsec/key_debug.h>
#include <opencrypto/cryptodev.h> #include <opencrypto/cryptodev.h>
#include <opencrypto/xform.h> #include <opencrypto/xform.h>
VNET_DEFINE(int, esp_enable) = 1; VNET_DEFINE(int, esp_enable) = 1;
VNET_DEFINE_STATIC(int, esp_ctr_compatibility) = 1;
#define V_esp_ctr_compatibility VNET(esp_ctr_compatibility)
VNET_PCPUSTAT_DEFINE(struct espstat, espstat); VNET_PCPUSTAT_DEFINE(struct espstat, espstat);
VNET_PCPUSTAT_SYSINIT(espstat); VNET_PCPUSTAT_SYSINIT(espstat);
#ifdef VIMAGE #ifdef VIMAGE
VNET_PCPUSTAT_SYSUNINIT(espstat); VNET_PCPUSTAT_SYSUNINIT(espstat);
#endif /* VIMAGE */ #endif /* VIMAGE */
SYSCTL_DECL(_net_inet_esp); SYSCTL_DECL(_net_inet_esp);
SYSCTL_INT(_net_inet_esp, OID_AUTO, esp_enable, SYSCTL_INT(_net_inet_esp, OID_AUTO, esp_enable,
CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(esp_enable), 0, ""); CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(esp_enable), 0, "");
SYSCTL_INT(_net_inet_esp, OID_AUTO, ctr_compatibility,
CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(esp_ctr_compatibility), 0,
"Align AES-CTR encrypted transmitted frames to blocksize");
SYSCTL_VNET_PCPUSTAT(_net_inet_esp, IPSECCTL_STATS, stats, SYSCTL_VNET_PCPUSTAT(_net_inet_esp, IPSECCTL_STATS, stats,
struct espstat, espstat, struct espstat, espstat,
"ESP statistics (struct espstat, netipsec/esp_var.h"); "ESP statistics (struct espstat, netipsec/esp_var.h");
static int esp_input_cb(struct cryptop *op); static int esp_input_cb(struct cryptop *op);
static int esp_output_cb(struct cryptop *crp); static int esp_output_cb(struct cryptop *crp);
size_t size_t
▲ Show 20 Lines • Show All 548 Lines • ▼ Show 20 Linesesp_output(struct mbuf *m, struct secpolicy *sp, struct secasvar *sav,
if (sav->flags & SADB_X_EXT_OLD) if (sav->flags & SADB_X_EXT_OLD)
hlen = sizeof (struct esp) + sav->ivlen; hlen = sizeof (struct esp) + sav->ivlen;
else else
hlen = sizeof (struct newesp) + sav->ivlen; hlen = sizeof (struct newesp) + sav->ivlen;
rlen = m->m_pkthdr.len - skip; /* Raw payload length. */ rlen = m->m_pkthdr.len - skip; /* Raw payload length. */
/* /*
* RFC4303 2.4 Requires 4 byte alignment. * RFC4303 2.4 Requires 4 byte alignment.
* Old versions of FreeBSD can't decrypt partial blocks encrypted
* with AES-CTR. Align payload to native_blocksize (16 bytes)
* in order to preserve compatibility.
*/ */
blks = MAX(4, espx->blocksize); /* Cipher blocksize */ if (SAV_ISCTR(sav) && V_esp_ctr_compatibility)
blks = MAX(4, espx->native_blocksize); /* Cipher blocksize */
else
blks = MAX(4, espx->blocksize);
/* XXX clamp padding length a la KAME??? */ /* XXX clamp padding length a la KAME??? */
padding = ((blks - ((rlen + 2) % blks)) % blks) + 2; padding = ((blks - ((rlen + 2) % blks)) % blks) + 2;
alen = xform_ah_authsize(esph); alen = xform_ah_authsize(esph);
ESPSTAT_INC(esps_output); ESPSTAT_INC(esps_output);
▲ Show 20 Lines • Show All 303 Lines • Show Last 20 Lines
View Options

devel/elfio/pkg-descr

Loading...
View Options

devel/elfio/pkg-plist

Loading...