[pacman-dev] [PATCH 1/4] Recommend using "updpkgsums" in PKGBUILD prototypes instead of "makepkg -g"

older
[pacman-dev] [PATCH 0/4] Smatch...

Jason St. John

16 Jan 2014 16 Jan '14

10:18 p.m.

Signed-off-by: Jason St. John --- proto/PKGBUILD-split.proto | 2 +- proto/PKGBUILD.proto | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto index f341052..b2832b9 100644 --- a/proto/PKGBUILD-split.proto +++ b/proto/PKGBUILD-split.proto @@ -27,7 +27,7 @@ changelog= source=("$pkgbase-$pkgver.tar.gz" "$pkgname-$pkgver.patch") noextract=() -md5sums=() #generate with 'makepkg -g' +md5sums=() # generate with 'updpkgsums' prepare() { cd "$pkgname-$pkgver" diff --git a/proto/PKGBUILD.proto b/proto/PKGBUILD.proto index 8d26c81..479d5e5 100644 --- a/proto/PKGBUILD.proto +++ b/proto/PKGBUILD.proto @@ -27,7 +27,7 @@ changelog= source=("$pkgname-$pkgver.tar.gz" "$pkgname-$pkgver.patch") noextract=() -md5sums=() #generate with 'makepkg -g' +md5sums=() # generate with 'updpkgsums' prepare() { cd "$pkgname-$pkgver" -- 1.8.5.3

Show replies by date

Jason St. John

16 Jan 16 Jan

10:18 p.m.

New subject: [pacman-dev] [PATCH 2/4] Improve text in ChangeLog prototype

-- remove the space between each section and the trailing colon -- use a capital letter at the start of each sentence -- fix two very minor grammar/wording issues in the last line Signed-off-by: Jason St. John --- proto/ChangeLog.proto | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/proto/ChangeLog.proto b/proto/ChangeLog.proto index 87e86e7..8fb9a03 100644 --- a/proto/ChangeLog.proto +++ b/proto/ChangeLog.proto @@ -1,16 +1,16 @@ 2007-12-01 Your Name - * pkgver-pkgrel : - new upstream release. + * pkgver-pkgrel: + New upstream release. Reason we changed stuff. Another reason we changed stuff. - * gcc-4.1.patch : + * gcc-4.1.patch: Removed, no longer needed. 2007-11-01 Your Name - * 1.0-5 : - added ChangeLog. - the last line should end with just one newline. - you can cat the file to check it displays fine. + * 1.0-5: + Added ChangeLog. + The last line should end with just one newline. + You can cat the file to check if it displays properly. -- 1.8.5.3

Allan McRae

30 Jan 30 Jan

4:56 a.m.

New subject: [pacman-dev] [PATCH 2/4] Improve text in ChangeLog prototype

On 17/01/14 08:18, Jason St. John wrote:

...

-- remove the space between each section and the trailing colon -- use a capital letter at the start of each sentence -- fix two very minor grammar/wording issues in the last line

Signed-off-by: Jason St. John

I am fine with these changes but... This really is an awful changelog format! I think we should just remove the prototype as the style should be distribution determined and we should add the important information (single newline at the end of the file) to the PKGBUILD man page. Comments? A

Jason St. John

16 Jan 16 Jan

10:18 p.m.

New subject: [pacman-dev] [PATCH 3/4] Use curly braces for all shell variables in PKGBUILD prototypes

Added to encourage "proper" delimiting of variable names Signed-off-by: Jason St. John --- This also improves syntax highlighting of file extensions when opening the PKGBUILD prototypes in Vim. proto/PKGBUILD-split.proto | 20 ++++++++++---------- proto/PKGBUILD.proto | 16 ++++++++-------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto index b2832b9..8f5bd1d 100644 --- a/proto/PKGBUILD-split.proto +++ b/proto/PKGBUILD-split.proto @@ -24,24 +24,24 @@ backup=() options=() install= changelog= -source=("$pkgbase-$pkgver.tar.gz" - "$pkgname-$pkgver.patch") +source=("${pkgbase}-${pkgver}.tar.gz" + "${pkgname}-${pkgver}.patch") noextract=() md5sums=() # generate with 'updpkgsums' prepare() { - cd "$pkgname-$pkgver" - patch -p1 -i "$srcdir/$pkgname-$pkgver.patch" + cd "${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/${pkgname}-${pkgver}.patch" } build() { - cd "$pkgbase-$pkgver" + cd "${pkgbase}-${pkgver}" ./configure --prefix=/usr make } check() { - cd "$pkgname-$pkgver" + cd "${pkgname}-${pkgver}" make -k check } @@ -65,14 +65,14 @@ package_pkg1() { install= changelog= - cd "$pkgbase-$pkgver" - make DESTDIR="$pkgdir/" install-pkg1 + cd "${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}/" install-pkg1 } package_pkg2() { # options and directives overrides pkgdesc="" - cd "$pkgbase-$pkgver" - make DESTDIR="$pkgdir/" install-pkg2 + cd "${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}/" install-pkg2 } diff --git a/proto/PKGBUILD.proto b/proto/PKGBUILD.proto index 479d5e5..0eb1c20 100644 --- a/proto/PKGBUILD.proto +++ b/proto/PKGBUILD.proto @@ -24,28 +24,28 @@ backup=() options=() install= changelog= -source=("$pkgname-$pkgver.tar.gz" - "$pkgname-$pkgver.patch") +source=("${pkgname}-${pkgver}.tar.gz" + "${pkgname}-${pkgver}.patch") noextract=() md5sums=() # generate with 'updpkgsums' prepare() { - cd "$pkgname-$pkgver" - patch -p1 -i "$srcdir/$pkgname-$pkgver.patch" + cd "${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/${pkgname}-${pkgver}.patch" } build() { - cd "$pkgname-$pkgver" + cd "${pkgname}-${pkgver}" ./configure --prefix=/usr make } check() { - cd "$pkgname-$pkgver" + cd "${pkgname}-${pkgver}" make -k check } package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + cd "${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}/" install } -- 1.8.5.3

Allan McRae

17 Jan 17 Jan

11:32 a.m.

New subject: [pacman-dev] [PATCH 3/4] Use curly braces for all shell variables in PKGBUILD prototypes

On 17/01/14 08:18, Jason St. John wrote:

...

Added to encourage "proper" delimiting of variable names

Signed-off-by: Jason St. John --- This also improves syntax highlighting of file extensions when opening the PKGBUILD prototypes in Vim.

This is going to be fun! @Dave: care to comment? (I know you dislike unneeded braces :D )

...

proto/PKGBUILD-split.proto | 20 ++++++++++---------- proto/PKGBUILD.proto | 16 ++++++++-------- 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto index b2832b9..8f5bd1d 100644 --- a/proto/PKGBUILD-split.proto +++ b/proto/PKGBUILD-split.proto @@ -24,24 +24,24 @@ backup=() options=() install= changelog= -source=("$pkgbase-$pkgver.tar.gz" - "$pkgname-$pkgver.patch") +source=("${pkgbase}-${pkgver}.tar.gz" + "${pkgname}-${pkgver}.patch") noextract=() md5sums=() # generate with 'updpkgsums'

prepare() { - cd "$pkgname-$pkgver" - patch -p1 -i "$srcdir/$pkgname-$pkgver.patch" + cd "${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/${pkgname}-${pkgver}.patch" }

build() { - cd "$pkgbase-$pkgver" + cd "${pkgbase}-${pkgver}" ./configure --prefix=/usr make }

check() { - cd "$pkgname-$pkgver" + cd "${pkgname}-${pkgver}" make -k check }

@@ -65,14 +65,14 @@ package_pkg1() { install= changelog=

- cd "$pkgbase-$pkgver" - make DESTDIR="$pkgdir/" install-pkg1 + cd "${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}/" install-pkg1 }

package_pkg2() { # options and directives overrides pkgdesc=""

- cd "$pkgbase-$pkgver" - make DESTDIR="$pkgdir/" install-pkg2 + cd "${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}/" install-pkg2 } diff --git a/proto/PKGBUILD.proto b/proto/PKGBUILD.proto index 479d5e5..0eb1c20 100644 --- a/proto/PKGBUILD.proto +++ b/proto/PKGBUILD.proto @@ -24,28 +24,28 @@ backup=() options=() install= changelog= -source=("$pkgname-$pkgver.tar.gz" - "$pkgname-$pkgver.patch") +source=("${pkgname}-${pkgver}.tar.gz" + "${pkgname}-${pkgver}.patch") noextract=() md5sums=() # generate with 'updpkgsums'

prepare() { - cd "$pkgname-$pkgver" - patch -p1 -i "$srcdir/$pkgname-$pkgver.patch" + cd "${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/${pkgname}-${pkgver}.patch" }

build() { - cd "$pkgname-$pkgver" + cd "${pkgname}-${pkgver}" ./configure --prefix=/usr make }

check() { - cd "$pkgname-$pkgver" + cd "${pkgname}-${pkgver}" make -k check }

package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + cd "${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}/" install }

Thomas Bächler

19 Jan 19 Jan

10:34 a.m.

New subject: [pacman-dev] [PATCH 3/4] Use curly braces for all shell variables in PKGBUILD prototypes

Am 17.01.2014 12:32, schrieb Allan McRae:

...

On 17/01/14 08:18, Jason St. John wrote:

...
Added to encourage "proper" delimiting of variable names

Signed-off-by: Jason St. John --- This also improves syntax highlighting of file extensions when opening the PKGBUILD prototypes in Vim.

This is going to be fun!

@Dave: care to comment? (I know you dislike unneeded braces :D )

Dave is on vacation, isn't he? I like curly braces a lot and would love to see them everywhere.

Dave Reisner

1:13 p.m.

New subject: [pacman-dev] [PATCH 3/4] Use curly braces for all shell variables in PKGBUILD prototypes

On Sun, Jan 19, 2014 at 11:34:04AM +0100, Thomas Bächler wrote:

...

Am 17.01.2014 12:32, schrieb Allan McRae:

...
On 17/01/14 08:18, Jason St. John wrote:

...
Added to encourage "proper" delimiting of variable names

Signed-off-by: Jason St. John --- This also improves syntax highlighting of file extensions when opening the PKGBUILD prototypes in Vim.

This is going to be fun!

@Dave: care to comment? (I know you dislike unneeded braces :D )

Dave is on vacation, isn't he?

I am. You should see the view from where I am right now.

...

I like curly braces a lot and would love to see them everywhere.

You only say that because you hate me. Curly braces are a disease.

Thomas Bächler

11:59 p.m.

New subject: [pacman-dev] [PATCH 3/4] Use curly braces for all shell variables in PKGBUILD prototypes

Am 19.01.2014 14:13, schrieb Dave Reisner:

...

...
I like curly braces a lot and would love to see them everywhere.

You only say that because you hate me. Curly braces are a disease.

Curly braces are not a disease, but a choice. You can't cure a choice. Please, stop spreading curlybracephobia.

Jason St. John

16 Jan 16 Jan

10:18 p.m.

New subject: [pacman-dev] [PATCH 4/4] Add missing optdepends to the main list of variables in the split PKGBUILD prototype

Signed-off-by: Jason St. John --- This was missed in commits a1f7c83 and 219cb2e. proto/PKGBUILD-split.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto index 8f5bd1d..f1dd420 100644 --- a/proto/PKGBUILD-split.proto +++ b/proto/PKGBUILD-split.proto @@ -17,6 +17,7 @@ groups=() depends=() makedepends=() checkdepends=() +optdepends=() provides=() conflicts=() replaces=() -- 1.8.5.3

Allan McRae

17 Jan 17 Jan

11:29 a.m.

New subject: [pacman-dev] [PATCH 1/4] Recommend using "updpkgsums" in PKGBUILD prototypes instead of "makepkg -g"

On 17/01/14 08:18, Jason St. John wrote:

...

Signed-off-by: Jason St. John --- proto/PKGBUILD-split.proto | 2 +- proto/PKGBUILD.proto | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto index f341052..b2832b9 100644 --- a/proto/PKGBUILD-split.proto +++ b/proto/PKGBUILD-split.proto @@ -27,7 +27,7 @@ changelog= source=("$pkgbase-$pkgver.tar.gz" "$pkgname-$pkgver.patch") noextract=() -md5sums=() #generate with 'makepkg -g' +md5sums=() # generate with 'updpkgsums'

We can not do that. updpkgsums is a contrib/ script so may not be installed on all systems using pacman/makepkg.

...

prepare() { cd "$pkgname-$pkgver" diff --git a/proto/PKGBUILD.proto b/proto/PKGBUILD.proto index 8d26c81..479d5e5 100644 --- a/proto/PKGBUILD.proto +++ b/proto/PKGBUILD.proto @@ -27,7 +27,7 @@ changelog= source=("$pkgname-$pkgver.tar.gz" "$pkgname-$pkgver.patch") noextract=() -md5sums=() #generate with 'makepkg -g' +md5sums=() # generate with 'updpkgsums'

prepare() { cd "$pkgname-$pkgver"

William Giokas

18 Jan 18 Jan

9:18 a.m.

New subject: [pacman-dev] [PATCH 1/4] Recommend using "updpkgsums" in PKGBUILD prototypes instead of "makepkg -g"

On Fri, Jan 17, 2014 at 09:29:35PM +1000, Allan McRae wrote:

...

On 17/01/14 08:18, Jason St. John wrote:

...
-md5sums=() #generate with 'makepkg -g' +md5sums=() # generate with 'updpkgsums'

We can not do that. updpkgsums is a contrib/ script so may not be installed on all systems using pacman/makepkg.

Just to clarify that, Arch packages contrib with pacman (there's no pacman-contrib, just pacman). There may be other people that are using pacman but not Arch and don't want the contrib scripts. Thanks, -- William Giokas | KaiSforza | http://kaictl.net/ GnuPG Key: 0x73CD09CF Fingerprint: F73F 50EF BBE2 9846 8306 E6B8 6902 06D8 73CD 09CF

Emil Lundberg

19 Jan 19 Jan

10:24 a.m.

New subject: [pacman-dev] [PATCH 1/4] Recommend using "updpkgsums" in PKGBUILD prototypes instead of "makepkg -g"

On Sat, Jan 18, 2014 at 6:18 PM, William Giokas <1007380@gmail.com> wrote:

...

On Fri, Jan 17, 2014 at 09:29:35PM +1000, Allan McRae wrote:

...
On 17/01/14 08:18, Jason St. John wrote:

...
-md5sums=() #generate with 'makepkg -g' +md5sums=() # generate with 'updpkgsums'

We can not do that. updpkgsums is a contrib/ script so may not be installed on all systems using pacman/makepkg.

Just to clarify that, Arch packages contrib with pacman (there's no pacman-contrib, just pacman). There may be other people that are using pacman but not Arch and don't want the contrib scripts.

Thanks,

-- William Giokas | KaiSforza | http://kaictl.net/ GnuPG Key: 0x73CD09CF Fingerprint: F73F 50EF BBE2 9846 8306 E6B8 6902 06D8 73CD 09CF

How about recommending both, then? # generate with 'makepkg -g' or 'updpkgsums' /Emil

Allan McRae

10:34 a.m.

New subject: [pacman-dev] [PATCH 1/4] Recommend using "updpkgsums" in PKGBUILD prototypes instead of "makepkg -g"

On 19/01/14 20:24, Emil Lundberg wrote:

...

On Sat, Jan 18, 2014 at 6:18 PM, William Giokas <1007380@gmail.com> wrote:

...
On Fri, Jan 17, 2014 at 09:29:35PM +1000, Allan McRae wrote:

...
On 17/01/14 08:18, Jason St. John wrote:

...
-md5sums=() #generate with 'makepkg -g' +md5sums=() # generate with 'updpkgsums'

We can not do that. updpkgsums is a contrib/ script so may not be installed on all systems using pacman/makepkg.

Just to clarify that, Arch packages contrib with pacman (there's no pacman-contrib, just pacman). There may be other people that are using pacman but not Arch and don't want the contrib scripts.

Thanks,

-- William Giokas | KaiSforza | http://kaictl.net/ GnuPG Key: 0x73CD09CF Fingerprint: F73F 50EF BBE2 9846 8306 E6B8 6902 06D8 73CD 09CF

How about recommending both, then? # generate with 'makepkg -g' or 'updpkgsums'

I'd be more happy removing this altogether. It encourages the practise of not checking the checksums provided upstream. Allan

3738

Age (days ago)

3752

Last active (days ago)

List overview

Download

12 comments

6 participants

participants (6)

Allan McRae
Dave Reisner
Emil Lundberg
Jason St. John
Thomas Bächler
William Giokas

[pacman-dev] [PATCH 1/4] Recommend using "updpkgsums" in PKGBUILD prototypes instead of "makepkg -g"

tags

participants (6)