Skip to content

Update keepassxc from 2.2.2 to 2.4.1 #1073

Merged
merged 3 commits into from
Apr 18, 2019

Conversation

david
Copy link
Collaborator

@david david commented Apr 15, 2019

No description provided.

argon2.be0 Outdated
#}

mee_build() {
make libs DESTDIR=${D}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are you not building the binary argon2? Is it too big? That would also simplify the build script.

@david
Copy link
Collaborator Author

david commented Apr 17, 2019 via email

@donald
Copy link
Collaborator

donald commented Apr 18, 2019

I think, the binary is built during bee_install, because the makefile has the required dependencies. The default bee_build would do and the executable would be build in the build phase, not in the install phase, with feels a bit better.

But in the build log it says "Building with optimizations for native" and I see "gcc -march=native" which might be a bit dangerous. Looking at the Makefile, I see that a generic version can be produced by setting OPTTARGET to something which the compiler doesn't accept on -march .

So I suggest

mee_build() {
    bee_build OPTTARGET=generic
}

Argon2 is a password-hashing function, which keepasxc need.
needs for browser support of keepassxc
add browser support
Request from Sven Klages
helpdesk 11.4.19 MariuX: KeePassXC 2.4
@david david force-pushed the update-keepassxc-from-2.2.2-to-2.4.1 branch from ec55b15 to 1cc4794 Compare April 18, 2019 14:32
@david
Copy link
Collaborator Author

david commented Apr 18, 2019

Thanks I have update it and also add it to bee_install
because without

[BEE] => entering mee_install() ..
[BEE] make install PREFIX=/usr EPREFIX=/usr BINDIR=/usr/bin SBINDIR=/usr/sbin LIBEXECDIR=/usr/libexec SYSCONFDIR=/etc SHAREDSTATEDIR=/var LOCALSTATEDIR=/var LIBDIR=/usr/lib INCLUDEDIR=/usr/include DATAROOTDIR=/usr/share DATADIR=/usr/share INFODIR=/usr/share/info LOCALEDIR=/usr/share/locale MANDIR=/usr/share/man DOCDIR=/usr/share/doc/argon2 DESTDIR=/scratch/local/bee-schrader/argon2/argon2-20171227-0/image
Building with optimizations for native
cc -std=c89 -O3 -Wall -g -Iinclude -Isrc -pthread -march=native   -c -o src/opt.o src/opt.c
install -d /scratch/local/bee-schrader/argon2/argon2-20171227-0/image/usr/include
install -m 0644 include/argon2.h /scratch/local/bee-schrader/argon2/argon2-20171227-0/image/usr/include
install -d /scratch/local/bee-schrader/argon2/argon2-20171227-0/image/usr/lib
install libargon2.so.1 libargon2.a /scratch/local/bee-schrader/argon2/argon2-20171227-0/image/usr/lib
cd /scratch/local/bee-schrader/argon2/argon2-20171227-0/image/usr/lib && ln -s libargon2.so.1 libargon2.so
install -d /scratch/local/bee-schrader/argon2/argon2-20171227-0/image/usr/bin
install argon2 /scratch/local/bee-schrader/argon2/argon2-20171227-0/image/usr/bin
[BEE] <= leaving mee_install() ..

@pmenzel pmenzel merged commit a690249 into master Apr 18, 2019
Sign in to join this conversation on GitHub.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants