Attachment 260252 Details for Bug 286634 – devel/csmith: upgrade to 2.3.0-79 and take MAINTAINER

[patch] devel/csmith: upgrade to 2.3.0-79 and take MAINTAINER

0001-devel-csmith-update-to-2.3.0-79-take-MAINTAINER.patch (text/plain), 10.54 KB, created by Chris Hutchinson on 2025-05-08 03:27:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Hutchinson

Created: 2025-05-08 03:27:55 UTC

Size: 10.54 KB

patch

obsolete

>From 2e37806689077067bf5a4e1182f62b5328efcc02 Mon Sep 17 00:00:00 2001
>From: Chris Hutchinson <portmaster@BSDforge.com>
>Date: Wed, 7 May 2025 20:08:21 -0700
>Subject: [PATCH] devel/csmith: update to 2.3.0-79 take MAINTAINER
>
>---
> devel/csmith/Makefile                         | 37 ++++++++-------
> devel/csmith/distinfo                         |  6 +--
> .../csmith/files/patch-src_ArrayVariable.cpp  | 20 ++++++++
> devel/csmith/files/patch-src_ArrayVariable.h  | 14 ++++++
> devel/csmith/files/patch-src_Attribute.cpp    | 44 ++++++++++++++++++
> devel/csmith/files/patch-src_Attribute.h      | 46 +++++++++++++++++++
> devel/csmith/files/patch-src_Filter.h         | 13 ++++++
> devel/csmith/pkg-plist                        | 38 +++++++--------
> 8 files changed, 179 insertions(+), 39 deletions(-)
> create mode 100644 devel/csmith/files/patch-src_ArrayVariable.cpp
> create mode 100644 devel/csmith/files/patch-src_ArrayVariable.h
> create mode 100644 devel/csmith/files/patch-src_Attribute.cpp
> create mode 100644 devel/csmith/files/patch-src_Attribute.h
> create mode 100644 devel/csmith/files/patch-src_Filter.h
>
>diff --git a/devel/csmith/Makefile b/devel/csmith/Makefile
>index 07c0d1a586a0..c268ce9876dc 100644
>--- a/devel/csmith/Makefile
>+++ b/devel/csmith/Makefile
>@@ -1,33 +1,28 @@
> PORTNAME=	csmith
>-PORTVERSION=	2.3.0
>+DISTVERSION=	2.3.0-79
>+DISTVERSIONSUFFIX=	-g0ec6f1b
> CATEGORIES=	devel
>-MASTER_SITES=	http://embed.cs.utah.edu/csmith/
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	portmaster@BSDforge.com
> COMMENT=	Generates random C programs that conform to the C99 standard
>-WWW=		https://embed.cs.utah.edu/csmith/
>+WWW=		https://github.com/csmith-project/csmith
> 
> LICENSE=	BSD2CLAUSE
> 
>-BROKEN=		Unfetchable
>-DEPRECATED=	Unmaintained for years
>-EXPIRATION_DATE=2024-06-30
>-
>-USES=		gmake libtool localbase perl5 shebangfix
>+USES=		cmake libtool localbase perl5 shebangfix
> USE_CXXSTD=	c++11
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	csmith-project
> USE_LDCONFIG=	yes
> USE_PERL5=	run
> 
> SHEBANG_FILES=	scripts/compiler_test.pl scripts/launchn.pl
>+# kill these next time I get a couple extra cycles...
>+CXXFLAGS+=	-Wno-deprecated-declarations -Wno-unused-variable \
>+		-Wno-unused-parameter
> 
>-GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--docdir=${DOCSDIR}
>-
>-INSTALL_TARGET=	install-strip
>-
>-PLIST_SUB=	PKGNAME="${PKGNAME}"
>-
>-OPTIONS_DEFINE=	DOCS
>+OPTIONS_DEFINE=		DOCS
>+CMAKE_INSTALL_DO_STRIP=	yes
> 
> .include <bsd.port.options.mk>
> 
>@@ -35,4 +30,12 @@ OPTIONS_DEFINE=	DOCS
> CPPFLAGS+=	-Wno-error=enum-constexpr-conversion
> .endif
> 
>+pre-configure:
>+# install
>+	${REINPLACE_CMD} -e 's|CMAKE_INSTALL_PREFIX}/include/|CMAKE_INSTALL_PREFIX}/include/csmith/|'	\
>+		${WRKSRC}/runtime/CMakeLists.txt
>+# speed/performance
>+	${REINPLACE_CMD} -e 's|tmp = tmp.substr(0, pos);|tmp.resize(pos);|'	\
>+		${WRKSRC}/src/Effect.cpp
>+
> .include <bsd.port.mk>
>diff --git a/devel/csmith/distinfo b/devel/csmith/distinfo
>index 19ec2352a1fc..6e3482be86ec 100644
>--- a/devel/csmith/distinfo
>+++ b/devel/csmith/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1498294369
>-SHA256 (csmith-2.3.0.tar.gz) = f247cc0aede5f8a0746271b40a5092b5b5a2d034e5e8f7a836c879dde3fb65d5
>-SIZE (csmith-2.3.0.tar.gz) = 637381
>+TIMESTAMP = 1746669471
>+SHA256 (csmith-project-csmith-2.3.0-79-g0ec6f1b_GH0.tar.gz) = ed8c94b42c8dfd8ada475181facf6a379470a8f469023efa47fbe1d96d9ce47b
>+SIZE (csmith-project-csmith-2.3.0-79-g0ec6f1b_GH0.tar.gz) = 322527
>diff --git a/devel/csmith/files/patch-src_ArrayVariable.cpp b/devel/csmith/files/patch-src_ArrayVariable.cpp
>new file mode 100644
>index 000000000000..1f1d7a75350f
>--- /dev/null
>+++ b/devel/csmith/files/patch-src_ArrayVariable.cpp
>@@ -0,0 +1,20 @@
>+--- src/ArrayVariable.cpp.orig	2025-05-06 09:52:57 UTC
>++++ src/ArrayVariable.cpp
>+@@ -631,7 +631,7 @@
>+ void
>+ ArrayVariable::output_checksum_with_indices(std::ostream &out,
>+					const std::vector<const Variable*>& cvs,
>+-					string field_name) const
>++					const string &field_name) const
>+ {
>+	out << "printf(\"...checksum after hashing ";
>+
>+@@ -697,7 +697,7 @@
>+
>+ // --------------------------------------------------------------
>+ void
>+-ArrayVariable::output_addr_checks(std::ostream &out, const Variable* var, string field_name, int indent) const
>++ArrayVariable::output_addr_checks(std::ostream &out, const Variable* var, const string &field_name, int indent) const
>+ {
>+	size_t i;
>+	vector<const Variable *> &ctrl_vars = Variable::get_new_ctrl_vars();
>diff --git a/devel/csmith/files/patch-src_ArrayVariable.h b/devel/csmith/files/patch-src_ArrayVariable.h
>new file mode 100644
>index 000000000000..3cf02c62dcc1
>--- /dev/null
>+++ b/devel/csmith/files/patch-src_ArrayVariable.h
>@@ -0,0 +1,14 @@
>+--- src/ArrayVariable.h.orig	2025-05-06 09:46:39 UTC
>++++ src/ArrayVariable.h
>+@@ -76,9 +76,9 @@
>+	virtual void OutputLowerBound(std::ostream &) const;
>+	virtual void OutputUpperBound(std::ostream &) const;
>+	void output_with_indices(std::ostream &out, const std::vector<const Variable*>& cvs) const;
>+-	void output_checksum_with_indices(std::ostream &out, const std::vector<const Variable*>& cvs, string field_name) const;
>++	void output_checksum_with_indices(std::ostream &out, const std::vector<const Variable*>& cvs, const string &field_name) const;
>+	void output_init(std::ostream &out, const Expression* init, const vector<const Variable*>& cvs, int indent) const;
>+-	void output_addr_checks(std::ostream &out, const Variable* var, string field_name, int indent) const;
>++	void output_addr_checks(std::ostream &out, const Variable* var, const string &field_name, int indent) const;
>+	void add_init_value(const Expression* e) { init_values.push_back(e);}
>+	const vector<const Expression*>& get_init_values(void) const { return init_values;}
>+	string build_initializer_str(const vector<string>& init_strings) const;
>diff --git a/devel/csmith/files/patch-src_Attribute.cpp b/devel/csmith/files/patch-src_Attribute.cpp
>new file mode 100644
>index 000000000000..4baf108ddbfb
>--- /dev/null
>+++ b/devel/csmith/files/patch-src_Attribute.cpp
>@@ -0,0 +1,44 @@
>+--- src/Attribute.cpp.orig	2025-05-06 09:33:29 UTC
>++++ src/Attribute.cpp
>+@@ -31,12 +31,12 @@
>+		out << "))";
>+ }
>+
>+-Attribute::Attribute(string name, int prob)
>++Attribute::Attribute(const string &name, int prob)
>+	:  name(name), prob(prob)
>+ {
>+ }
>+
>+-BooleanAttribute::BooleanAttribute(string name, int prob)
>++BooleanAttribute::BooleanAttribute(const string &name, int prob)
>+	: Attribute(name, prob)
>+ {
>+ }
>+@@ -50,7 +50,7 @@
>+		return "";
>+ }
>+
>+-MultiChoiceAttribute::MultiChoiceAttribute(string name, int prob, vector<string> arguments)
>++MultiChoiceAttribute::MultiChoiceAttribute(const string &name, int prob, vector<string> arguments)
>+	: Attribute(name, prob), choices(arguments)
>+ {
>+ }
>+@@ -64,7 +64,7 @@
>+		return "";
>+ }
>+
>+-AlignedAttribute::AlignedAttribute(string name, int prob, int alignment_factor)
>++AlignedAttribute::AlignedAttribute(const string &name, int prob, int alignment_factor)
>+	: Attribute(name, prob), alignment(alignment_factor)
>+ {
>+ }
>+@@ -81,7 +81,7 @@
>+		return "";
>+ }
>+
>+-SectionAttribute::SectionAttribute(string name, int prob)
>++SectionAttribute::SectionAttribute(const string &name, int prob)
>+	: Attribute(name, prob)
>+ {
>+ }
>diff --git a/devel/csmith/files/patch-src_Attribute.h b/devel/csmith/files/patch-src_Attribute.h
>new file mode 100644
>index 000000000000..95a9d4bebde1
>--- /dev/null
>+++ b/devel/csmith/files/patch-src_Attribute.h
>@@ -0,0 +1,46 @@
>+--- src/Attribute.h.orig	2025-05-06 09:24:22 UTC
>++++ src/Attribute.h
>+@@ -16,7 +16,7 @@
>+	string name;
>+	//Attribute generation probability
>+	int prob;
>+-	Attribute(string, int);
>++	Attribute( const string &, int);
>+	//Checks attribute probability and generate is accordingly
>+	virtual string make_random() = 0;
>+ };
>+@@ -25,7 +25,7 @@
>+ class BooleanAttribute : public Attribute
>+ {
>+ public:
>+-	BooleanAttribute(string, int);
>++	BooleanAttribute(const string&, int);
>+	string make_random();
>+ };
>+
>+@@ -35,7 +35,7 @@
>+ public:
>+	//stores various options of attributes e.g. visibility options - default, hidden, internal and protected
>+	vector<string> choices;
>+-	MultiChoiceAttribute(string, int, vector<string>);
>++	MultiChoiceAttribute(const string &, int, vector<string>);
>+	string make_random();
>+ };
>+
>+@@ -45,7 +45,7 @@
>+ public:
>+	//alignment factor - [functions] = 16 and [types] = 8 i.e. functions can take alignment upto 2^16 where as type can take upto 2^8
>+	int alignment;
>+-	AlignedAttribute(string, int, int);
>++	AlignedAttribute(const string &, int, int);
>+	string make_random();
>+ };
>+
>+@@ -53,7 +53,7 @@
>+ class SectionAttribute : public Attribute
>+ {
>+ public:
>+-	SectionAttribute(string, int);
>++	SectionAttribute( const string &, int);
>+	string make_random();
>+ };
>diff --git a/devel/csmith/files/patch-src_Filter.h b/devel/csmith/files/patch-src_Filter.h
>new file mode 100644
>index 000000000000..885b5aeb5f80
>--- /dev/null
>+++ b/devel/csmith/files/patch-src_Filter.h
>@@ -0,0 +1,13 @@
>+--- src/Filter.h.orig	2025-05-06 08:52:11 UTC
>++++ src/Filter.h
>+@@ -35,9 +35,8 @@
>+ enum FilterKind {
>+	fDefault,
>+	fDFS,
>++	MAX_FILTER_KIND_SIZE,
>+ };
>+-
>+-#define MAX_FILTER_KIND_SIZE ((FilterKind) (fDFS + 1))
>+
>+ // Filter base class
>+ class Filter
>diff --git a/devel/csmith/pkg-plist b/devel/csmith/pkg-plist
>index 4191f8185f10..0376c911ec4c 100644
>--- a/devel/csmith/pkg-plist
>+++ b/devel/csmith/pkg-plist
>@@ -2,25 +2,25 @@ bin/compiler_test.in
> bin/compiler_test.pl
> bin/csmith
> bin/launchn.pl
>-include/%%PKGNAME%%/csmith.h
>-include/%%PKGNAME%%/csmith_minimal.h
>-include/%%PKGNAME%%/custom_limits.h
>-include/%%PKGNAME%%/custom_stdint_x86.h
>-include/%%PKGNAME%%/platform_avr.h
>-include/%%PKGNAME%%/platform_generic.h
>-include/%%PKGNAME%%/platform_msp430.h
>-include/%%PKGNAME%%/random_inc.h
>-include/%%PKGNAME%%/safe_abbrev.h
>-include/%%PKGNAME%%/safe_math.h
>-include/%%PKGNAME%%/safe_math_macros.h
>-include/%%PKGNAME%%/safe_math_macros_notmp.h
>-include/%%PKGNAME%%/stdint_avr.h
>-include/%%PKGNAME%%/stdint_ia32.h
>-include/%%PKGNAME%%/stdint_ia64.h
>-include/%%PKGNAME%%/stdint_msp430.h
>-include/%%PKGNAME%%/volatile_runtime.c
>-include/%%PKGNAME%%/volatile_runtime.h
>-include/%%PKGNAME%%/windows/stdint.h
>+include/csmith/csmith.h
>+include/csmith/csmith_minimal.h
>+include/csmith/custom_limits.h
>+include/csmith/custom_stdint_x86.h
>+include/csmith/platform_avr.h
>+include/csmith/platform_generic.h
>+include/csmith/platform_msp430.h
>+include/csmith/random_inc.h
>+include/csmith/safe_abbrev.h
>+include/csmith/safe_math.h
>+include/csmith/safe_math_macros.h
>+include/csmith/safe_math_macros_notmp.h
>+include/csmith/stdint_avr.h
>+include/csmith/stdint_ia32.h
>+include/csmith/stdint_ia64.h
>+include/csmith/stdint_msp430.h
>+include/csmith/volatile_runtime.c
>+include/csmith/volatile_runtime.h
>+include/csmith/windows/stdint.h
> lib/libcsmith.a
> lib/libcsmith.so
> lib/libcsmith.so.0
>-- 
>2.49.0
>

Actions: View | Diff

Attachments on bug 286634: 260214 | 260252