* [PR PATCH] ntdsextract2: update to 1.2.1.
@ 2024-05-17 20:17 abenson
2024-05-17 20:29 ` [PR PATCH] [Updated] " abenson
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: abenson @ 2024-05-17 20:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 623 bytes --]
There is a new pull request by abenson against master on the void-packages repository
https://github.com/abenson/void-packages ntdsextract2_1.2.0
https://github.com/void-linux/void-packages/pull/50397
ntdsextract2: update to 1.2.1.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
- aarch64
- armv7l
- i686
A patch file from https://github.com/void-linux/void-packages/pull/50397.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ntdsextract2_1.2.0-50397.patch --]
[-- Type: text/x-diff, Size: 2765 bytes --]
From 1322ffa1827f06d783a0761e9352972b527b9432 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 27 Feb 2024 08:06:22 -0600
Subject: [PATCH] ntdsextract2: update to 1.2.1.
---
| 23 +++++++++++++++++++
| 20 ++++++++++++----
2 files changed, 38 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch
--git a/srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch b/srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch
new file mode 100644
index 00000000000000..307cfb8871256e
--- /dev/null
+++ b/srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch
@@ -0,0 +1,23 @@
+--- a/ntdsextract2-1.2.1/Cargo.toml
++++ b/ntdsextract2-1.2.1/Cargo.toml
+@@ -37,8 +37,7 @@
+ paste = "1.0"
+ bodyfile = "0.1.4"
+ hashbrown = "0"
+-libesedb = "0.2.5"
+-#libesedb = {path="../rust-libesedb"}
++libesedb = {path="../rust-libesedb-libesedb-v0.2.5/"}
+
+ serde = { version = "1.0", features = ["derive"] }
+ serde_json = "1.0"
+--- a/rust-libesedb-libesedb-v0.2.5/libesedb-sys/libesedb-20230824/common/config.h
++++ b/rust-libesedb-libesedb-v0.2.5/libesedb-sys/libesedb-20230824/common/config.h
+@@ -26,7 +26,7 @@
+ #define HAVE_CLOSE 1
+
+ /* Define to 1 if you have the <cygwin/fs.h> header file. */
+-#define HAVE_CYGWIN_FS_H 1
++/*#define HAVE_CYGWIN_FS_H 1*/
+
+ /* Define if the GNU dcgettext() function is already present or preinstalled.
+ */
--git a/srcpkgs/ntdsextract2/template b/srcpkgs/ntdsextract2/template
index 09cd392f601587..e0ab06c3872c64 100644
--- a/srcpkgs/ntdsextract2/template
+++ b/srcpkgs/ntdsextract2/template
@@ -1,12 +1,22 @@
# Template file for 'ntdsextract2'
pkgname=ntdsextract2
-reverts="1.0.0_1"
-version=0.13.0
-revision=2
+version=1.2.1
+revision=1
+_esedbver=0.2.5
+build_wrksrc="${pkgname}-${version}"
build_style=cargo
short_desc="Display contents of Active Directory database files"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/janstarke/ntdsextract2"
-distfiles="https://github.com/janstarke/ntdsextract2/archive/refs/tags/v${version}.tar.gz"
-checksum=6f11d86440f2ec9383bb0857864f96fd470c97be19b3d67af0a2c949c19aa3b1
+distfiles="https://github.com/janstarke/ntdsextract2/archive/refs/tags/v${version}.tar.gz
+ https://github.com/sunsetkookaburra/rust-libesedb/archive/refs/tags/libesedb-v${_esedbver}.tar.gz"
+checksum="2aac2a849f762322bc5c71d658375f490e5ab14948fcaa3debfe20de3b1c5e18
+ 30fce9b9766903280d3f6273e2f991b2296ccd3eed878262d1a68c7ceb76b658"
+
+pre_configure() {
+ if [ "$XBPS_WORDSIZE" = 32 ]; then
+ vsed -e "s/4096 \* 1024 \* 1024/usize::max_value()/" -i src/main.rs
+ fi
+ cargo update
+}
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] ntdsextract2: update to 1.2.1.
2024-05-17 20:17 [PR PATCH] ntdsextract2: update to 1.2.1 abenson
@ 2024-05-17 20:29 ` abenson
2024-05-17 20:43 ` abenson
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: abenson @ 2024-05-17 20:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 628 bytes --]
There is an updated pull request by abenson against master on the void-packages repository
https://github.com/abenson/void-packages ntdsextract2_1.2.0
https://github.com/void-linux/void-packages/pull/50397
ntdsextract2: update to 1.2.1.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
- aarch64
- armv7l
- i686
A patch file from https://github.com/void-linux/void-packages/pull/50397.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ntdsextract2_1.2.0-50397.patch --]
[-- Type: text/x-diff, Size: 2821 bytes --]
From 3bfcae1b6e3bd7b160e7ddc394fc13688bd666b6 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 27 Feb 2024 08:06:22 -0600
Subject: [PATCH] ntdsextract2: update to 1.2.1.
---
| 23 +++++++++++++++++++
| 21 +++++++++++++----
2 files changed, 39 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch
--git a/srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch b/srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch
new file mode 100644
index 00000000000000..307cfb8871256e
--- /dev/null
+++ b/srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch
@@ -0,0 +1,23 @@
+--- a/ntdsextract2-1.2.1/Cargo.toml
++++ b/ntdsextract2-1.2.1/Cargo.toml
+@@ -37,8 +37,7 @@
+ paste = "1.0"
+ bodyfile = "0.1.4"
+ hashbrown = "0"
+-libesedb = "0.2.5"
+-#libesedb = {path="../rust-libesedb"}
++libesedb = {path="../rust-libesedb-libesedb-v0.2.5/"}
+
+ serde = { version = "1.0", features = ["derive"] }
+ serde_json = "1.0"
+--- a/rust-libesedb-libesedb-v0.2.5/libesedb-sys/libesedb-20230824/common/config.h
++++ b/rust-libesedb-libesedb-v0.2.5/libesedb-sys/libesedb-20230824/common/config.h
+@@ -26,7 +26,7 @@
+ #define HAVE_CLOSE 1
+
+ /* Define to 1 if you have the <cygwin/fs.h> header file. */
+-#define HAVE_CYGWIN_FS_H 1
++/*#define HAVE_CYGWIN_FS_H 1*/
+
+ /* Define if the GNU dcgettext() function is already present or preinstalled.
+ */
--git a/srcpkgs/ntdsextract2/template b/srcpkgs/ntdsextract2/template
index 09cd392f601587..477caf798d18c8 100644
--- a/srcpkgs/ntdsextract2/template
+++ b/srcpkgs/ntdsextract2/template
@@ -1,12 +1,23 @@
# Template file for 'ntdsextract2'
pkgname=ntdsextract2
-reverts="1.0.0_1"
-version=0.13.0
-revision=2
+version=1.2.1
+revision=1
+_esedbver=0.2.5
+build_wrksrc="${pkgname}-${version}"
build_style=cargo
short_desc="Display contents of Active Directory database files"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/janstarke/ntdsextract2"
-distfiles="https://github.com/janstarke/ntdsextract2/archive/refs/tags/v${version}.tar.gz"
-checksum=6f11d86440f2ec9383bb0857864f96fd470c97be19b3d67af0a2c949c19aa3b1
+distfiles="https://github.com/janstarke/ntdsextract2/archive/refs/tags/v${version}.tar.gz
+ https://github.com/sunsetkookaburra/rust-libesedb/archive/refs/tags/libesedb-v${_esedbver}.tar.gz"
+checksum="2aac2a849f762322bc5c71d658375f490e5ab14948fcaa3debfe20de3b1c5e18
+ 30fce9b9766903280d3f6273e2f991b2296ccd3eed878262d1a68c7ceb76b658"
+make_check=no # requires large sample file for testing
+
+pre_configure() {
+ if [ "$XBPS_WORDSIZE" = 32 ]; then
+ vsed -e "s/4096 \* 1024 \* 1024/usize::max_value()/" -i src/main.rs
+ fi
+ cargo update
+}
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] ntdsextract2: update to 1.2.1.
2024-05-17 20:17 [PR PATCH] ntdsextract2: update to 1.2.1 abenson
2024-05-17 20:29 ` [PR PATCH] [Updated] " abenson
@ 2024-05-17 20:43 ` abenson
2024-05-17 20:51 ` abenson
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: abenson @ 2024-05-17 20:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 628 bytes --]
There is an updated pull request by abenson against master on the void-packages repository
https://github.com/abenson/void-packages ntdsextract2_1.2.0
https://github.com/void-linux/void-packages/pull/50397
ntdsextract2: update to 1.2.1.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
- aarch64
- armv7l
- i686
A patch file from https://github.com/void-linux/void-packages/pull/50397.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ntdsextract2_1.2.0-50397.patch --]
[-- Type: text/x-diff, Size: 2772 bytes --]
From 953f186e60f8994067a6838f387a7b20803bc8d4 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 27 Feb 2024 08:06:22 -0600
Subject: [PATCH] ntdsextract2: update to 1.2.1.
---
| 23 +++++++++++++++++++
| 20 ++++++++++++----
2 files changed, 38 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch
--git a/srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch b/srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch
new file mode 100644
index 00000000000000..307cfb8871256e
--- /dev/null
+++ b/srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch
@@ -0,0 +1,23 @@
+--- a/ntdsextract2-1.2.1/Cargo.toml
++++ b/ntdsextract2-1.2.1/Cargo.toml
+@@ -37,8 +37,7 @@
+ paste = "1.0"
+ bodyfile = "0.1.4"
+ hashbrown = "0"
+-libesedb = "0.2.5"
+-#libesedb = {path="../rust-libesedb"}
++libesedb = {path="../rust-libesedb-libesedb-v0.2.5/"}
+
+ serde = { version = "1.0", features = ["derive"] }
+ serde_json = "1.0"
+--- a/rust-libesedb-libesedb-v0.2.5/libesedb-sys/libesedb-20230824/common/config.h
++++ b/rust-libesedb-libesedb-v0.2.5/libesedb-sys/libesedb-20230824/common/config.h
+@@ -26,7 +26,7 @@
+ #define HAVE_CLOSE 1
+
+ /* Define to 1 if you have the <cygwin/fs.h> header file. */
+-#define HAVE_CYGWIN_FS_H 1
++/*#define HAVE_CYGWIN_FS_H 1*/
+
+ /* Define if the GNU dcgettext() function is already present or preinstalled.
+ */
--git a/srcpkgs/ntdsextract2/template b/srcpkgs/ntdsextract2/template
index 09cd392f601587..d6df01957aaa5b 100644
--- a/srcpkgs/ntdsextract2/template
+++ b/srcpkgs/ntdsextract2/template
@@ -1,12 +1,22 @@
# Template file for 'ntdsextract2'
pkgname=ntdsextract2
-reverts="1.0.0_1"
-version=0.13.0
-revision=2
+version=1.2.1
+revision=1
+_esedbver=0.2.5
+build_wrksrc="${pkgname}-${version}"
build_style=cargo
short_desc="Display contents of Active Directory database files"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/janstarke/ntdsextract2"
-distfiles="https://github.com/janstarke/ntdsextract2/archive/refs/tags/v${version}.tar.gz"
-checksum=6f11d86440f2ec9383bb0857864f96fd470c97be19b3d67af0a2c949c19aa3b1
+distfiles="https://github.com/janstarke/ntdsextract2/archive/refs/tags/v${version}.tar.gz
+ https://github.com/sunsetkookaburra/rust-libesedb/archive/refs/tags/libesedb-v${_esedbver}.tar.gz"
+checksum="2aac2a849f762322bc5c71d658375f490e5ab14948fcaa3debfe20de3b1c5e18
+ 30fce9b9766903280d3f6273e2f991b2296ccd3eed878262d1a68c7ceb76b658"
+
+pre_configure() {
+ if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ vsed -e "s/4096 \* 1024 \* 1024/usize::max_value()/" -i src/main.rs
+ fi
+ cargo update
+}
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] ntdsextract2: update to 1.2.1.
2024-05-17 20:17 [PR PATCH] ntdsextract2: update to 1.2.1 abenson
2024-05-17 20:29 ` [PR PATCH] [Updated] " abenson
2024-05-17 20:43 ` abenson
@ 2024-05-17 20:51 ` abenson
2024-05-17 20:56 ` abenson
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: abenson @ 2024-05-17 20:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 628 bytes --]
There is an updated pull request by abenson against master on the void-packages repository
https://github.com/abenson/void-packages ntdsextract2_1.2.0
https://github.com/void-linux/void-packages/pull/50397
ntdsextract2: update to 1.2.1.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
- aarch64
- armv7l
- i686
A patch file from https://github.com/void-linux/void-packages/pull/50397.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ntdsextract2_1.2.0-50397.patch --]
[-- Type: text/x-diff, Size: 2855 bytes --]
From 7bc0065aa3b1bcec2bdd64122617e965bfe454e5 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 27 Feb 2024 08:06:22 -0600
Subject: [PATCH] ntdsextract2: update to 1.2.1.
---
| 23 +++++++++++++++++++
| 21 +++++++++++++----
2 files changed, 39 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch
--git a/srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch b/srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch
new file mode 100644
index 00000000000000..307cfb8871256e
--- /dev/null
+++ b/srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch
@@ -0,0 +1,23 @@
+--- a/ntdsextract2-1.2.1/Cargo.toml
++++ b/ntdsextract2-1.2.1/Cargo.toml
+@@ -37,8 +37,7 @@
+ paste = "1.0"
+ bodyfile = "0.1.4"
+ hashbrown = "0"
+-libesedb = "0.2.5"
+-#libesedb = {path="../rust-libesedb"}
++libesedb = {path="../rust-libesedb-libesedb-v0.2.5/"}
+
+ serde = { version = "1.0", features = ["derive"] }
+ serde_json = "1.0"
+--- a/rust-libesedb-libesedb-v0.2.5/libesedb-sys/libesedb-20230824/common/config.h
++++ b/rust-libesedb-libesedb-v0.2.5/libesedb-sys/libesedb-20230824/common/config.h
+@@ -26,7 +26,7 @@
+ #define HAVE_CLOSE 1
+
+ /* Define to 1 if you have the <cygwin/fs.h> header file. */
+-#define HAVE_CYGWIN_FS_H 1
++/*#define HAVE_CYGWIN_FS_H 1*/
+
+ /* Define if the GNU dcgettext() function is already present or preinstalled.
+ */
--git a/srcpkgs/ntdsextract2/template b/srcpkgs/ntdsextract2/template
index 09cd392f601587..abc1fabe4f05cd 100644
--- a/srcpkgs/ntdsextract2/template
+++ b/srcpkgs/ntdsextract2/template
@@ -1,12 +1,23 @@
# Template file for 'ntdsextract2'
pkgname=ntdsextract2
-reverts="1.0.0_1"
-version=0.13.0
-revision=2
+version=1.2.1
+revision=1
+_esedbver=0.2.5
+build_wrksrc="${pkgname}-${version}"
build_style=cargo
short_desc="Display contents of Active Directory database files"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/janstarke/ntdsextract2"
-distfiles="https://github.com/janstarke/ntdsextract2/archive/refs/tags/v${version}.tar.gz"
-checksum=6f11d86440f2ec9383bb0857864f96fd470c97be19b3d67af0a2c949c19aa3b1
+distfiles="https://github.com/janstarke/ntdsextract2/archive/refs/tags/v${version}.tar.gz
+ https://github.com/sunsetkookaburra/rust-libesedb/archive/refs/tags/libesedb-v${_esedbver}.tar.gz"
+checksum="2aac2a849f762322bc5c71d658375f490e5ab14948fcaa3debfe20de3b1c5e18
+ 30fce9b9766903280d3f6273e2f991b2296ccd3eed878262d1a68c7ceb76b658"
+make_check=no # testing requires a large sample test file that isn't distributed
+
+pre_configure() {
+ if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ vsed -e "s/4096 \* 1024 \* 1024/usize::max_value()/" -i src/main.rs
+ fi
+ cargo update
+}
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] ntdsextract2: update to 1.2.1.
2024-05-17 20:17 [PR PATCH] ntdsextract2: update to 1.2.1 abenson
` (2 preceding siblings ...)
2024-05-17 20:51 ` abenson
@ 2024-05-17 20:56 ` abenson
2024-05-17 21:09 ` abenson
2024-05-27 2:08 ` [PR PATCH] [Merged]: " abenson
5 siblings, 0 replies; 7+ messages in thread
From: abenson @ 2024-05-17 20:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 628 bytes --]
There is an updated pull request by abenson against master on the void-packages repository
https://github.com/abenson/void-packages ntdsextract2_1.2.0
https://github.com/void-linux/void-packages/pull/50397
ntdsextract2: update to 1.2.1.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
- aarch64
- armv7l
- i686
A patch file from https://github.com/void-linux/void-packages/pull/50397.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ntdsextract2_1.2.0-50397.patch --]
[-- Type: text/x-diff, Size: 2855 bytes --]
From 066ef3547bfafecac582549fe8d012fb31825193 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 27 Feb 2024 08:06:22 -0600
Subject: [PATCH] ntdsextract2: update to 1.2.1.
---
| 23 +++++++++++++++++++
| 21 +++++++++++++----
2 files changed, 39 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch
--git a/srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch b/srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch
new file mode 100644
index 00000000000000..307cfb8871256e
--- /dev/null
+++ b/srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch
@@ -0,0 +1,23 @@
+--- a/ntdsextract2-1.2.1/Cargo.toml
++++ b/ntdsextract2-1.2.1/Cargo.toml
+@@ -37,8 +37,7 @@
+ paste = "1.0"
+ bodyfile = "0.1.4"
+ hashbrown = "0"
+-libesedb = "0.2.5"
+-#libesedb = {path="../rust-libesedb"}
++libesedb = {path="../rust-libesedb-libesedb-v0.2.5/"}
+
+ serde = { version = "1.0", features = ["derive"] }
+ serde_json = "1.0"
+--- a/rust-libesedb-libesedb-v0.2.5/libesedb-sys/libesedb-20230824/common/config.h
++++ b/rust-libesedb-libesedb-v0.2.5/libesedb-sys/libesedb-20230824/common/config.h
+@@ -26,7 +26,7 @@
+ #define HAVE_CLOSE 1
+
+ /* Define to 1 if you have the <cygwin/fs.h> header file. */
+-#define HAVE_CYGWIN_FS_H 1
++/*#define HAVE_CYGWIN_FS_H 1*/
+
+ /* Define if the GNU dcgettext() function is already present or preinstalled.
+ */
--git a/srcpkgs/ntdsextract2/template b/srcpkgs/ntdsextract2/template
index 09cd392f601587..abc1fabe4f05cd 100644
--- a/srcpkgs/ntdsextract2/template
+++ b/srcpkgs/ntdsextract2/template
@@ -1,12 +1,23 @@
# Template file for 'ntdsextract2'
pkgname=ntdsextract2
-reverts="1.0.0_1"
-version=0.13.0
-revision=2
+version=1.2.1
+revision=1
+_esedbver=0.2.5
+build_wrksrc="${pkgname}-${version}"
build_style=cargo
short_desc="Display contents of Active Directory database files"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/janstarke/ntdsextract2"
-distfiles="https://github.com/janstarke/ntdsextract2/archive/refs/tags/v${version}.tar.gz"
-checksum=6f11d86440f2ec9383bb0857864f96fd470c97be19b3d67af0a2c949c19aa3b1
+distfiles="https://github.com/janstarke/ntdsextract2/archive/refs/tags/v${version}.tar.gz
+ https://github.com/sunsetkookaburra/rust-libesedb/archive/refs/tags/libesedb-v${_esedbver}.tar.gz"
+checksum="2aac2a849f762322bc5c71d658375f490e5ab14948fcaa3debfe20de3b1c5e18
+ 30fce9b9766903280d3f6273e2f991b2296ccd3eed878262d1a68c7ceb76b658"
+make_check=no # testing requires a large sample test file that isn't distributed
+
+pre_configure() {
+ if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ vsed -e "s/4096 \* 1024 \* 1024/usize::max_value()/" -i src/main.rs
+ fi
+ cargo update
+}
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] ntdsextract2: update to 1.2.1.
2024-05-17 20:17 [PR PATCH] ntdsextract2: update to 1.2.1 abenson
` (3 preceding siblings ...)
2024-05-17 20:56 ` abenson
@ 2024-05-17 21:09 ` abenson
2024-05-27 2:08 ` [PR PATCH] [Merged]: " abenson
5 siblings, 0 replies; 7+ messages in thread
From: abenson @ 2024-05-17 21:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 628 bytes --]
There is an updated pull request by abenson against master on the void-packages repository
https://github.com/abenson/void-packages ntdsextract2_1.2.0
https://github.com/void-linux/void-packages/pull/50397
ntdsextract2: update to 1.2.1.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
- aarch64
- armv7l
- i686
A patch file from https://github.com/void-linux/void-packages/pull/50397.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ntdsextract2_1.2.0-50397.patch --]
[-- Type: text/x-diff, Size: 2865 bytes --]
From 1104c21ebfc8cfdb18f86be744c6c232ee6bf4be Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 27 Feb 2024 08:06:22 -0600
Subject: [PATCH] ntdsextract2: update to 1.2.1.
---
| 23 +++++++++++++++++++
| 21 +++++++++++++----
2 files changed, 39 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch
--git a/srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch b/srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch
new file mode 100644
index 00000000000000..307cfb8871256e
--- /dev/null
+++ b/srcpkgs/ntdsextract2/patches/no-cygwin-fs.patch
@@ -0,0 +1,23 @@
+--- a/ntdsextract2-1.2.1/Cargo.toml
++++ b/ntdsextract2-1.2.1/Cargo.toml
+@@ -37,8 +37,7 @@
+ paste = "1.0"
+ bodyfile = "0.1.4"
+ hashbrown = "0"
+-libesedb = "0.2.5"
+-#libesedb = {path="../rust-libesedb"}
++libesedb = {path="../rust-libesedb-libesedb-v0.2.5/"}
+
+ serde = { version = "1.0", features = ["derive"] }
+ serde_json = "1.0"
+--- a/rust-libesedb-libesedb-v0.2.5/libesedb-sys/libesedb-20230824/common/config.h
++++ b/rust-libesedb-libesedb-v0.2.5/libesedb-sys/libesedb-20230824/common/config.h
+@@ -26,7 +26,7 @@
+ #define HAVE_CLOSE 1
+
+ /* Define to 1 if you have the <cygwin/fs.h> header file. */
+-#define HAVE_CYGWIN_FS_H 1
++/*#define HAVE_CYGWIN_FS_H 1*/
+
+ /* Define if the GNU dcgettext() function is already present or preinstalled.
+ */
--git a/srcpkgs/ntdsextract2/template b/srcpkgs/ntdsextract2/template
index 09cd392f601587..0be4f56270bce3 100644
--- a/srcpkgs/ntdsextract2/template
+++ b/srcpkgs/ntdsextract2/template
@@ -1,12 +1,23 @@
# Template file for 'ntdsextract2'
pkgname=ntdsextract2
-reverts="1.0.0_1"
-version=0.13.0
-revision=2
+version=1.2.1
+revision=1
+_esedbver=0.2.5
+build_wrksrc="${pkgname}-${version}"
build_style=cargo
short_desc="Display contents of Active Directory database files"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/janstarke/ntdsextract2"
-distfiles="https://github.com/janstarke/ntdsextract2/archive/refs/tags/v${version}.tar.gz"
-checksum=6f11d86440f2ec9383bb0857864f96fd470c97be19b3d67af0a2c949c19aa3b1
+distfiles="https://github.com/janstarke/ntdsextract2/archive/refs/tags/v${version}.tar.gz
+ https://github.com/sunsetkookaburra/rust-libesedb/archive/refs/tags/libesedb-v${_esedbver}.tar.gz"
+checksum="2aac2a849f762322bc5c71d658375f490e5ab14948fcaa3debfe20de3b1c5e18
+ 30fce9b9766903280d3f6273e2f991b2296ccd3eed878262d1a68c7ceb76b658"
+make_check=no # testing requires a large sample test file that isn't distributed
+
+pre_configure() {
+ if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ vsed -e "s/4096 \* 1024 \* 1024/usize::max_value()/" -i src/main.rs
+ fi
+ cargo generate-lockfile
+}
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Merged]: ntdsextract2: update to 1.2.1.
2024-05-17 20:17 [PR PATCH] ntdsextract2: update to 1.2.1 abenson
` (4 preceding siblings ...)
2024-05-17 21:09 ` abenson
@ 2024-05-27 2:08 ` abenson
5 siblings, 0 replies; 7+ messages in thread
From: abenson @ 2024-05-27 2:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 461 bytes --]
There's a merged pull request on the void-packages repository
ntdsextract2: update to 1.2.1.
https://github.com/void-linux/void-packages/pull/50397
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
- aarch64
- armv7l
- i686
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-05-27 2:08 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-17 20:17 [PR PATCH] ntdsextract2: update to 1.2.1 abenson
2024-05-17 20:29 ` [PR PATCH] [Updated] " abenson
2024-05-17 20:43 ` abenson
2024-05-17 20:51 ` abenson
2024-05-17 20:56 ` abenson
2024-05-17 21:09 ` abenson
2024-05-27 2:08 ` [PR PATCH] [Merged]: " abenson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).