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
[vpnc] Switch to new upstream and update to 0.5.3.r524 #1
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Got this when building:
install -m644 src/doc/*.md /path/to/vpnc/installroot/usr/share/doc/vpnc
install: cannot stat 'src/doc/*.md': No such file or directory
make: *** [Makefile:153: install-doc] Error 1
error: Bad exit status from /var/tmp/rpm-tmp.7RgVjU (%install)
And we do not need the old source vpnc-0.5.3.tar.gz after this change, right? And the patches apply only to that so those became obsolete as well?
Do you have all the submodules?
Oh yeah I forgot those fixed. |
Yep, ran the common prior build. |
|
Jussi Laakkonen ***@***.***> writes:
Yep, ran the common
```
git submodule init
git submodule update
```
prior build.
Try `git submodule update --init --recursive`.
|
Yeah that did it. Apparently the docs isn't updated without Maybe we should get rid of at least the rpm errors when doing this kind of package reformatting: I'll test this tomorrow as it now builds. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Otherwise seems ok now.
But we could get rid of this kind of RPM errors still:
vpnc-pcf2vpnc.aarch64: E: incorrect-fsf-address /usr/bin/pcf2vpnc
|
Jussi Laakkonen ***@***.***> writes:
Otherwise seems ok now.
But we could get rid of this kind of RPM errors still:
`vpnc-pcf2vpnc.aarch64: E: incorrect-fsf-address /usr/bin/pcf2vpnc`
Reported: streambinder/vpnc#39
|
rpm/vpnc.spec
Outdated
| Version: 0.5.3 | ||
| Release: 0 | ||
| Summary: IPSec VPN client compatible with Cisco equipment | ||
| Group: Applications/Internet |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Drop group
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah we do not use Group anywhere in the spec-files.
rpm/vpnc.spec
Outdated
| Release: 0 | ||
| Summary: IPSec VPN client compatible with Cisco equipment | ||
| Group: Applications/Internet | ||
| License: GPL-2.0-or-later |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not according to what we use, see what previous .spec had
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The license of the package states GPL-2.0 or later it's not about what we use.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We follow the Fedora guidelines for package license which states:
"Each license identifier in the SPDX expression forming the License: field must correspond to a license that is allowed by Fedora for the appropriate category of material. In rare cases Fedora may grant limited exceptions permitting otherwise not-allowed licenses for specific packages or under other specific conditions; this will be noted in the TOML file for the license in the Fedora License Data repository."
| License: GPL-2.0-or-later | ||
| URL: https://github.com/streambinder/vpnc | ||
| Source0: %{name}-%{version}.tar.gz | ||
| BuildRequires: pkgconfig(libgcrypt) > 1.1.90 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should obsolete the consoleuser package here from old packaging?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Those were never installed and technically still work, however I can still add those.
| %doc %{_docdir}/%{name}/FAQ.md | ||
| %doc %{_docdir}/%{name}/Installation.md | ||
| %doc %{_docdir}/%{name}/example.conf | ||
|
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is just github not showing the changes to previous .spec or you didn't do git mv for the spec file to see those?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The changes to spec are so great that git doesn't recognize the move anymore.
1c2c3bf
to
6e9b457
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, tested, seems to work with libreswan VPN server. Not taking stance on the licensing issue.
Just drop Group from spec and then it is fine for me.
Switch to new upstream and update to 0.5.3.r524. Remove old packaging cruft that was imported from Fedora, most of these were related to the vpnc script that we don't use. Switch anything besides vpnc programs such as default config, which was only used if vpnc was started outside of a connection manager, to the documentation package. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>
[vpnc] Switch to new upstream and update to 0.5.3.r524
[vpnc] Switch to new upstream and update to 0.5.3.r526
[vpnc] Switch to new upstream and update to 0.5.3.r526
Switch to new upstream and update to 0.5.3.r524.
Remove old packaging cruft that was imported from Fedora, most of
these were related to the vpnc script that we don't use.
Switch anything besides vpnc programs such as default config, which
was only used if vpnc was started outside of a connection manager, to
the documentation package.