Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rpm2docserv for openSUSE:Factory checked in at 2023-01-20 17:38:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpm2docserv (Old) and /work/SRC/openSUSE:Factory/.rpm2docserv.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpm2docserv" Fri Jan 20 17:38:53 2023 rev:13 rq:1059848 version:20230119.8224a04 Changes: -------- --- /work/SRC/openSUSE:Factory/rpm2docserv/rpm2docserv.changes 2022-12-02 13:14:00.374138584 +0100 +++ /work/SRC/openSUSE:Factory/.rpm2docserv.new.32243/rpm2docserv.changes 2023-01-20 17:39:09.712681076 +0100 @@ -1,0 +2,7 @@ +Thu Jan 19 17:58:03 UTC 2023 - [email protected] + +- Update to version 20230119.8224a04: + * Update dependencies + * Remove "index.html" from URLs + +------------------------------------------------------------------- Old: ---- rpm2docserv-20221129.a10bb7c.tar.xz New: ---- rpm2docserv-20230119.8224a04.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm2docserv.spec ++++++ --- /var/tmp/diff_new_pack.AZer6e/_old 2023-01-20 17:39:11.372690257 +0100 +++ /var/tmp/diff_new_pack.AZer6e/_new 2023-01-20 17:39:11.376690279 +0100 @@ -1,7 +1,7 @@ # # spec file for package rpm2docserv # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ %endif Name: rpm2docserv -Version: 20221129.a10bb7c +Version: 20230119.8224a04 Release: 0 Summary: Make manpages from RPMs accessible in a web browser License: Apache-2.0 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.AZer6e/_old 2023-01-20 17:39:11.416690500 +0100 +++ /var/tmp/diff_new_pack.AZer6e/_new 2023-01-20 17:39:11.416690500 +0100 @@ -1,7 +1,7 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/thkukuk/rpm2docserv.git</param> - <param name="changesrevision">a10bb7cd9e60bab0afea8a5c318d1c3e9b72de63</param></service> + <param name="changesrevision">8224a04443e47f00e33a19777e0384953243499c</param></service> </servicedata> (No newline at EOF) ++++++ rpm2docserv-20221129.a10bb7c.tar.xz -> rpm2docserv-20230119.8224a04.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpm2docserv-20221129.a10bb7c/cmd/docserv-sitemap/sitemap.go new/rpm2docserv-20230119.8224a04/cmd/docserv-sitemap/sitemap.go --- old/rpm2docserv-20221129.a10bb7c/cmd/docserv-sitemap/sitemap.go 2022-11-29 16:18:39.000000000 +0100 +++ new/rpm2docserv-20230119.8224a04/cmd/docserv-sitemap/sitemap.go 2023-01-19 18:57:30.000000000 +0100 @@ -106,6 +106,11 @@ log.Fatal("Usage: docserv-sitemap --base-url=<URL> [--serving-dir=<dir>]") } + if (*baseURL)[len(*baseURL)-1:] == "/" { + t := (*baseURL)[:len(*baseURL)-1] + baseURL = &t + } + log.Printf("docserv sitemap generation for %q", *servingDir) err := walkDirs(*servingDir, *baseURL) @@ -141,7 +146,12 @@ n := strings.TrimSuffix(bfn.Name(), ".gz") if filepath.Ext(n) == ".html" && !bfn.ModTime().IsZero() { - sitemapEntries[fp + n] = bfn.ModTime() + // For index.html only add the directory URL + if n == "index.html" { + sitemapEntries[fp] = bfn.ModTime() + } else { + sitemapEntries[fp + n] = bfn.ModTime() + } } } return nil @@ -183,7 +193,8 @@ } st, err := os.Stat(sitemapPath) if err == nil { - sitemaps[escapedUrlPath.String() + "/sitemap" + strconv.Itoa(count) + ".xml"] = st.ModTime() + fn := filepath.Join(escapedUrlPath.String(), "sitemap" + strconv.Itoa(count) + ".xml") + sitemaps[fn] = st.ModTime() } count++ @@ -227,7 +238,6 @@ } for _, sfi := range suitedirs { if !sfi.IsDir() { - continue } @@ -256,7 +266,11 @@ if bfn.IsDir() { collectFiles(fn, bfn.Name(), sitemapEntries) } else { - sitemapEntries[bfn.Name()] = bfn.ModTime() + if bfn.Name() == "index.html" { + sitemapEntries[""] = bfn.ModTime() + } else { + sitemapEntries[bfn.Name()] = bfn.ModTime() + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpm2docserv-20221129.a10bb7c/go.mod new/rpm2docserv-20230119.8224a04/go.mod --- old/rpm2docserv-20221129.a10bb7c/go.mod 2022-11-29 16:18:39.000000000 +0100 +++ new/rpm2docserv-20230119.8224a04/go.mod 2023-01-19 18:57:30.000000000 +0100 @@ -5,9 +5,9 @@ require ( github.com/golang/protobuf v1.5.2 github.com/knqyf263/go-rpm-version v0.0.0-20220614171824-631e686d1075 - golang.org/x/net v0.2.0 + golang.org/x/net v0.5.0 golang.org/x/sync v0.1.0 - golang.org/x/text v0.4.0 + golang.org/x/text v0.6.0 gopkg.in/yaml.v3 v3.0.1 ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpm2docserv-20221129.a10bb7c/go.sum new/rpm2docserv-20230119.8224a04/go.sum --- old/rpm2docserv-20221129.a10bb7c/go.sum 2022-11-29 16:18:39.000000000 +0100 +++ new/rpm2docserv-20230119.8224a04/go.sum 2023-01-19 18:57:30.000000000 +0100 @@ -5,12 +5,12 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/knqyf263/go-rpm-version v0.0.0-20220614171824-631e686d1075 h1:aC6MEAs3PE3lWD7lqrJfDxHd6hcced9R4JTZu85cJwU= github.com/knqyf263/go-rpm-version v0.0.0-20220614171824-631e686d1075/go.mod h1:i4sF0l1fFnY1aiw08QQSwVAFxHEm311Me3WsU/X7nL0= -golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU= -golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= +golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw= +golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= -golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k= +golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpm2docserv-20221129.a10bb7c/pkg/proto/index.pb.go new/rpm2docserv-20230119.8224a04/pkg/proto/index.pb.go --- old/rpm2docserv-20221129.a10bb7c/pkg/proto/index.pb.go 2022-11-29 16:18:39.000000000 +0100 +++ new/rpm2docserv-20230119.8224a04/pkg/proto/index.pb.go 2023-01-19 18:57:30.000000000 +0100 @@ -1,25 +1,14 @@ -// Code generated by protoc-gen-go. +// Code generated by protoc-gen-go. DO NOT EDIT. // source: index.proto -// DO NOT EDIT! -/* -Package proto is a generated protocol buffer package. - -It is generated from these files: - index.proto - -It has these top-level messages: - IndexEntry - Index -*/ package proto -import proto1 "github.com/golang/protobuf/proto" +import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" // Reference imports to suppress errors if they are not otherwise used. -var _ = proto1.Marshal +var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf @@ -27,20 +16,42 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto1.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type IndexEntry struct { - Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` - Suite string `protobuf:"bytes,2,opt,name=suite" json:"suite,omitempty"` - Binarypkg string `protobuf:"bytes,3,opt,name=binarypkg" json:"binarypkg,omitempty"` - Section string `protobuf:"bytes,4,opt,name=section" json:"section,omitempty"` - Language string `protobuf:"bytes,5,opt,name=language" json:"language,omitempty"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Suite string `protobuf:"bytes,2,opt,name=suite,proto3" json:"suite,omitempty"` + Binarypkg string `protobuf:"bytes,3,opt,name=binarypkg,proto3" json:"binarypkg,omitempty"` + Section string `protobuf:"bytes,4,opt,name=section,proto3" json:"section,omitempty"` + Language string `protobuf:"bytes,5,opt,name=language,proto3" json:"language,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *IndexEntry) Reset() { *m = IndexEntry{} } +func (m *IndexEntry) String() string { return proto.CompactTextString(m) } +func (*IndexEntry) ProtoMessage() {} +func (*IndexEntry) Descriptor() ([]byte, []int) { + return fileDescriptor_index_16ff3411c927eb80, []int{0} +} +func (m *IndexEntry) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_IndexEntry.Unmarshal(m, b) +} +func (m *IndexEntry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_IndexEntry.Marshal(b, m, deterministic) +} +func (dst *IndexEntry) XXX_Merge(src proto.Message) { + xxx_messageInfo_IndexEntry.Merge(dst, src) +} +func (m *IndexEntry) XXX_Size() int { + return xxx_messageInfo_IndexEntry.Size(m) +} +func (m *IndexEntry) XXX_DiscardUnknown() { + xxx_messageInfo_IndexEntry.DiscardUnknown(m) } -func (m *IndexEntry) Reset() { *m = IndexEntry{} } -func (m *IndexEntry) String() string { return proto1.CompactTextString(m) } -func (*IndexEntry) ProtoMessage() {} -func (*IndexEntry) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } +var xxx_messageInfo_IndexEntry proto.InternalMessageInfo func (m *IndexEntry) GetName() string { if m != nil { @@ -78,16 +89,38 @@ } type Index struct { - Entry []*IndexEntry `protobuf:"bytes,1,rep,name=entry" json:"entry,omitempty"` - Language []string `protobuf:"bytes,2,rep,name=language" json:"language,omitempty"` - Suite map[string]string `protobuf:"bytes,3,rep,name=suite" json:"suite,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - Section []string `protobuf:"bytes,4,rep,name=section" json:"section,omitempty"` + Entry []*IndexEntry `protobuf:"bytes,1,rep,name=entry,proto3" json:"entry,omitempty"` + Language []string `protobuf:"bytes,2,rep,name=language,proto3" json:"language,omitempty"` + Suite map[string]string `protobuf:"bytes,3,rep,name=suite,proto3" json:"suite,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Section []string `protobuf:"bytes,4,rep,name=section,proto3" json:"section,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Index) Reset() { *m = Index{} } +func (m *Index) String() string { return proto.CompactTextString(m) } +func (*Index) ProtoMessage() {} +func (*Index) Descriptor() ([]byte, []int) { + return fileDescriptor_index_16ff3411c927eb80, []int{1} +} +func (m *Index) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Index.Unmarshal(m, b) +} +func (m *Index) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Index.Marshal(b, m, deterministic) +} +func (dst *Index) XXX_Merge(src proto.Message) { + xxx_messageInfo_Index.Merge(dst, src) +} +func (m *Index) XXX_Size() int { + return xxx_messageInfo_Index.Size(m) +} +func (m *Index) XXX_DiscardUnknown() { + xxx_messageInfo_Index.DiscardUnknown(m) } -func (m *Index) Reset() { *m = Index{} } -func (m *Index) String() string { return proto1.CompactTextString(m) } -func (*Index) ProtoMessage() {} -func (*Index) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } +var xxx_messageInfo_Index proto.InternalMessageInfo func (m *Index) GetEntry() []*IndexEntry { if m != nil { @@ -118,13 +151,14 @@ } func init() { - proto1.RegisterType((*IndexEntry)(nil), "proto.IndexEntry") - proto1.RegisterType((*Index)(nil), "proto.Index") + proto.RegisterType((*IndexEntry)(nil), "proto.IndexEntry") + proto.RegisterType((*Index)(nil), "proto.Index") + proto.RegisterMapType((map[string]string)(nil), "proto.Index.SuiteEntry") } -func init() { proto1.RegisterFile("index.proto", fileDescriptor0) } +func init() { proto.RegisterFile("index.proto", fileDescriptor_index_16ff3411c927eb80) } -var fileDescriptor0 = []byte{ +var fileDescriptor_index_16ff3411c927eb80 = []byte{ // 235 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x90, 0x3d, 0x4e, 0xc4, 0x30, 0x10, 0x85, 0xe5, 0x78, 0x0d, 0xec, 0x6c, 0x03, 0x23, 0x24, 0xac, 0x15, 0x45, 0xb4, 0x0d, 0xdb, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpm2docserv-20221129.a10bb7c/vendor/modules.txt new/rpm2docserv-20230119.8224a04/vendor/modules.txt --- old/rpm2docserv-20221129.a10bb7c/vendor/modules.txt 2022-11-29 16:18:39.000000000 +0100 +++ new/rpm2docserv-20230119.8224a04/vendor/modules.txt 2023-01-19 18:57:30.000000000 +0100 @@ -4,7 +4,7 @@ # github.com/knqyf263/go-rpm-version v0.0.0-20220614171824-631e686d1075 ## explicit github.com/knqyf263/go-rpm-version -# golang.org/x/net v0.2.0 +# golang.org/x/net v0.5.0 ## explicit; go 1.17 golang.org/x/net/context golang.org/x/net/html @@ -12,7 +12,7 @@ # golang.org/x/sync v0.1.0 ## explicit golang.org/x/sync/errgroup -# golang.org/x/text v0.4.0 +# golang.org/x/text v0.6.0 ## explicit; go 1.17 golang.org/x/text/internal/format golang.org/x/text/internal/language
