Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[v0.10] Include {xrdp,sesman}.ini.in instead of substituted .ini in tarball #3188

Merged
merged 1 commit into from
Aug 1, 2024

Conversation

metalefty
Copy link
Member

These config files are intended to be substituted during the build process. The substituted .ini files should not be included in release tarballs.

Fixes: #3187

@metalefty
Copy link
Member Author

Test results

tarball contents

  1. contains xrdp.ini.in and sesman.ini.in
  2. not contain xrdp.ini and sesman.ini
./bootstrap && ./configure && make dist
tar ztf xrdp-0.10.1.tar.gz | egrep "(sesman|xrdp)(\.ini$|\.ini\.in)"
xrdp-0.10.1/sesman/sesman.ini.in
xrdp-0.10.1/xrdp/xrdp.ini.in

xrdp.ini and sesman.ini are created after make

tar zxfv xrdp-0.10.1.tar.gz
cd xrdp-0.10.1
./configure && make -j8
find . -name \*.ini | grep -v km-
./sesman/sesman.ini
./xrdp/xrdp.ini
./xrdp/xrdp_keyboard.ini

xrdp.ini and sesman.ini are removed after make clean

make clean
find . -name \*.ini | grep -v km-
./xrdp/xrdp_keyboard.ini

@metalefty metalefty changed the title Include {xrdp,sesman}.ini.in instead of substituted .ini [v0.10] Include {xrdp,sesman}.ini.in instead of substituted .ini in tarball Aug 1, 2024
These config files are intended to be substituted during the build
process. The substituted .ini files should not be included in release
tarballs.

Fixes:  neutrinolabs#3187
@metalefty metalefty merged commit 72892c1 into neutrinolabs:v0.10 Aug 1, 2024
13 checks passed
@metalefty metalefty deleted the v0.10-tarball branch August 1, 2024 11:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants